Fully configure VSCode

Signed-off-by: Mel <einebeere@gmail.com>

3 files changed, 24 insertions, 10 deletions

diff --git a/modules/common.nix b/modules/common.nix
index 00fc46a..dbc4efc 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -5,7 +5,6 @@
     ./nix.nix
     ./user.nix
     ./locale.nix
-    ./code.nix
     ./vim.nix
     ./tmux.nix
     ./gnome.nix
diff --git a/modules/code.nix b/modules/home/code.nix
index 506e0bd..053d550 100644
--- a/modules/code.nix
+++ b/modules/home/code.nix
@@ -1,6 +1,14 @@
-{ pkgs, unstablePkgs, ... }:
+{
+  pkgs,
+  unstablePkgs,
+  lib,
+  ...
+}:
 
 let
+  settings = import ./../../configs/vscode/settings.nix { inherit pkgs lib; };
+  keybindings = import ./../../configs/vscode/keybindings.nix { };
+
   extensions = with unstablePkgs.vscode-extensions; [
     # Microsoft vendor extensions
     ms-vscode.hexeditor
@@ -48,14 +56,17 @@ let
     ms-vscode.remote-repositories
     github.remotehub
   ];
-
-  code =
-    with unstablePkgs;
-    vscode-with-extensions.override {
-      vscode = vscodium;
-      vscodeExtensions = extensions ++ externalExtensions ++ newVendorExtensions;
-    };
 in
 {
-  environment.systemPackages = [ code ];
+  programs.vscode = {
+    enable = true;
+    enableUpdateCheck = false;
+    enableExtensionUpdateCheck = false;
+    mutableExtensionsDir = false;
+    package = unstablePkgs.vscodium;
+
+    extensions = extensions ++ externalExtensions ++ newVendorExtensions;
+    keybindings = keybindings;
+    userSettings = settings;
+  };
 }
diff --git a/modules/home/common.nix b/modules/home/common.nix
index 99900e6..7e10560 100644
--- a/modules/home/common.nix
+++ b/modules/home/common.nix
@@ -1,6 +1,10 @@
 { ... }:
 
 {
+  imports = [
+    ./code.nix
+  ];
+
   programs = {
     git = {
       enable = true;