migrate gtk config to hjem and drop home-manager flake input (yay!)

11 files changed, 73 insertions, 89 deletions

diff --git a/flake.lock b/flake.lock
index 9180297..ba4e3da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -115,26 +115,6 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1754527677,
-        "narHash": "sha256-qAzCtmKkMz40xFgP9KN+TCKjVieK4u04EWwl2KvVk0E=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "475d35797d9537354d825260cf583114537affc2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -221,10 +201,10 @@
       "inputs": {
         "disko": "disko",
         "hjem": "hjem",
-        "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "nixos-facter-modules": "nixos-facter-modules",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "system-manager": "system-manager"
       }
     },
     "rust-overlay": {
@@ -293,6 +273,26 @@
         "type": "github"
       }
     },
+    "system-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1756281415,
+        "narHash": "sha256-CjpoVwpJJ+DOZilPrDpZ5S3V+B1Y0calaHxTp2xMvGs=",
+        "owner": "numtide",
+        "repo": "system-manager",
+        "rev": "e271eedac9a24678ca6cfc61677837422bf474e0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "system-manager",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index 05970ce..747c47a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,11 +14,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     # for server that doesn't have nixos
     system-manager = {
       url = "github:numtide/system-manager";
@@ -44,12 +39,13 @@
       inherit inputs;
       hostname = "jupiter";
       username = "collin";
-      module_types = ["hjem" "home" "nixos"];
+      module_types = ["hjem" "nixos"];
     };
-
-    systemConfigs."ganymede" = mkSystemManagerSystem {
+    nixosConfigurations."ganymede" = mkNixosSystem {
       inherit inputs;
-      hostanme = "ganymede";
+      hostname = "ganymede";
+      username = "collin";
+      module_types = ["nixos" "hjem"];
     };
   };
 }
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 462c144..d5f0832 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -10,6 +10,8 @@
     desktop = {
       wallpaper = ./wallpaper.jpg;
 
+      gtk.enable = true;
+
       greetd.enable = true;
 
       sway = {
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 26fda63..05e84a7 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -15,14 +15,6 @@
     inputs.lanzaboote.nixosModules.lanzaboote
   ];
 
-  fonts = {
-    enableDefaultPackages = false;
-    fontDir.enable = true;
-    packages = with pkgs; [
-      ibm-plex
-      nerd-fonts.iosevka
-    ];
-  };
   environment.defaultPackages = lib.mkForce []; # im not a noob
 
   networking.firewall.allowedUDPPorts = [445];
diff --git a/modules/desktop/hjem/gtk.nix b/modules/desktop/hjem/gtk.nix
index bee5936..3ea3b37 100644
--- a/modules/desktop/hjem/gtk.nix
+++ b/modules/desktop/hjem/gtk.nix
@@ -5,33 +5,34 @@
   ...
 }: let
   cfg = config.collinux.desktop.gtk;
-in {
-  packages = with pkgs; [
-    dconf
+in
+  lib.mkIf cfg.enable {
+    packages = with pkgs; [
+      dconf
 
-    papirus-icon-theme
-    cfg.cursor_data.package
-    cfg.theme_data.package
-  ];
+      papirus-icon-theme
+      cfg.cursor_data.package
+      cfg.theme_data.package
+    ];
 
-  xdg.config.files = let
-    value.Settings = {
-      gtk-cursor-theme-name = cfg.cursor_data.name;
-      gtk-cursor-size = 24;
-      gtk-icon-theme-name = "Papirus";
-      gtk-theme-name = cfg.theme_data.name;
+    xdg.config.files = let
+      value.Settings = {
+        gtk-cursor-theme-name = cfg.cursor_data.name;
+        gtk-cursor-theme-size = 24;
+        gtk-icon-theme-name = "Papirus";
+        gtk-theme-name = cfg.theme_data.name;
+      };
+    in {
+      "gtk-3.0/settings.ini" = {
+        generator = lib.generators.toINI {};
+        inherit value;
+      };
+      "gtk-4.0/settings.ini" = {
+        generator = lib.generators.toINI {};
+        inherit value;
+      };
+      "gtk-4.0/gtk.css".text = ''
+        @import url("file://${cfg.theme_data.package}/gtk-4.0/gtk.css");
+      '';
     };
-  in {
-    "gtk-3.0/settings.ini" = {
-      generator = lib.generators.toINI {};
-      inherit value;
-    };
-    "gtk-4.0/settings.ini" = {
-      generator = lib.generators.toINI {};
-      inherit value;
-    };
-    "gtk-4.0/gtk.css".text = ''
-      @import url("file://${cfg.theme_data.package}/gtk-4.0/gtk.css");
-    '';
-  };
-}
+  }
diff --git a/modules/desktop/home/default.nix b/modules/desktop/home/default.nix
deleted file mode 100644
index 7671378..0000000
--- a/modules/desktop/home/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./gtk.nix
-  ];
-}
diff --git a/modules/desktop/home/gtk.nix b/modules/desktop/home/gtk.nix
deleted file mode 100644
index a8f6be0..0000000
--- a/modules/desktop/home/gtk.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.collinux.desktop.gtk;
-in
-  lib.mkIf (cfg.enable && cfg.theme == "adwaita") {
-    dconf = {
-      enable = true;
-      settings = {
-        "org/gnome/desktop/interface" = {
-          color-scheme = "prefer-dark";
-          enable-hot-corners = false;
-        };
-      };
-    };
-  }
diff --git a/modules/desktop/nixos/default.nix b/modules/desktop/nixos/default.nix
index 23deeca..1301483 100644
--- a/modules/desktop/nixos/default.nix
+++ b/modules/desktop/nixos/default.nix
@@ -1,6 +1,7 @@
 {...}: {
   imports = [
     ./gnome.nix
+    ./fonts.nix
 
     ./greeters/greetd.nix
     ./greeters/gdm.nix
diff --git a/modules/desktop/nixos/fonts.nix b/modules/desktop/nixos/fonts.nix
new file mode 100644
index 0000000..3f10d92
--- /dev/null
+++ b/modules/desktop/nixos/fonts.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  fonts = {
+    enableDefaultPackages = false;
+    # fontDir.enable = true;
+    fontconfig.enable = true;
+    packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot)
+  };
+}
diff --git a/modules/desktop/nixos/gnome.nix b/modules/desktop/nixos/gnome.nix
index 967452e..c88a809 100644
--- a/modules/desktop/nixos/gnome.nix
+++ b/modules/desktop/nixos/gnome.nix
@@ -81,6 +81,12 @@ in
               sleep-inactive-ac-type = "nothing";
             };
 
+            # Theming, etc
+            "org/gnome/desktop/interface" = {
+              color-scheme = "prefer-dark";
+              enable-hot-corners = false;
+            };
+
             # Keybindings
             "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
               binding = "<Super>Return";
diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix
index 1837f8b..72dda95 100644
--- a/modules/desktop/options.nix
+++ b/modules/desktop/options.nix
@@ -40,6 +40,7 @@ in {
       gnome.enable = mkEnableOption "gnome";
 
       gtk = {
+        enable = mkEnableOption "gtk theming";
         theme = mkOption {
           type = types.enum ["catppuccin" "adwaita"];
           default = config.collinux.theme;