options/style: delete

modules/options/style/gtk.nix

@@ -1,37 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkOption mkEnableOption;
-  inherit (lib.types) str package;
-in {
-  options.modules.usrEnv.style.gtk = {
-    enable = mkEnableOption "Wether to enable GTK theming";
-    theme = {
-      name = mkOption {
-        description = "The GTK theme name";
-        default = "Gruvbox-Dark-BL";
-        type = str;
-      };
-      package = mkOption {
-        description = "The GTK theme package";
-        default = pkgs.gruvbox-gtk-theme;
-        type = package;
-      };
-    };
-    iconTheme = {
-      description = "The GTK icon theme";
-      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

@@ -1,35 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (lib) mkOption;
-  inherit (lib.types) package str int;
-in {
-  imports = [
-    ./qt.nix
-    ./gtk.nix
-    ./fonts.nix
-    ./colors.nix
-  ];
-
-  options.modules.style = {
-    cursor = {
-      package = mkOption {
-        type = package;
-        default = pkgs.bibata-cursors;
-        description = "Cursor package";
-      };
-      name = mkOption {
-        type = str;
-        default = "Bibata-Modern-Classic";
-        description = "Cursor name";
-      };
-      size = mkOption {
-        type = int;
-        default = 32;
-        description = "Cursor size";
-      };
-    };
-  };
-}

modules/options/style/qt.nix

@@ -1,32 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkOption;
-  inherit (lib.types) str package;
-in {
-  options.modules.usrEnv.style.qt = {
-    enable = mkEnableOption "qt theming";
-    name = mkOption {
-      description = "qt theme name";
-      default = "Catppuccin-Mocha-Dark";
-      type = str;
-    };
-    variant = mkOption {
-      description = "qt theme variant";
-      default = "mocha";
-      type = str;
-    };
-    accentColor = mkOption {
-      description = "accent colour for qt theme";
-      default = "green";
-      type = str;
-    };
-    package = mkOption {
-      description = "qt theme package";
-      default = pkgs.catppuccin-kde;
-      type = package;
-    };
-  };
-}

modules/style/gtk.nix

@@ -1,12 +1,44 @@
 {
   config,
   lib,
+  pkgs,
   ...
-}:
+}: let
-with lib; let
+  inherit (lib.options) mkOption mkEnableOption;
-  cfg = config.modules.usrEnv.style.gtk;
+  inherit (lib.types) str package;
+  inherit (lib.modules) mkIf;
+  cfg = config.modules.theme.gtk;
 in {
+  options.modules.theme.gtk = {
+    enable = mkEnableOption "Wether to enable GTK theming";
+    theme = {
+      name = mkOption {
+        description = "The GTK theme name";
+        default = "Gruvbox-Dark-BL";
+        type = str;
+      };
+      package = mkOption {
+        description = "The GTK theme package";
+        default = pkgs.gruvbox-gtk-theme;
+        type = package;
+      };
+    };
+    iconTheme = {
+      description = "The GTK icon theme";
+      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;
+      };
+    };
+  };
   config = mkIf cfg.enable {
-    programs.dconf.enable = true; # NOTE: we need this or gtk breaks
+    # NOTE: we need this or gtk breaks
+    programs.dconf.enable = true;
   };
 }

modules/style/qt.nix

@@ -3,20 +3,37 @@
   lib,
   pkgs,
   ...
-}:
+}: let
-with lib; let
+  inherit (lib.modules) mkIf;
-  theme = {
+  inherit (lib) mkEnableOption mkOption;
-    package = pkgs.gruvbox-gtk-theme;
+  inherit (lib.types) str package;
-    name = "Gruvbox-Dark-BL";
-  };
   cfg = config.modules.usrEnv.style.qt;
 in {
-  config = mkIf cfg.enable {
+  options.modules.usrEnv.style.qt = {
-    environment.sessionVariables = {QT_QPA_PLATFORMTHEME = "qt5ct";};
+    enable = mkEnableOption "qt theming";
-
+    name = mkOption {
-    environment.variables = {
+      description = "qt theme name";
-      QT_STYLE_OVERRIDE = lib.mkForce "kvantum";
+      default = "Catppuccin-Mocha-Dark";
-      GTK_THEME = theme.name;
+      type = str;
     };
+    variant = mkOption {
+      description = "qt theme variant";
+      default = "mocha";
+      type = str;
+    };
+    accentColor = mkOption {
+      description = "accent colour for qt theme";
+      default = "green";
+      type = str;
+    };
+    package = mkOption {
+      description = "qt theme package";
+      default = pkgs.catppuccin-kde;
+      type = package;
+    };
+  };
+
+  config =
+    mkIf cfg.enable {
     };
 }

modules/wms/wayland/hyprland/exec.nix

@@ -3,14 +3,14 @@
   pkgs,
   ...
 }: let
-  inherit (config.modules.style) cursor;
+  # inherit (config.modules.style) cursor;
   inherit (builtins) toString;
 in {
   programs.hyprland.settings = {
     # Hyprland settings
     # Programs which get executed at Hyprland start.
     exec-once = [
-      "hyprctl setcursor ${cursor.name} ${toString cursor.size}"
+      # "hyprctl setcursor ${cursor.name} ${toString cursor.size}"
 
       "[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc"
       "[workspace special:audio; silent;tile] ${pkgs.pwvucontrol}/bin/pwvucontrol"