From 8d074458d52232f115b485116d41b87703b4dfa7 Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Tue, 17 Oct 2023 22:00:30 +0200
Subject: [PATCH] things

---
 flake.lock              | 34 ++++++++++------------------------
 flake.nix               |  3 +++
 home-manager/vscode.nix | 38 ++++++++++++++++----------------------
 3 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/flake.lock b/flake.lock
index d8a8012..d178933 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696940889,
-        "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=",
+        "lastModified": 1697555443,
+        "narHash": "sha256-nsq8A+adEdN7bvVdz09LFyrHkTW5GtOzo/ctlHhyaaE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408",
+        "rev": "b3acf1dc78b38a2fe03b287fead44d7ad25ac7c5",
         "type": "github"
       },
       "original": {
@@ -22,7 +22,9 @@
     },
     "minegrub-theme": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1689938346,
@@ -40,22 +42,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1689850295,
-        "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1697059129,
         "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
@@ -73,11 +59,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1697320059,
-        "narHash": "sha256-iyyQocGQYSEg6kBrHU1ernV4QelvQd1YbvQ2kIK5e20=",
+        "lastModified": 1697560007,
+        "narHash": "sha256-7A5Y//eA85aSLTQaW5lhGz70M8ctlAGdN0M+m8/h1uM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "00cf27339d55115a0f5311041dded91049e4426d",
+        "rev": "7d302f239b1a835a400a39c061af7cac1c3c77af",
         "type": "github"
       },
       "original": {
@@ -90,7 +76,7 @@
       "inputs": {
         "home-manager": "home-manager",
         "minegrub-theme": "minegrub-theme",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nur": "nur"
       }
     }
diff --git a/flake.nix b/flake.nix
index cf85bf0..8bd89b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,13 +6,16 @@
   inputs = {
     # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
     nur.url = "github:nix-community/NUR";
+    nur.inputs.nixpkgs.follows = "nixpkgs";
 
     # Home manager
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     minegrub-theme.url = "github:Lxtharia/minegrub-theme/b6f8a3a7e2fd22d72e2dbdaf563ad0bcb5c78e45";
+    minegrub-theme.inputs.nixpkgs.follows = "nixpkgs";
 
     # TODO: Add any other flake you might need
     # hardware.url = "github:nixos/nixos-hardware";
diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix
index c3a5386..53c2cbb 100644
--- a/home-manager/vscode.nix
+++ b/home-manager/vscode.nix
@@ -3,7 +3,7 @@
     enable = true;
     package = pkgs.vscode;
     enableUpdateCheck = false;
-    mutableExtensionsDir = false;
+    mutableExtensionsDir = true;
     userSettings = {
       # Note: In settings.json, `.` in a key is not equivalent to a nested object property.
       "[nix]"."editor.formatOnSave" = true;
@@ -27,34 +27,28 @@
       "terminal.integrated.enableMultiLinePasteWarning" = false;
       "git.confirmSync" = false;
       "debug.allowBreakpointsEverywhere" = false;
-      "rust-analyzer.server.path" = lib.getExe' pkgs.rustup "rust-analyzer";
     };
     extensions = with pkgs.vscode-extensions; [
-      jnoortheen.nix-ide
-      usernamehw.errorlens
-      ms-vscode.cmake-tools
-      ms-vscode.cpptools
-      eamodio.gitlens
-      tamasfe.even-better-toml
-      ms-vscode-remote.remote-ssh
-      esbenp.prettier-vscode
+      bmalehorn.vscode-fish
       dbaeumer.vscode-eslint
-      ms-python.python
-      redhat.vscode-yaml
+      eamodio.gitlens
+      esbenp.prettier-vscode
+      github.vscode-github-actions
+      jnoortheen.nix-ide
       mads-hartmann.bash-ide-vscode
       ms-azuretools.vscode-docker
-      bmalehorn.vscode-fish
-      nvarner.typst-lsp
-      github.vscode-github-actions
-      vadimcn.vscode-lldb
+      ms-python.python
+      ms-vscode-remote.remote-ssh
+      ms-vscode.cmake-tools
+      ms-vscode.cpptools
       ms-vscode.hexeditor
+      nvarner.typst-lsp
+      redhat.vscode-yaml
+      rust-lang.rust-analyzer
+      tamasfe.even-better-toml
+      usernamehw.errorlens
+      vadimcn.vscode-lldb
     ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-      {
-        publisher = "rust-lang";
-        name = "rust-analyzer";
-        version = "0.4.1695";
-        sha256 = "sha256-dhZN7xapaOI7A7Bn7DrnSuGO1JI2zA7LU8jb5PYmWXM=";
-      }
       {
         publisher = "dtsvet";
         name = "vscode-wasm";