diff --git a/system/optional/default.nix b/system/optional/default.nix
index 218b4e91..123f026d 100644
--- a/system/optional/default.nix
+++ b/system/optional/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./nfs.nix
     ./desktop.nix
-    ./steam.nix
+    ./gaming.nix
+    ./stylix.nix
   ];
 }
diff --git a/system/optional/steam.nix b/system/optional/gaming.nix
similarity index 94%
rename from system/optional/steam.nix
rename to system/optional/gaming.nix
index 56b70276..7345f38e 100644
--- a/system/optional/steam.nix
+++ b/system/optional/gaming.nix
@@ -1,4 +1,4 @@
-{ config, lib, ...}: {
+{ pkgs, config, lib, ...}: {
 
   options.gaming.enable = lib.mkEnableOption "Enable steam and related software";
 
diff --git a/system/optional/nfs.nix b/system/optional/nfs.nix
index 47e71ad4..02aebf1e 100644
--- a/system/optional/nfs.nix
+++ b/system/optional/nfs.nix
@@ -3,21 +3,26 @@
   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 {
-    fileSystems."/mnt/nas" = {
-      device = "nixserver:/share";
-      fsType = "nfs";
-      options = [
-        "nfsvers=4.2"
-        "noauto"
-        "x-systemd.automount"
-        "x-systemd.idle-timeout=600"
-        "_netdev"
-      ];
-    };
-  };
-
-  config = lib.mkIf config.nfs.server.enable {
-    
-  };
+  config = lib.mkMerge [
+    (
+      lib.mkIf config.nfs.client.enable {
+        fileSystems."/mnt/nas" = {
+          device = "nixserver:/share";
+          fsType = "nfs";
+          options = [
+            "nfsvers=4.2"
+            "noauto"
+            "x-systemd.automount"
+            "x-systemd.idle-timeout=600"
+            "_netdev"
+          ];
+        };
+      }
+    )
+    (
+      lib.mkIf config.nfs.server.enable {
+        
+      } 
+    )
+  ];
 }