Merge remote-tracking branch 'refs/remotes/origin/trunk' into trunk

This commit is contained in:
Primrose 2025-05-26 08:55:47 +02:00
commit b01142d84f
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
13 changed files with 33 additions and 46 deletions

View file

@ -31,12 +31,14 @@ in
{
nixpkgs = {
hostPlatform = system;
overlays = with (import ../overlays); [
agenix
disko
nur
wired-notify
packages
overlays = map import [
../overlays/agenix.nix
../overlays/disko.nix
../overlays/nur.nix
../overlays/wired-notify.nix
../overlays/nix-tree.nix
../overlays/packages.nix
];
# Set NIX_PATH and flake registry at the same time

View file

@ -37,16 +37,18 @@ in
};
hostPlatform = system;
overlays = with (import ../overlays); [
agenix
disko
nur
wired-notify
emacs28 # removed, but I need it for PLFA!
nix-tree
overlays = map import [
../overlays/agenix.nix
../overlays/disko.nix
../overlays/nur.nix
../overlays/wired-notify.nix
../overlays/nix-tree.nix
packages
(import ./vanadium/nixos/overlay.nix)
../overlays/packages.nix
./vanadium/nixos/overlay.nix
# removed, but I need it for PLFA!
../overlays/pin-emacs28.nix
];
# Set NIX_PATH and flake registry at the same time