flake.lock

@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726357542,
+        "lastModified": 1726222338,
-        "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
+        "narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
+        "rev": "503af483e1b328691ea3a434d331995595fb2e3d",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726243404,
+        "lastModified": 1726062873,
-        "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
+        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
+        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
         "type": "github"
       },
       "original": {
@@ -159,22 +159,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-master": {
-      "locked": {
-        "lastModified": 1726438876,
-        "narHash": "sha256-mfk6fhXH75IH2zZIHKD+hdyvvPQxiop16JchbMQrBzw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "401a65280e36b3893f380d1fd67c76a5026b86d3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1720535198,
@@ -255,7 +239,6 @@
         "huecli": "huecli",
         "nix-packages": "nix-packages",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable",
         "sops-nix": "sops-nix"
       }

flake.nix

@@ -4,7 +4,6 @@
   inputs = {
     # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11";
-    nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -29,7 +28,6 @@
     {
       self,
       nixpkgs,
-      nixpkgs-master,
       nixpkgs-stable,
       sops-nix,
       ghettoptt,
@@ -46,12 +44,6 @@
           config.allowUnfree = true;
         };
       };
-      overlay-master = final: prev: {
-        master = import nixpkgs-master {
-          inherit system;
-          config.allowUnfree = true;
-        };
-      };
       allSystems = [
         "x86_64-linux"
         "aarch64-linux"
@@ -81,7 +73,6 @@
               {
                 nixpkgs.overlays = [
                   overlay-stable
-                  overlay-master
                   ghettoptt.overlays.default
                   huecli.overlays.default
                   nix-packages.overlays.default
@@ -108,7 +99,6 @@
               {
                 nixpkgs.overlays = [
                   overlay-stable
-                  overlay-master
                   ghettoptt.overlays.default
                   huecli.overlays.default
                   nix-packages.overlays.default

home/programs/vscode/default.nix

@@ -1,23 +1,18 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   programs.vscode = {
     enable = true;
     enableUpdateCheck = true;
     enableExtensionUpdateCheck = true;
-    extensions =
+    extensions = with pkgs.vscode-extensions; [
-      with pkgs.vscode-extensions;
+      catppuccin.catppuccin-vsc
-      [
+      catppuccin.catppuccin-vsc-icons
-        catppuccin.catppuccin-vsc
+      golang.go
-        catppuccin.catppuccin-vsc-icons
+      vscodevim.vim
-        golang.go
+      ms-python.python
-        vscodevim.vim
+      ms-vscode-remote.remote-ssh
-        # ms-python.python
+      bbenoist.nix
-        ms-vscode-remote.remote-ssh
+    ];
-        bbenoist.nix
-      ]
-      ++ [
-        (lib.warn "Using vscode-extensions.ms-python.python from nixpkgs master!" pkgs.master.vscode-extensions.ms-python.python)
-      ];
     userSettings = {
       "window.titleBarStyle" = "custom";
     };