diff options
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | hosts/caladan/default.nix | 1 | ||||
| -rw-r--r-- | overlays/default.nix | 10 | ||||
| -rwxr-xr-x | scripts/pretty-rebuild | 2 |
4 files changed, 14 insertions, 1 deletions
@@ -27,6 +27,7 @@ # persistent base NixOS URLs nixpkgs-master.url = "github:NixOS/nixpkgs"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; + #nixpkgs-staging.url = "github:NixOS/nixpkgs/staging-nixos"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages @@ -56,6 +57,7 @@ nixpkgs-master, #nixpkgs-pr495610, nixpkgs-stable, + #nixpkgs-staging, #nixpkgs-wine9_22, nixpkgs, nvidia-patch, diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index c82c1f4..5f812e5 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -142,6 +142,7 @@ #outputs.overlays.my-nixpkgs-packages #outputs.overlays.pr495610-packages outputs.overlays.stable-packages + #outputs.overlays.staging-packages #outputs.overlays.wine9_22-packages ]; }; diff --git a/overlays/default.nix b/overlays/default.nix index 220632b..287012e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -9,6 +9,7 @@ # outputs.overlays.my-nixpkgs # outputs.overlays.pr495610-packages # outputs.overlays.stable-packages +# outputs.overlays.staging-packages # outputs.overlays.wine9_22-packages # ] @@ -106,4 +107,13 @@ config.allowUnfree = true; }; }; + + # When applied, the staging nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.staging' + #staging-packages = final: _prev: { + # staging = import inputs.nixpkgs-staging { + # inherit (final) system; + # config.allowUnfree = true; + # }; + #}; } diff --git a/scripts/pretty-rebuild b/scripts/pretty-rebuild index 45da070..9dee1cc 100755 --- a/scripts/pretty-rebuild +++ b/scripts/pretty-rebuild @@ -9,7 +9,7 @@ fi cd /etc/nixos && \ nix flake update && \ - NIX_SSHOPTS='-o ControlPath=/dev/shm/%C' nixos-rebuild switch --upgrade --show-trace ${=args} && \ + NIX_SSHOPTS='-vvv -o ControlPath=/dev/shm/%C' nixos-rebuild switch --upgrade --show-trace ${=args} && \ echo && \ nixos-rebuild list-generations | cat && \ echo && \ |