refactor2

system/optional/default.nix

@@ -3,6 +3,6 @@
     ./nfs.nix
     ./desktop.nix
     ./gaming.nix
-    ./stylix
+    ./stylix.nix
   ];
 }

system/optional/stylix.nix

@@ -0,0 +1,38 @@
+{stylix, pkgs, config, lib, ...}: {
+  imports = [ stylix.nixosModules.stylix ];
+
+  options.stylix.enable = lib.mkEnableOption "Enable Stylix";
+
+  config = lib.mkIf config.stylix.enable {
+    stylix = {
+      enable = true;
+
+      image = ../../../wallpapers/default.png;
+      polarity = "dark";
+
+      opacity = {
+        terminal = 0.8;
+        popups = 0.8;
+      };
+
+      fonts = {
+        monospace = {
+          package = pkgs.nerd-fonts.jetbrains-mono;
+          name = "JetBrainsMono Nerd Font";
+        };
+
+        emoji = {
+          package = pkgs.twemoji-color-font;
+          name = "Twemoji";
+        };
+
+        sizes = { applications = 14; desktop = 12; popups = 12; terminal = 14; };
+      };
+
+      cursor = {
+        package = pkgs.rose-pine-cursor;
+        name = "Rosé Pine";
+      };
+    };
+  };
+}

system/optional/stylix/default.nix

@@ -1,10 +0,0 @@
-{stylix, pkgs, config, lib, ...}: {
-  options.stylix.enable = lib.mkEnableOption "Enable Stylix";
-
-  config = lib.mkIf config.stylix.enable {
-    imports = [
-      stylix.nixosModules.stylix
-      ./style.nix
-    ];
-  };
-}

system/optional/stylix/style.nix

@@ -1,32 +0,0 @@
-{ pkgs, ...}: {
-  stylix = {
-    enable = true;
-
-    image = ../../../wallpapers/default.png;
-    polarity = "dark";
-
-    opacity = {
-      terminal = 0.8;
-      popups = 0.8;
-    };
-
-    fonts = {
-      monospace = {
-        package = pkgs.nerd-fonts.jetbrains-mono;
-        name = "JetBrainsMono Nerd Font";
-      };
-
-      emoji = {
-        package = pkgs.twemoji-color-font;
-        name = "Twemoji";
-      };
-
-      sizes = { applications = 14; desktop = 12; popups = 12; terminal = 14; };
-    };
-
-    cursor = {
-      package = pkgs.rose-pine-cursor;
-      name = "Rosé Pine";
-    };
-  };
-}