From 5d71b93aac36c1421dbeafbac9c6a89e770368b5 Mon Sep 17 00:00:00 2001
From: Random936 <randomdude936@gmail.com>
Date: Mon, 10 Jun 2024 19:19:41 -0700
Subject: [PATCH] new packages; switched nixos to 24.05

---
 home-manager/common.nix | 11 ++++++++---
 nixos/configuration.nix |  9 ++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/home-manager/common.nix b/home-manager/common.nix
index 353a783..445518a 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -4,10 +4,15 @@
   fonts.fontconfig.enable = true;
 
   home.packages = with pkgs; [
-    # Utilities
-    tmux
-    btop
+    # Nix specific utilities
     manix
+    nix-tree
+
+    # Utilities
+    jq
+    tmux
+    ncdu
+    btop
     p7zip
     ripgrep
     fastfetch
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index dcf6e7a..4430c6f 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -72,10 +72,10 @@
   };
 
   # Configure keymap in X11
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "us";
-    xkbVariant = "";
-    xkbOptions = "caps:escape";
+    variant = "";
+    options = "caps:escape";
   };
 
   # Enable CUPS to print documents.
@@ -105,8 +105,7 @@
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
+  # List packages installed in system profile.
   environment.systemPackages = with pkgs; [
     vim
     git