treewide: move hyprland styling out of module

modules/hm/programs/hypr/land/default.nix

@@ -4,7 +4,10 @@
   pkgs,
   osConfig,
   ...
-}: {
+}: let
+  inherit (builtins) toString;
+  styleCfg = osConfig.local.style;
+in {
   imports = [./binds.nix];
 
   config = lib.mkIf osConfig.local.modules.hyprland.enable {
@@ -35,7 +38,8 @@
 
       systemd.enable = false;
 
-      settings = {
+      settings = lib.mkMerge [
+        {
           xwayland = {
             force_zero_scaling = true;
           };
@@ -113,7 +117,24 @@
             disable_hyprland_logo = true;
             middle_click_paste = false;
           };
+        }
+
+        (lib.mkIf styleCfg.enable {
+          env = [
+            "HYPRCURSOR_THEME,${styleCfg.cursorTheme.name}"
+            "HYPRCURSOR_SIZE,${toString styleCfg.cursorTheme.size}"
+            "XCURSOR_SIZE,${toString styleCfg.cursorTheme.size}"
+          ];
+          general = {
+            border_size = 4;
+            "col.active_border" = "rgb(${lib.removePrefix "#" styleCfg.scheme.palette.base0E})";
           };
+          decoration = {
+            rounding = 10;
+            blur.enabled = true;
+          };
+        })
+      ];
     };
   };
 }

modules/hm/services/default.nix

@@ -1,6 +1,7 @@
 {
   imports = [
     ./gammastep.nix
+    ./gtk.nix
     ./syncthing.nix
     ./swaync
     ./udiskie.nix

modules/hm/services/gtk.nix

@@ -1,20 +1,19 @@
 {
   lib,
-  config,
+  osConfig,
   ...
 }: let
-  cfg = config.local.style;
+  styleCfg = osConfig.local.style;
-  inherit (cfg) scheme;
 in {
-  home-manager.sharedModules = lib.mkIf cfg.enable [
+  config = with styleCfg;
-    {
+    lib.mkIf styleCfg.enable {
       gtk = rec {
         enable = true;
         iconTheme = {
-          inherit (cfg.gtk.iconTheme) name package;
+          inherit (gtk.iconTheme) name package;
         };
         theme = {
-          inherit (cfg.gtk.theme) name package;
+          inherit (gtk.theme) name package;
         };
 
         gtk3.extraConfig = {
@@ -24,6 +23,5 @@ in {
       };
 
       dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-${scheme.variant}";
-    }
+    };
-  ];
 }

modules/nix/style/modules/hyprland.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-in {
-  config.home-manager.sharedModules = lib.mkIf cfg.enable [
-    {
-      wayland.windowManager.hyprland.settings = {
-        env = [
-          "HYPRCURSOR_THEME,phinger-cursors-light"
-          "HYPRCURSOR_SIZE,32"
-          "XCURSOR_SIZE,32"
-        ];
-        general = {
-          border_size = 4;
-          "col.active_border" = "rgb(${lib.removePrefix "#" cfg.scheme.palette.base0E})";
-        };
-        decoration = {
-          rounding = 10;
-          blur.enabled = true;
-        };
-      };
-    }
-  ];
-}