From bf9a570ad598d56fe39c44d209d565edbab205f4 Mon Sep 17 00:00:00 2001
From: cswimr <seaswimmerthefsh@gmail.com>
Date: Sat, 14 Dec 2024 09:08:02 -0500
Subject: [PATCH] update `vscode`

---
 flake.lock              | 19 ++++++++++++++++++-
 flake.nix               |  7 +++++++
 home-manager/vscode.nix | 21 ++++++++++++++-------
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4bed8fb..737155f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -750,7 +750,8 @@
         "nixvim": "nixvim",
         "nur": "nur",
         "plasma-manager": "plasma-manager",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "staging-next": "staging-next"
       }
     },
     "rust-overlay": {
@@ -798,6 +799,22 @@
         "type": "github"
       }
     },
+    "staging-next": {
+      "locked": {
+        "lastModified": 1734177916,
+        "narHash": "sha256-LOFqi+fqyev139weR+0W8YW2wasWZSDXPuVFM4HmYyo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "145ffddb216135e76a32def79b19f46d1dcdbdc9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "staging-next",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index 0d6f9ca..0881dfb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,7 @@
   description = "System Configuration @ cswimr 2024";
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    staging-next.url = "github:NixOS/nixpkgs/staging-next";
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -57,6 +58,10 @@
         ];
         config.allowUnfree = true;
       };
+      stagingNextPkgs = import inputs.staging-next {
+        inherit system;
+        config.allowUnfree = true;
+      };
     in
     {
       nixosConfigurations = {
@@ -65,6 +70,7 @@
           specialArgs = {
             inherit inputs;
             inherit pkgs;
+            inherit stagingNextPkgs;
             system = system;
             hostname = "eclipse";
             user = user;
@@ -129,6 +135,7 @@
                 extraSpecialArgs = {
                   inherit inputs;
                   inherit pkgs;
+                  inherit stagingNextPkgs;
                   system = system;
                   hostname = "eclipse";
                   user = user;
diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix
index 0cb8cfb..9798396 100644
--- a/home-manager/vscode.nix
+++ b/home-manager/vscode.nix
@@ -1,5 +1,6 @@
 {
   pkgs,
+  stagingNextPkgs,
   config,
   system,
   inputs,
@@ -37,7 +38,7 @@ rec {
     enable = true;
     enableUpdateCheck = false;
     enableExtensionUpdateCheck = false;
-    package = pkgs.vscode;
+    package = stagingNextPkgs.vscode;
     # package = pkgs.vscode.fhsWithPackages (
     #   ps: with pkgs; [
     #     dotnetCorePackages.sdk_8_0
@@ -201,7 +202,8 @@ rec {
         d-koppenhagen.file-tree-to-text-generator
       ];
     userSettings = {
-      "DO-NOT-EDIT-1" = "This file is managed by the Nix module located at `/etc/nixos/home-manager/vscode.nix`.";
+      "DO-NOT-EDIT-1" =
+        "This file is managed by the Nix module located at `/etc/nixos/home-manager/vscode.nix`.";
       "DO-NOT-EDIT-2" = "Changes will be overwritten when VSCode is restarted.";
       "DO-NOT-EDIT-3" = "To persist changes, edit the module and run `upd` in your terminal.";
       "editor.tokenColorCustomizations" = {
@@ -317,7 +319,8 @@ rec {
       "vscord.status.image.large.debugging.key" = "https://vscord.catppuccin.com/mocha/debugging.webp";
       "vscord.status.image.large.editing.key" = "https://vscord.catppuccin.com/mocha/{lang}.webp";
       "vscord.status.image.large.idle.key" = "https://vscord.catppuccin.com/mocha/idle-{app_id}.webp";
-      "vscord.status.image.large.notInFile.key" = "https://vscord.catppuccin.com/mocha/idle-{app_id}.webp";
+      "vscord.status.image.large.notInFile.key" =
+        "https://vscord.catppuccin.com/mocha/idle-{app_id}.webp";
       "vscord.status.image.large.viewing.key" = "https://vscord.catppuccin.com/mocha/{lang}.webp";
       "vscord.status.image.small.debugging.key" = "https://vscord.catppuccin.com/mocha/debugging.webp";
       "vscord.status.image.small.editing.key" = "https://vscord.catppuccin.com/mocha/{app_id}.webp";
@@ -381,9 +384,12 @@ rec {
       "redhat.telemetry.enabled" = true;
       "editor.fontSize" = 14;
       "workbench.colorTheme" = "Catppuccin Mocha";
-      "editor.codeLensFontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
-      "editor.inlayHints.fontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font', 'FiraCode Nerd Font Light'";
-      "editor.fontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
+      "editor.codeLensFontFamily" =
+        "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
+      "editor.inlayHints.fontFamily" =
+        "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font', 'FiraCode Nerd Font Light'";
+      "editor.fontFamily" =
+        "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
       "explorer.confirmDelete" = false;
       "window.confirmSaveUntitledWorkspace" = false;
       "cwtools.cache.stellaris" = "/bulk/steam/steamapps/common/Stellaris";
@@ -432,7 +438,8 @@ rec {
         "eclipse" = "linux";
       };
       "terminal.integrated.fontWeightBold" = "bold";
-      "terminal.integrated.fontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
+      "terminal.integrated.fontFamily" =
+        "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
       "[jsonc]" = {
         "editor.defaultFormatter" = "esbenp.prettier-vscode";
       };