From a1396303fb5682530c9c713387713c79b7f1f9c3 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Mon, 4 Sep 2023 04:57:43 +0200
Subject: [PATCH] feat(nvim): use nix-vscode-ext overlay, vscode, sync

---
 home/apps/vscode.nix           | 17 ++++++++++-------
 home/apps/vscode/settings.json | 22 ++++++++++++++++++++--
 machines/lib.nix               |  2 +-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix
index a4ba196..5ec303f 100644
--- a/home/apps/vscode.nix
+++ b/home/apps/vscode.nix
@@ -12,8 +12,8 @@
 in {
   programs.vscode = {
     enable = true;
-    package = pkgs.vscodium;
-    extensions = with pkgs.nix-vscode-extensions.vscode-marketplace; [
+    package = pkgs.vscode;
+    extensions = with pkgs.vscode-marketplace; [
       adrianwilczynski.alpine-js-intellisense
       astro-build.astro-vscode
       bradlc.vscode-tailwindcss
@@ -21,12 +21,14 @@ in {
       denoland.vscode-deno
       eamodio.gitlens
       esbenp.prettier-vscode
+      github.copilot
       github.vscode-pull-request-github
       gitlab.gitlab-workflow
       jnoortheen.nix-ide
       kamadorueda.alejandra
       leonardssh.vscord
       lunuan.kubernetes-templates
+      mikestead.dotenv
       mkhl.direnv
       ms-kubernetes-tools.vscode-kubernetes-tools
       pkief.material-icon-theme
@@ -34,6 +36,7 @@ in {
       rust-lang.rust-analyzer
       sumneko.lua
       tamasfe.even-better-toml
+      tomoki1207.pdf
       valentjn.vscode-ltex
       vscodevim.vim
     ];
@@ -41,12 +44,12 @@ in {
   };
 
   home.file = lib.mkIf isDarwin {
-    "Library/Application Support/VSCodium/User/keybindings.json".source = keybindingsJSON;
-    "Library/Application Support/VSCodium/User/settings.json".source = settingsJSON;
+    "Library/Application Support/Code/User/keybindings.json".source = keybindingsJSON;
+    "Library/Application Support/Code/User/settings.json".source = settingsJSON;
   };
   xdg.configFile = lib.mkIf isLinux {
-    "VSCodium/User/keybindings.json".source = keybindingsJSON;
-    "VSCodium/User/settings.json".source = settingsJSON;
+    "Code/User/keybindings.json".source = keybindingsJSON;
+    "Code/User/settings.json".source = settingsJSON;
   };
-  xdg.mimeApps.defaultApplications."text/plain" = "codium.desktop";
+  xdg.mimeApps.defaultApplications."text/plain" = "code.desktop";
 }
diff --git a/home/apps/vscode/settings.json b/home/apps/vscode/settings.json
index f9b4b5f..b606969 100644
--- a/home/apps/vscode/settings.json
+++ b/home/apps/vscode/settings.json
@@ -36,6 +36,9 @@
   "extensions.autoUpdate": false,
   "extensions.ignoreRecommendations": true,
   "git.autofetch": true,
+  "gopls": {
+    "ui.semanticTokens": true
+  },
   "ltex.additionalRules.enablePickyRules": true,
   "ltex.additionalRules.motherTongue": "de-AT",
   "markdown.preview.fontFamily": "IBM Plex Sans, sans-serif",
@@ -61,7 +64,17 @@
   "vim.incsearch": true,
   "vim.insertModeKeyBindings": [],
   "vim.leader": "<space>",
+  "vim.visualModeKeyBindingsNonRecursive": [
+    {
+      "before": ["r", "h"],
+      "commands": ["git.revertSelectedRanges"]
+    }
+  ],
   "vim.normalModeKeyBindingsNonRecursive": [
+    {
+      "before": ["g", "r"],
+      "commands": ["editor.action.goToReferences"]
+    },
     {
       "before": ["K"],
       "commands": ["editor.action.showHover"]
@@ -119,12 +132,17 @@
   "vim.smartRelativeLine": true,
   "vs-kubernetes": {
     "vs-kubernetes.crd-code-completion": "enabled",
-    "vs-kubernetes.minikube-show-information-expiration": "2024-12-00T00:00:00.000Z"
+    "vs-kubernetes.minikube-show-information-expiration": "2024-01-29T10:44:10.813Z"
   },
   "vscord.app.name": "VSCodium",
+  "vscord.status.idle.check": false,
   "window.autoDetectColorScheme": true,
   "workbench.colorTheme": "Catppuccin Mocha",
   "workbench.iconTheme": "catppuccin-mocha",
   "workbench.preferredDarkColorTheme": "Catppuccin Mocha",
-  "workbench.preferredLightColorTheme": "Catppuccin Latte"
+  "workbench.preferredLightColorTheme": "Catppuccin Latte",
+  "d.stdlibPath": "auto",
+  "d.servedReleaseChannel": "beta",
+  "dfmt.braceStyle": "otbs",
+  "d.alwaysShowDubStatusButtons": true
 }
diff --git a/machines/lib.nix b/machines/lib.nix
index b5b08b8..3a3fde2 100644
--- a/machines/lib.nix
+++ b/machines/lib.nix
@@ -10,10 +10,10 @@
         };
       };
       nekowinston-nur = import inputs.nekowinston-nur {inherit (prev) pkgs;};
-      nix-vscode-extensions = inputs.nix-vscode-extensions.extensions.${prev.system};
       sway-unwrapped = inputs.swayfx.packages.${prev.system}.default;
     })
     inputs.nekowinston-nur.overlays.default
+    inputs.nix-vscode-extensions.overlays.default
   ];
   hmCommonConfig = {username}: ({
     config,