From 3aec72f64a0b7ec35fc9094ead2d067a21e3f52e Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Mon, 29 Apr 2024 16:46:04 +0200
Subject: [PATCH] Switch to nix-vscode-extensions

---
 flake.lock              | 72 +++++++++++++++++++++++++++++++++++++++++
 flake.nix               |  5 +++
 modules/home/vscode.nix | 28 +++++++++-------
 3 files changed, 94 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 451d941..1d9d2f0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,40 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_6"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -277,6 +311,28 @@
         "type": "github"
       }
     },
+    "nix-vscode-extensions": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714354201,
+        "narHash": "sha256-xmAJlIiELB8c0LXMuxiXt4YQ7/DYcI4gs1gX9ovbDiI=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "694249920f2edc3e4df546b73f9c73befd6f3f6e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1713714899,
@@ -333,6 +389,7 @@
         "hyprland": "hyprland",
         "hyprlock": "hyprlock",
         "nix-index-database": "nix-index-database",
+        "nix-vscode-extensions": "nix-vscode-extensions",
         "nixpkgs": "nixpkgs_2",
         "sops-nix": "sops-nix"
       }
@@ -433,6 +490,21 @@
         "type": "github"
       }
     },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "wlroots": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 32f67b0..b4aca9f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,11 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
+        nix-vscode-extensions = {
+            url = "github:nix-community/nix-vscode-extensions";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
+
         hyprland.url = "github:hyprwm/Hyprland";
 
         hyprlock = {
diff --git a/modules/home/vscode.nix b/modules/home/vscode.nix
index 506bb23..a297e1e 100644
--- a/modules/home/vscode.nix
+++ b/modules/home/vscode.nix
@@ -1,4 +1,5 @@
 {
+    inputs,
     config,
     pkgs,
     lib,
@@ -11,22 +12,27 @@
 
         programs.vscode = {
             enable = true;
-            package = pkgs.vscodium;
 
-            mutableExtensionsDir = false;
-            extensions = [
-                pkgs.vscode-extensions.jnoortheen.nix-ide
-                pkgs.vscode-extensions.pkief.material-icon-theme
-                pkgs.vscode-extensions.yzhang.markdown-all-in-one
-            ];
+            package = pkgs.vscode-with-extensions.override {
+                vscode = pkgs.vscodium;
+                vscodeExtensions = let
+                    ext = inputs.nix-vscode-extensions.extensions.${pkgs.system};
+                in [
+                    ext.open-vsx.jnoortheen.nix-ide
+                    ext.open-vsx.pkief.material-icon-theme
+                    ext.open-vsx.yzhang.markdown-all-in-one
+                ];
+            };
         };
 
         systemd.user.tmpfiles.rules = let
             settings = builtins.replaceStrings [","] [",\\n"] (builtins.toJSON {
-                "workbench.colorTheme" = {
-                    dark = "Default Dark Modern";
-                    light = "Default Light Modern";
-                }."${config.myConfig.de.theme}";
+                "workbench.colorTheme" =
+                    {
+                        dark = "Default Dark Modern";
+                        light = "Default Light Modern";
+                    }
+                    ."${config.myConfig.de.theme}";
                 "workbench.iconTheme" = "material-icon-theme";
                 "editor.fontFamily" = "JetBrainsMono Nerd Font";
                 "explorer.confirmDelete" = false;