treewide: fix lix overlay

This commit is contained in:
Primrose 2025-11-01 19:50:02 +08:00
parent 5d367843f8
commit 89e137711f
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
3 changed files with 41 additions and 39 deletions

View file

@ -33,21 +33,16 @@ in
# #
{ {
nixpkgs = { nixpkgs = {
overlays = overlays = map import [
map import ../overlays/agenix.nix
[ ../overlays/nur.nix
../overlays/agenix.nix ../overlays/nix-tree.nix
../overlays/nur.nix ../packages/overlay.nix
../overlays/nix-tree.nix
../packages/overlay.nix
]
# use lix everywhere and wrap it with nom # use lix everywhere and wrap it with nom
++ [ ../overlays/lix.nix
# TODO ../overlays/nix-monitored.nix
# Can't get it build for now ];
# (import (sources.lix-module + "/overlay.nix") {inherit (sources) lix;})
(import ../overlays/nix-monitored.nix)
];
# Set NIX_PATH and flake registry at the same time # Set NIX_PATH and flake registry at the same time
# https://github.com/NixOS/nixpkgs/pull/254405 # https://github.com/NixOS/nixpkgs/pull/254405

View file

@ -42,35 +42,32 @@ in
rocmSupport = true; rocmSupport = true;
}; };
overlays = overlays = map import [
map import ../overlays/agenix.nix
[ ../overlays/disko.nix
../overlays/agenix.nix ../overlays/nur.nix
../overlays/disko.nix ../overlays/wired-notify.nix
../overlays/nur.nix ../overlays/nix-tree.nix
../overlays/wired-notify.nix ../overlays/wallpapers.nix
../overlays/nix-tree.nix ../overlays/nil.nix
../overlays/wallpapers.nix ../overlays/dix.nix
../overlays/nil.nix ../overlays/eepy.nix
../overlays/dix.nix ../overlays/calibre-no-mime.nix
../overlays/eepy.nix ../overlays/fcitx5-table-extra-taiwanese.nix
../overlays/calibre-no-mime.nix
../overlays/fcitx5-table-extra-taiwanese.nix
../overlays/iosevka.nix ../overlays/iosevka.nix
../packages/overlay.nix ../packages/overlay.nix
./vanadium/overlay.nix ./vanadium/overlay.nix
./vanadium/kernel-overlay.nix ./vanadium/kernel-overlay.nix
# removed, but I need it for PLFA!
../overlays/pin-emacs28.nix
# removed, but I need it for PLFA!
../overlays/pin-emacs28.nix
]
# use lix everywhere and wrap it with nom # use lix everywhere and wrap it with nom
++ [ ../overlays/lix.nix
(import (sources.lix-module + "/overlay.nix") {inherit (sources) lix;}) ../overlays/nix-monitored.nix
(import ../overlays/nix-monitored.nix) ];
];
# Set NIX_PATH and flake registry at the same time # Set NIX_PATH and flake registry at the same time
# https://github.com/NixOS/nixpkgs/pull/254405 # https://github.com/NixOS/nixpkgs/pull/254405

10
nix/overlays/lix.nix Normal file
View file

@ -0,0 +1,10 @@
final: _: {
nix = final.lixPackageSets.stable.lix;
inherit
(final.lixPackageSets.stable)
nixpkgs-review
nix-eval-jobs
nix-fast-build
colmena
;
}