diff --git a/modules/hosts/john-p14s/default.nix b/modules/hosts/john-p14s/default.nix
index e77ed29..e1e4e26 100644
--- a/modules/hosts/john-p14s/default.nix
+++ b/modules/hosts/john-p14s/default.nix
@@ -16,6 +16,7 @@
           gnome
           desktop
         ];
+        vscode.enable = true;
       }
     ] ++ (with self.modules.nixos; [
       p14sConfiguration
diff --git a/modules/programs/vscode.nix b/modules/programs/vscode.nix
index 7d2c46b..d7a5bd3 100644
--- a/modules/programs/vscode.nix
+++ b/modules/programs/vscode.nix
@@ -1,21 +1,26 @@
-{
-  flake.modules.homeManager.vscode = { pkgs, ... }:
-  {
-    programs.vscode = {
-      enable = true;
-      package = pkgs.vscode;
-      profiles.default.extensions = with pkgs.vscode-extensions; [
-        mhutchie.git-graph
-        ms-vscode-remote.vscode-remote-extensionpack
-        ms-python.python
-        ms-python.vscode-pylance
-        ms-toolsai.jupyter
-        charliermarsh.ruff
-        github.vscode-pull-request-github
-        github.vscode-github-actions
-        github.copilot
-        catppuccin.catppuccin-vsc
-      ];
+{ self, inputs, ... }: {
+  flake.modules.homeManager.vscode = { config, pkgs, lib, ... }: {
+    options.vscode = {
+      enable = lib.mkEnableOption "Enable nix-managed VSCode";
+    };
+
+    config = lib.mkIf config.vscode.enable {
+      programs.vscode = {
+        enable = true;
+        package = pkgs.vscode;
+        profiles.default.extensions = with pkgs.vscode-extensions; [
+          mhutchie.git-graph
+          ms-vscode-remote.vscode-remote-extensionpack
+          ms-python.python
+          ms-python.vscode-pylance
+          ms-toolsai.jupyter
+          charliermarsh.ruff
+          github.vscode-pull-request-github
+          github.vscode-github-actions
+          github.copilot
+          catppuccin.catppuccin-vsc
+        ];
+      };
     };
   };
 }
\ No newline at end of file