diff --git a/nix/configurations/hydrogen.nix b/nix/configurations/hydrogen.nix index a9a2d7c8..c79e53a0 100644 --- a/nix/configurations/hydrogen.nix +++ b/nix/configurations/hydrogen.nix @@ -33,21 +33,16 @@ in # { nixpkgs = { - overlays = - map import - [ - ../overlays/agenix.nix - ../overlays/nur.nix - ../overlays/nix-tree.nix - ../packages/overlay.nix - ] + overlays = map import [ + ../overlays/agenix.nix + ../overlays/nur.nix + ../overlays/nix-tree.nix + ../packages/overlay.nix + # use lix everywhere and wrap it with nom - ++ [ - # TODO - # Can't get it build for now - # (import (sources.lix-module + "/overlay.nix") {inherit (sources) lix;}) - (import ../overlays/nix-monitored.nix) - ]; + ../overlays/lix.nix + ../overlays/nix-monitored.nix + ]; # Set NIX_PATH and flake registry at the same time # https://github.com/NixOS/nixpkgs/pull/254405 diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 5be9bac1..1ed762c7 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -42,35 +42,32 @@ in rocmSupport = true; }; - overlays = - map import - [ - ../overlays/agenix.nix - ../overlays/disko.nix - ../overlays/nur.nix - ../overlays/wired-notify.nix - ../overlays/nix-tree.nix - ../overlays/wallpapers.nix - ../overlays/nil.nix - ../overlays/dix.nix - ../overlays/eepy.nix - ../overlays/calibre-no-mime.nix - ../overlays/fcitx5-table-extra-taiwanese.nix + overlays = map import [ + ../overlays/agenix.nix + ../overlays/disko.nix + ../overlays/nur.nix + ../overlays/wired-notify.nix + ../overlays/nix-tree.nix + ../overlays/wallpapers.nix + ../overlays/nil.nix + ../overlays/dix.nix + ../overlays/eepy.nix + ../overlays/calibre-no-mime.nix + ../overlays/fcitx5-table-extra-taiwanese.nix - ../overlays/iosevka.nix - ../packages/overlay.nix + ../overlays/iosevka.nix + ../packages/overlay.nix - ./vanadium/overlay.nix - ./vanadium/kernel-overlay.nix + ./vanadium/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 - ++ [ - (import (sources.lix-module + "/overlay.nix") {inherit (sources) lix;}) - (import ../overlays/nix-monitored.nix) - ]; + ../overlays/lix.nix + ../overlays/nix-monitored.nix + ]; # Set NIX_PATH and flake registry at the same time # https://github.com/NixOS/nixpkgs/pull/254405 diff --git a/nix/overlays/lix.nix b/nix/overlays/lix.nix new file mode 100644 index 00000000..0c47da25 --- /dev/null +++ b/nix/overlays/lix.nix @@ -0,0 +1,10 @@ +final: _: { + nix = final.lixPackageSets.stable.lix; + inherit + (final.lixPackageSets.stable) + nixpkgs-review + nix-eval-jobs + nix-fast-build + colmena + ; +}