From 3f43e3c39f27087bec67dcaf0d3630fc13587366 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 15 Sep 2024 22:02:48 +0200 Subject: [PATCH] =?UTF-8?q?l=C3=B8kajsdlkjdlakjsd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/nord/configuration.nix | 2 ++ hosts/noximilien/configuration.nix | 2 ++ profiles/auto-upgrade.nix | 11 ++++++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hosts/nord/configuration.nix b/hosts/nord/configuration.nix index 93e1ece..5a6ba71 100644 --- a/hosts/nord/configuration.nix +++ b/hosts/nord/configuration.nix @@ -44,6 +44,8 @@ #../../profiles/domeneshop-dyndns # handled by noximilien ]; + nix.settings.max-jobs = 1; # this host do be stinky + networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery #networking.wireguard.interfaces."wg0".ips = [ "172.22.48.4/24" ]; # fyrkat diff --git a/hosts/noximilien/configuration.nix b/hosts/noximilien/configuration.nix index 015243b..5016024 100644 --- a/hosts/noximilien/configuration.nix +++ b/hosts/noximilien/configuration.nix @@ -100,6 +100,8 @@ "kuklef.se" ]; + nix.settings.max-jobs = 1; # this host do be stinky + networking.hostId = "e1ffd469"; # needed for zfs: head -c 8 /etc/machine-id #networking.wireguard.interfaces."wg0".ips = [ "172.22.48.3/24" ]; # fyrkat diff --git a/profiles/auto-upgrade.nix b/profiles/auto-upgrade.nix index b3c3ee0..792d370 100644 --- a/profiles/auto-upgrade.nix +++ b/profiles/auto-upgrade.nix @@ -8,7 +8,16 @@ system.autoUpgrade.enable = true; #system.autoUpgrade.allowReboot = true; # reboot after a kernel (module) or initrd upgrade, consider also setting `rebootWindow` - environment.etc."current-system-flake".source = inputs.self; # the plan was to allow me to locate the new flake.lock, but alas https://github.com/NixOS/nix/issues/6895 + environment.etc."current-system-flake".source = inputs.self; + # workaround for https://github.com/NixOS/nix/issues/6895 + environment.etc."current-system-flake-inputs.json".source + = pkgs.writers.writeJSON "flake-inputs.json" ( + lib.flip lib.mapAttrs inputs (name: input: + # inputs.*.sourceInfo sans outPath, since writeJSON will otherwise serialize sourceInfo like derivation + lib.filterAttrs (key: val: !builtins.elem key ["outPath"]) (input.sourceInfo or {}) + // { store-path = input.outPath; } # comment this line if you don't want to retain a store reference to the flake inputs + ) + ); #system.autoUpgrade.flake = inputs.self.outPath; # a nix store path #system.autoUpgrade.flake = "github:pbsds/nix-config"; # TODO: use this instead?