diff --git a/configurations/nixos/horizon/default.nix b/configurations/nixos/horizon/default.nix
index b916d82..0f307d2 100644
--- a/configurations/nixos/horizon/default.nix
+++ b/configurations/nixos/horizon/default.nix
@@ -3,6 +3,6 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
-    # ./network-mount.nix
+    ./network-mount.nix
   ];
 }
diff --git a/configurations/nixos/twilight/default.nix b/configurations/nixos/twilight/default.nix
index aa841f8..f61e0ad 100644
--- a/configurations/nixos/twilight/default.nix
+++ b/configurations/nixos/twilight/default.nix
@@ -4,6 +4,6 @@
     ./configuration.nix
     ./hardware-configuration.nix
     ./nvidia-drivers.nix
-    # ./network-mount.nix
+    ./network-mount.nix
   ];
 }
diff --git a/modules/home-manager-modules/programs/vscode/claudeDev.nix b/modules/home-manager-modules/programs/vscode/claudeDev.nix
index a2b4b9e..5e08b41 100644
--- a/modules/home-manager-modules/programs/vscode/claudeDev.nix
+++ b/modules/home-manager-modules/programs/vscode/claudeDev.nix
@@ -15,6 +15,14 @@
       profile.extraExtensions.claudeDev.enable
       && profile.extraExtensions.claudeDev.mcp.nixos.enable
   ) (lib.attrValues config.programs.vscode.profiles);
+
+  mcpServersConfig = lib.mkMerge [
+    (lib.mkIf anyProfileHasMcpNixos {
+      nixos = {
+        command = "${mcp-nixos}/bin/mcp-nixos";
+      };
+    })
+  ];
 in {
   options.programs.vscode.profiles = lib.mkOption {
     type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
@@ -43,11 +51,7 @@ in {
   config = lib.mkIf anyProfileHasMcpNixos {
     home.file."${config.xdg.configHome}/VSCodium/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json" = {
       text = builtins.toJSON {
-        mcpServers = {
-          nixos = {
-            command = "${mcp-nixos}/bin/mcp-nixos";
-          };
-        };
+        mcpServers = mcpServersConfig;
       };
       force = true;
     };