diff --git a/modules/common/default.nix b/modules/common/default.nix
index 54674d0..aba9d6e 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./applications
+    ./programming
     ./utilities
   ];
   options = {
@@ -29,7 +30,6 @@
         vim
         wget
         curl
-        vscode
       ];
       home-manager.users.${config.user}.home.stateVersion = stateVersion;
       home-manager.users.root.home.stateVersion = stateVersion;
diff --git a/modules/common/programming/default.nix b/modules/common/programming/default.nix
new file mode 100644
index 0000000..a2139f2
--- /dev/null
+++ b/modules/common/programming/default.nix
@@ -0,0 +1,5 @@
+{ ... }:
+{
+  imports = [
+  ];
+}
diff --git a/modules/common/programming/vscode.nix b/modules/common/programming/vscode.nix
new file mode 100644
index 0000000..3efed40
--- /dev/null
+++ b/modules/common/programming/vscode.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, lib, ... }:
+{
+  options = {
+    vscode = {
+      enable = lib.mkEnableOption {
+        description = "Enable Visual Studio Code";
+        default = false;
+      };
+    };
+  };
+  config = lib.mkIf (config.gui.enable && config.vscode.enable) {
+    home-manager.users.${config.user} = {
+      programs.vscode = {
+        enable = true;
+        extensions = with pkgs.vscode-extensions; [
+          bbenoist.nix
+          # catppuccin.catpuccin-vsc
+        ];
+      };
+    };
+  };
+}