From 3a6a2f0bccb37c04942b10a9fd7ed0321d11a3b1 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 28 Jul 2025 01:39:38 +0100
Subject: [PATCH] Move gtk configuration

---
 home-manager/opdavies/t480.nix   |  4 ----
 modules/home-manager/default.nix |  1 -
 modules/home-manager/gtk.nix     | 34 --------------------------------
 modules2/gtk/animations.nix      |  6 ++++++
 modules2/gtk/enable.nix          |  3 +++
 modules2/gtk/icon-theme.nix      | 10 ++++++++++
 modules2/gtk/theme.nix           | 10 ++++++++++
 7 files changed, 29 insertions(+), 39 deletions(-)
 delete mode 100644 modules/home-manager/gtk.nix
 create mode 100644 modules2/gtk/animations.nix
 create mode 100644 modules2/gtk/enable.nix
 create mode 100644 modules2/gtk/icon-theme.nix
 create mode 100644 modules2/gtk/theme.nix

diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index dafa10a3..c44a3d42 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -13,10 +13,6 @@
       starship.enable = true;
       zsh.enable = true;
     };
-
-    desktop = {
-      gtk.enable = true;
-    };
   };
 
   programs = {
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 48196b9c..bbc83f21 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./bookmarkthis.nix
     ./dev-commit.nix
-    ./gtk.nix
     ./node.nix
     ./starship.nix
     ./zsh
diff --git a/modules/home-manager/gtk.nix b/modules/home-manager/gtk.nix
deleted file mode 100644
index 3f737bc7..00000000
--- a/modules/home-manager/gtk.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.desktop.gtk;
-in
-{
-  options.features.desktop.gtk.enable = mkEnableOption "Enable gtk";
-
-  config = mkIf cfg.enable {
-    gtk = with pkgs; {
-      enable = true;
-
-      theme = {
-        name = "Arc-Dark";
-        package = arc-theme;
-      };
-
-      iconTheme = {
-        name = "Arc";
-        package = arc-icon-theme;
-      };
-
-      gtk3.extraConfig.gtk-enable-animations = false;
-      gtk4.extraConfig.gtk-enable-animations = false;
-    };
-  };
-}
diff --git a/modules2/gtk/animations.nix b/modules2/gtk/animations.nix
new file mode 100644
index 00000000..45d5edac
--- /dev/null
+++ b/modules2/gtk/animations.nix
@@ -0,0 +1,6 @@
+{
+  flake.modules.homeManager.gui.gtk = {
+    gtk3.extraConfig.gtk-enable-animations = false;
+    gtk4.extraConfig.gtk-enable-animations = false;
+  };
+}
diff --git a/modules2/gtk/enable.nix b/modules2/gtk/enable.nix
new file mode 100644
index 00000000..ceed16d3
--- /dev/null
+++ b/modules2/gtk/enable.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.gui.gtk.enable = true;
+}
diff --git a/modules2/gtk/icon-theme.nix b/modules2/gtk/icon-theme.nix
new file mode 100644
index 00000000..aed95ddf
--- /dev/null
+++ b/modules2/gtk/icon-theme.nix
@@ -0,0 +1,10 @@
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      gtk.iconTheme = {
+        name = "Arc";
+        package = pkgs.arc-icon-theme;
+      };
+    };
+}
diff --git a/modules2/gtk/theme.nix b/modules2/gtk/theme.nix
new file mode 100644
index 00000000..44e42980
--- /dev/null
+++ b/modules2/gtk/theme.nix
@@ -0,0 +1,10 @@
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      gtk.theme = {
+        name = "Arc-Dark";
+        package = pkgs.arc-theme;
+      };
+    };
+}