diff --git a/home/desktop/default.nix b/home/desktop/default.nix
index 8a19579..74c2baf 100644
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@@ -7,6 +7,6 @@
   imports = [
     ./common.nix
     ./browsers.nix
-    ./vscode.nix
+    ./vscode
   ];
 }
diff --git a/home/desktop/vscode.nix b/home/desktop/vscode/default.nix
similarity index 93%
rename from home/desktop/vscode.nix
rename to home/desktop/vscode/default.nix
index a1843a7..01f20d1 100644
--- a/home/desktop/vscode.nix
+++ b/home/desktop/vscode/default.nix
@@ -7,6 +7,11 @@
 }:
 
 {
+  imports = [
+    ./nix.nix
+  ];
+
+
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
@@ -49,9 +54,6 @@
         vscode-marketplace.mgmcdermott.vscode-language-babel
         vscode-marketplace.yatki.vscode-surround
 
-        ## Nix language extensions
-        vscode-marketplace.jnoortheen.nix-ide
-
         ## Rust language extensions
         vscode-marketplace.rust-lang.rust-analyzer
         vscode-marketplace.serayuzgur.crates
@@ -64,7 +66,6 @@
     userSettings = {
       "editor.linkedEditing" = true;
       "window.menuBarVisibility" = "toggle";
-      "nix.enableLanguageServer" = true;
     };
   };
 }
diff --git a/home/desktop/vscode/nix.nix b/home/desktop/vscode/nix.nix
new file mode 100644
index 0000000..0f3f29d
--- /dev/null
+++ b/home/desktop/vscode/nix.nix
@@ -0,0 +1,24 @@
+{ inputs
+, system
+, config
+, pkgs
+, home-manager
+, ...
+}:
+
+{
+  home.packages = with pkgs; [
+    nil
+  ];
+
+  programs.vscode = {
+    extensions = with inputs.nix-vscode-extensions.extensions.${system};
+      [
+        vscode-marketplace.jnoortheen.nix-ide
+      ];
+    userSettings = {
+      "nix.enableLanguageServer" = true;
+      "nix.serverPath" = "nil";
+    };
+  };
+}