colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

hosts/common/nix: migrate the nixpkgs-overlay integration point (part 2)

Browse Source
This commit is contained in:
Colin
2024-06-12 23:32:18 +00:00
parent ea1a0b72b5
commit e34a9957e3
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/default.nix
View File

@@ -9,7 +9,7 @@
./ids.nix ./ids.nix
./machine-id.nix ./machine-id.nix
./net ./net
./nix ./nix.nix
./persist.nix ./persist.nix
./polyunfill.nix ./polyunfill.nix
./programs ./programs

2
hosts/common/nix/default.nix → hosts/common/nix.nix
View File

@@ -70,7 +70,7 @@
# ensure new deployments have a source of this repo with which they can bootstrap. # ensure new deployments have a source of this repo with which they can bootstrap.
# this however changes on every commit and can be slow to copy for e.g. `moby`. # this however changes on every commit and can be slow to copy for e.g. `moby`.
environment.etc."nixos" = lib.mkIf (config.sane.maxBuildCost >= 3) { environment.etc."nixos" = lib.mkIf (config.sane.maxBuildCost >= 3) {
source = ../../..; source = ../..;
}; };
environment.etc."nix/registry.json" = lib.mkIf (config.sane.maxBuildCost < 3) { environment.etc."nix/registry.json" = lib.mkIf (config.sane.maxBuildCost < 3) {
enable = false; enable = false;

4
hosts/common/nix/overlay/default.nix
View File

@@ -1,4 +0,0 @@
# XXX: NIX_PATH=...:nixpkgs-overlays=... will import every overlay in the directory
# so we prefer to give it a directory with just this *one* overlay, otherwise it imports conflicting overlays
# and gets stuck in a loop until it OOMs
import ../../../../overlays/all.nix