refactor2

system/optional/default.nix

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

system/optional/nfs.nix

@@ -1,11 +1,9 @@
 { config, lib, ... }: {
 
   options.nfs.client.enable = lib.mkEnableOption "Enable Nas (via NFS) as a client";
-  options.nfs.server.enable = lib.mkEnableOption "Enable Nas (via NFS) as the server";
+  # options.nfs.server.enable = lib.mkEnableOption "Enable Nas (via NFS) as the server";
 
-  config = lib.mkMerge [
+  config = lib.mkIf config.nfs.client.enable {
-    (
-      lib.mkIf config.nfs.client.enable {
     fileSystems."/mnt/nas" = {
       device = "nixserver:/share";
       fsType = "nfs";
@@ -17,12 +15,5 @@
         "_netdev"
       ];
     };
-      }
+  };
-    )
-    (
-      lib.mkIf config.nfs.server.enable {
-        
-      } 
-    )
-  ];
 }

system/optional/stylix.nix

@@ -1,39 +0,0 @@
-{stylix, pkgs, config, lib, ...}: {
-  options.stylix.enable = lib.mkEnableOption "Enable Stylix";
-
-  config = lib.mkIf config.stylix.enable {
-    imports = [stylix.nixosModules.stylix];
-
-    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

@@ -0,0 +1,10 @@
+{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

@@ -0,0 +1,32 @@
+{ 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";
+    };
+  };
+}