refactor2

system/optional/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./nfs.nix
     ./desktop.nix
-    ./steam.nix
+    ./gaming.nix
+    ./stylix.nix
   ];
 }

system/optional/gaming.nix

@@ -1,4 +1,4 @@
-{ config, lib, ...}: {
+{ pkgs, config, lib, ...}: {
 
   options.gaming.enable = lib.mkEnableOption "Enable steam and related software";
 

system/optional/nfs.nix

@@ -3,7 +3,9 @@
   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";
 
-  config = lib.mkIf config.nfs.client.enable {
+  config = lib.mkMerge [
+    (
+      lib.mkIf config.nfs.client.enable {
         fileSystems."/mnt/nas" = {
           device = "nixserver:/share";
           fsType = "nfs";
@@ -15,9 +17,12 @@
             "_netdev"
           ];
         };
-  };
-
-  config = lib.mkIf config.nfs.server.enable {
-    
-  };
+      }
+    )
+    (
+      lib.mkIf config.nfs.server.enable {
+        
+      } 
+    )
+  ];
 }