Define imv keys, switch to btop, put stateful data in per-system config

modules/home/settings/cursor/default.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+  home.pointerCursor = {
+    gtk.enable = true;
+    name = "Simp1e-Dark";
+    package = pkgs.simp1e-cursors;
+    size = 24;
+  };
+}

modules/home/settings/default.nix

@@ -1,10 +1,10 @@
 { ... }:
 {
   imports = [
+    ./cursor
     ./dconf
     ./fonts
     ./gtk
-    ./nix
     ./xdg
   ];
 }

modules/home/settings/gtk/bookmarks/default.nix

@@ -0,0 +1,11 @@
+{ pkgs, config, ... }:
+{
+  gtk.gtk3.bookmarks = [
+    "file:///home/${config.home.username}/Keepers"
+    "file:///home/${config.home.username}/Downloads"
+    "file:///home/${config.home.username}/Documents"
+    "file:///home/${config.home.username}/Videos"
+    "file:///home/${config.home.username}/Pictures/Screenshots"
+    "file:///etc/nixos"
+  ];
+}

modules/home/settings/gtk/css/default.nix

@@ -0,0 +1,20 @@
+{ ... }:
+{
+  gtk = {
+    # Disable shadows
+    gtk3.extraCss = ''
+      * { outline-width: 0px; }
+      decoration { box-shadow: none; }
+    '';
+
+    # Prevent GTK4 rounding
+    gtk4.extraCss = ''
+      window {
+        border-top-left-radius:0;
+        border-top-right-radius:0;
+        border-bottom-left-radius:0;
+        border-bottom-right-radius:0;
+      }
+    '';
+  };
+}

modules/home/settings/gtk/default.nix

@@ -1,5 +1,10 @@
 { pkgs, config, ... }:
 {
+  imports = [
+    ./bookmarks
+    ./css
+  ];
+
   gtk = {
     enable = true;
     font = {
@@ -25,36 +30,5 @@
         color = "${config.look.colors.folder}";
       };
     };
-    cursorTheme = {
-      package = pkgs.simp1e-cursors;
-      name = "Simp1e-Dark";
-    };
-
-    gtk3 = {
-      bookmarks = [
-        "file:///home/jimbo/Keepers"
-        "file:///home/jimbo/Downloads"
-        "file:///home/jimbo/Documents"
-        "file:///home/jimbo/Videos"
-        "file:///home/jimbo/Pictures/Screenshots"
-        "file:///etc/nixos"
-      ];
-
-      # Disable shadows
-      extraCss = ''
-        * { outline-width: 0px; }
-        decoration { box-shadow: none; }
-      '';
-    };
-
-    # Stop gtk4 from being rounded
-    gtk4.extraCss = ''
-      window {
-        border-top-left-radius:0;
-        border-top-right-radius:0;
-        border-bottom-left-radius:0;
-        border-bottom-right-radius:0;
-      }
-    '';
   };
 }

modules/home/settings/nix/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-{
-  nixpkgs.config.allowUnfree = true;
-  home.stateVersion = "24.05";
-}