diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index c26f054..05510e4 100755
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -11,6 +11,7 @@
     ./barrier
     ./firefox
     ./kdeconnect
+    ./vs-code
     # ./bitwarden
   ];
 
@@ -56,7 +57,6 @@
     };
   };
 
-  programs.vscode.enable = true;
   programs.home-manager.enable = true;
 
   systemd.user.startServices = "sd-switch";
diff --git a/modules/home-manager/vs-code/default.nix b/modules/home-manager/vs-code/default.nix
new file mode 100644
index 0000000..f3c8d20
--- /dev/null
+++ b/modules/home-manager/vs-code/default.nix
@@ -0,0 +1,64 @@
+{ pkgs, ... }: {
+
+  programs.vscode = {
+    enable = true;
+    package = pkgs.vscodium;
+
+    keybindings = [
+      {
+        "key" = "f7";
+        "command" = "-editor.action.wordHighlight.next";
+        "when" = "editorTextFocus && hasWordHighlights";
+      }
+      {
+        "key" = "f7";
+        "command" = "-editor.action.accessibleDiffViewer.next";
+        "when" = "isInDiffEditor";
+      }
+      {
+        "key" = "f7";
+        "command" = "workbench.action.terminal.toggleTerminal";
+        "when" = "terminal.active";
+      }
+      {
+        "key" = "ctrl+`";
+        "command" = "-workbench.action.terminal.toggleTerminal";
+        "when" = "terminal.active";
+      }
+    ];
+
+    userSettings = {
+      "window.zoomLevel" = 1;
+      "workbench.colorTheme" = "Gruvbox Dark Hard";
+
+      "editor" = {
+        "fontFamily" = "FiraCode NF, FiraCode Nerd Font";
+        "fontLigatures" = true;
+      };
+
+      "terminal.integrated.fontFamily" = "FiraCode NF, FiraCode Nerd Font , FiraCode";
+    };
+
+    extensions = with pkgs.vscode-extensions;[
+      wakatime.vscode-wakatime
+      ms-dotnettools.csharp
+      naumovs.color-highlight
+      ms-vscode-remote.remote-containers
+      ms-azuretools.vscode-docker
+      mikestead.dotenv
+      golang.go
+      jdinhlife.gruvbox
+      wix.vscode-import-cost
+      sumneko.lua
+      yzhang.markdown-all-in-one
+      jnoortheen.nix-ide
+      esbenp.prettier-vscode
+      prisma.prisma
+      ms-python.python
+      ms-vscode-remote.remote-ssh
+      humao.rest-client
+      bradlc.vscode-tailwindcss
+      gruntfuggly.todo-tree
+    ];
+  };
+}