gtk: fixed stuff

hosts/vali/temperance/configuration.nix

@@ -66,6 +66,7 @@
         };
       };
       style = {
+        gtk.enable = true;
         stylix = {
           enable = true;
           scheme = "${pkgs.base16-schemes}/share/themes/bright.yaml";
@@ -108,7 +109,6 @@
     };
     theming = {
       quickshell.enable = true;
-      gtk.enable = true;
       qt = {
         enable = false;
         package = pkgs.kde-gruvbox;

modules/options/style/gtk.nix

@@ -4,11 +4,10 @@
   config,
   ...
 }: let
-  inherit (config.modules.other.system) username;
   inherit (lib) mkOption mkEnableOption;
   inherit (lib.types) str package submodule;
 in {
-  options.modules.style.gtk = {
+  options.modules.usrEnv.style.gtk = {
     enable = mkEnableOption "Wether to enable GTK theming";
     theme = {
       name = mkOption {
@@ -22,21 +21,17 @@ in {
         type = package;
       };
     };
-    iconTheme = mkOption {
+    iconTheme = {
       description = "The GTK icon theme";
-      type = submodule {
-        options = {
-          name = mkOption {
-            description = "The GTK icon theme name";
-            default = "Papirus-Dark";
-            type = str;
-          };
-          package = mkOption {
-            description = "The GTK icon theme package";
-            default = pkgs.catppuccin-papirus-folders;
-            type = package;
-          };
-        };
+      name = mkOption {
+        description = "The GTK icon theme name";
+        default = "Papirus-Dark";
+        type = str;
+      };
+      package = mkOption {
+        description = "The GTK icon theme package";
+        default = pkgs.catppuccin-papirus-folders;
+        type = package;
       };
     };
   };

modules/options/style/module.nix

@@ -9,7 +9,7 @@ in {
   imports = [
     ./stylix.nix
     #    ./qt.nix
-    #    ./gtk.nix
+    ./gtk.nix
   ];
 
   options.modules.style = {

modules/style/gtk.nix

@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.modules.theming.gtk;
+  cfg = config.modules.usrEnv.style.gtk;
   inherit (config.modules.other.system) username;
-  inherit (config.modules.style.gtk) theme iconTheme;
+  inherit (config.modules.usrEnv.style.gtk) theme iconTheme;
 in {
   config = mkIf cfg.enable {
     home-manager.users.${username} = {
@@ -16,7 +16,7 @@ in {
           inherit (theme) name package;
         };
         iconTheme = {
-          inherit (iconTheme) name Package;
+          inherit (iconTheme) name package;
         };
       };
     };