diff --git a/flake.lock b/flake.lock index ccf466b..d41ec69 100644 --- a/flake.lock +++ b/flake.lock @@ -159,6 +159,22 @@ "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, @@ -239,6 +255,7 @@ "huecli": "huecli", "nix-packages": "nix-packages", "nixpkgs": "nixpkgs", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index c2fbea4..0d45d14 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ 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"; @@ -28,6 +29,7 @@ { self, nixpkgs, + nixpkgs-master, nixpkgs-stable, sops-nix, ghettoptt, @@ -44,6 +46,12 @@ config.allowUnfree = true; }; }; + overlay-master = final: prev: { + master = import nixpkgs-master { + inherit system; + config.allowUnfree = true; + }; + }; allSystems = [ "x86_64-linux" "aarch64-linux" @@ -73,6 +81,7 @@ { nixpkgs.overlays = [ overlay-stable + overlay-master ghettoptt.overlays.default huecli.overlays.default nix-packages.overlays.default @@ -99,6 +108,7 @@ { nixpkgs.overlays = [ overlay-stable + overlay-master ghettoptt.overlays.default huecli.overlays.default nix-packages.overlays.default diff --git a/home/programs/vscode/default.nix b/home/programs/vscode/default.nix index 91556aa..ec196a5 100644 --- a/home/programs/vscode/default.nix +++ b/home/programs/vscode/default.nix @@ -1,18 +1,23 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { programs.vscode = { enable = true; enableUpdateCheck = true; enableExtensionUpdateCheck = true; - extensions = with pkgs.vscode-extensions; [ - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons - golang.go - vscodevim.vim - ms-python.python - ms-vscode-remote.remote-ssh - bbenoist.nix - ]; + extensions = + with pkgs.vscode-extensions; + [ + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + golang.go + vscodevim.vim + # ms-python.python + 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"; };