Consolidate GNOME config into single settings/gnome.nix module

Merge home-manager GNOME settings (dconf, keybinds, GTK CSS, wallpaper)
from gnome-hm.nix into settings/gnome.nix so the entire DE config lives
in one file and can be toggled with a single import.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

home-manager/fred.nix

@@ -27,6 +27,4 @@
     gtk-titlebar = false
   '';
 
-  # Import gnome home manager config
-  imports = [ ./gnome-hm.nix ];
 }

home-manager/gnome-hm.nix

@@ -1,100 +0,0 @@
-{ config, pkgs, lib, osConfig, inputs, ... }:
-{
-  config = lib.mkIf (lib.elem osConfig.networking.hostName [ "FredOS-Gaming" "FredOS-Macbook" ]) {
-
-    home.file.".local/share/backgrounds/wallpaper.png".source =
-      "${inputs.self}/walls/wallpaper.png";
-
-    # Minimal titlebars — hide window buttons and shrink headerbar
-    home.file.".config/gtk-4.0/gtk.css".force = true;
-    home.file.".config/gtk-4.0/gtk.css".text = ''
-      headerbar {
-        min-height: 0;
-        padding: 0;
-        margin: 0;
-      }
-      headerbar .title {
-        font-size: 0;
-      }
-    '';
-    home.file.".config/gtk-3.0/gtk.css".force = true;
-    home.file.".config/gtk-3.0/gtk.css".text = ''
-      headerbar {
-        min-height: 0;
-        padding: 0;
-        margin: 0;
-      }
-      headerbar .title {
-        font-size: 0;
-      }
-    '';
-    
-    # GNOME dconf settings
-    dconf.settings = {
-      # Interface / theme
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-        gtk-theme = "Adwaita-dark";
-        enable-hot-corners = false;
-        accent-color = "purple";
-        cursor-theme = "Adwaita";
-        cursor-size = 24;
-      };
-      
-      # Wallpaper settings
-      "org/gnome/desktop/background" = {
-        picture-uri = "file://${config.home.homeDirectory}/.local/share/backgrounds/wallpaper.png";
-        picture-uri-dark = "file://${config.home.homeDirectory}/.local/share/backgrounds/wallpaper.png";
-        picture-options = "zoom";
-      };
-      
-      # Keyboard input sources
-      "org/gnome/desktop/input-sources" = {
-        sources = [
-          (lib.hm.gvariant.mkTuple [ "xkb" "gb" ])
-          (lib.hm.gvariant.mkTuple [ "xkb" "no" ])
-        ];
-      };
-      
-      # Window manager keybindings
-      "org/gnome/desktop/wm/keybindings" = {
-        close = ["<Super>q"];
-        toggle-fullscreen = ["<Super>f"];
-      };
-      "org/gnome/desktop/wm/preferences" = {
-        resize-with-right-button = lib.hm.gvariant.mkBoolean true;
-        button-layout = "";
-      };
-      
-      # Shell keybindings
-      "org/gnome/shell/keybindings" = {
-        show-screenshot-ui = ["<Shift><Super>s"];
-      };
-      
-      # Custom keybindings
-      "org/gnome/settings-daemon/plugins/media-keys" = {
-        home = ["<Super>e"];
-        control-center = ["<Super>i"];
-        custom-keybindings = [
-          "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
-        ];
-      };
-      
-      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-        name = "Terminal";
-        command = "ghostty";
-        binding = "<Super>t";
-      };
-      
-      # Mouse acceleration
-      "org/gnome/desktop/peripherals/mouse" = {
-        accel-profile = "flat";
-      };
-      
-      # Just Perfection extension
-      "org/gnome/shell/extensions/just-perfection" = {
-        window-demands-attention-focus = true;
-      };
-    };
-  };
-}

settings/gnome.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 {
   config = lib.mkIf (lib.elem config.networking.hostName [ "FredOS-Gaming" "FredOS-Macbook" ]) {
     # Enable Gnome
@@ -7,7 +7,7 @@
     services.desktopManager.gnome.enable = true;
     services.displayManager.gdm.wayland = true;
     boot.plymouth.enable = false;
-    
+
     # Flatpak for ad-hoc app installs via Bazaar
     services.flatpak.enable = true;
 
@@ -34,7 +34,7 @@
         "$HOME/.local/share/icons"
       ];
     };
-    
+
     # Set icon theme via dconf
     programs.dconf.profiles.user.databases = [{
       settings = {
@@ -47,8 +47,106 @@
         };
       };
     }];
-    
+
     programs.xwayland.enable = true;
     programs.dconf.enable = true;
+
+    # Home Manager GNOME settings
+    home-manager.users.fred = { config, ... }: {
+      home.file.".local/share/backgrounds/wallpaper.png".source =
+        "${inputs.self}/walls/wallpaper.png";
+
+      # Minimal titlebars — hide window buttons and shrink headerbar
+      home.file.".config/gtk-4.0/gtk.css".force = true;
+      home.file.".config/gtk-4.0/gtk.css".text = ''
+        headerbar {
+          min-height: 0;
+          padding: 0;
+          margin: 0;
+        }
+        headerbar .title {
+          font-size: 0;
+        }
+      '';
+      home.file.".config/gtk-3.0/gtk.css".force = true;
+      home.file.".config/gtk-3.0/gtk.css".text = ''
+        headerbar {
+          min-height: 0;
+          padding: 0;
+          margin: 0;
+        }
+        headerbar .title {
+          font-size: 0;
+        }
+      '';
+
+      # GNOME dconf settings
+      dconf.settings = {
+        # Interface / theme
+        "org/gnome/desktop/interface" = {
+          color-scheme = "prefer-dark";
+          gtk-theme = "Adwaita-dark";
+          enable-hot-corners = false;
+          accent-color = "purple";
+          cursor-theme = "Adwaita";
+          cursor-size = 24;
+        };
+
+        # Wallpaper settings
+        "org/gnome/desktop/background" = {
+          picture-uri = "file://${config.home.homeDirectory}/.local/share/backgrounds/wallpaper.png";
+          picture-uri-dark = "file://${config.home.homeDirectory}/.local/share/backgrounds/wallpaper.png";
+          picture-options = "zoom";
+        };
+
+        # Keyboard input sources
+        "org/gnome/desktop/input-sources" = {
+          sources = [
+            (lib.hm.gvariant.mkTuple [ "xkb" "gb" ])
+            (lib.hm.gvariant.mkTuple [ "xkb" "no" ])
+          ];
+        };
+
+        # Window manager keybindings
+        "org/gnome/desktop/wm/keybindings" = {
+          close = ["<Super>q"];
+          toggle-fullscreen = ["<Super>f"];
+        };
+        "org/gnome/desktop/wm/preferences" = {
+          resize-with-right-button = lib.hm.gvariant.mkBoolean true;
+          button-layout = "";
+        };
+
+        # Shell keybindings
+        "org/gnome/shell/keybindings" = {
+          show-screenshot-ui = ["<Shift><Super>s"];
+        };
+
+        # Custom keybindings
+        "org/gnome/settings-daemon/plugins/media-keys" = {
+          home = ["<Super>e"];
+          control-center = ["<Super>i"];
+          custom-keybindings = [
+            "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
+          ];
+        };
+
+        "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+          name = "Terminal";
+          command = "ghostty";
+          binding = "<Super>t";
+        };
+
+        # Mouse acceleration
+        "org/gnome/desktop/peripherals/mouse" = {
+          accel-profile = "flat";
+        };
+
+        # Just Perfection extension
+        "org/gnome/shell/extensions/just-perfection" = {
+          window-demands-attention-focus = true;
+        };
+      };
+    };
   };
 }