optional vscode in desktop

modules/features/desktop.nix

@@ -1,7 +1,6 @@
 # This module is for programs with GUIs that run in a desktop environment
-{ inputs, ... }:
-{
-  flake.modules.homeManager.desktop = { pkgs, ... }: {
+{ self, inputs, ... }: {
+  flake.modules.homeManager.desktop = { config, pkgs, lib, ... }: {
     imports = with inputs.self.modules.homeManager; [
       brave
       ghostty
@@ -11,6 +10,7 @@
     home.packages = with pkgs; [
       mangohud
       sublime4
+      proton-vpn
     ];
   };
 }

modules/hosts/john-p14s/default.nix

@@ -16,6 +16,7 @@
           gnome
           desktop
         ];
+        vscode.enable = true;
       }
     ] ++ (with self.modules.nixos; [
       p14sConfiguration

modules/programs/git.nix

@@ -1,6 +1,6 @@
 { self, inputs, ... }: {
   flake.modules.homeManager.git = { config, pkgs, lib, ... }: {
-    home.packges = with pkgs; [
+    home.packages = with pkgs; [
       git-credential-oauth
     ];
     programs.git = {
@@ -16,5 +16,8 @@
       enableBashIntegration = true;
       enableZshIntegration = true;
     };
+    home.shellAliases = {
+      "lzg" = "lazygit";
+    };
   };
 }

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
+        ];
+      };
     };
   };
 }