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

7 files changed, 44 insertions, 50 deletions

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;