From f92e905725c8b619ae0c3524ba69925ba9ab772b Mon Sep 17 00:00:00 2001 From: Ori Date: Sat, 3 May 2025 11:18:22 -0500 Subject: [PATCH] Updated system --- flake.lock | 6 +++--- modules/system/phoenix/default.nix | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index f8aeca4..428dc3c 100644 --- a/flake.lock +++ b/flake.lock @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1746286834, - "narHash": "sha256-N6401TfkHPmTTuZzHE02B/wQaKYZAAHtaQ0EQVYLc9w=", + "lastModified": 1746287478, + "narHash": "sha256-z3HiHR2CNAdwyZTWPM2kkzhE1gD1G6ExPxkaiQfNh7s=", "owner": "nix-community", "repo": "home-manager", - "rev": "929f8ee8362aec0a2bcbcbbd485e86e701496a73", + "rev": "75268f62525920c4936404a056f37b91e299c97e", "type": "github" }, "original": { diff --git a/modules/system/phoenix/default.nix b/modules/system/phoenix/default.nix index 2063bc4..bebe845 100644 --- a/modules/system/phoenix/default.nix +++ b/modules/system/phoenix/default.nix @@ -127,6 +127,8 @@ openssh git nix nixos-rebuild ]; script = '' + set -euo pipefail + export NIX_PATH="nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix" echo "navigating to /etc/nixos"; cd ${config.systemSettings.dotfilesDir}; echo "running git pull"; @@ -141,19 +143,19 @@ chown -R 0:0 ${config.systemSettings.dotfilesDir}; chown -R 0:0 ${config.systemSettings.secretsFlakeDir}; cd ${config.systemSettings.dotfilesDir}; - nixos-rebuild build --flake .#snowfire; + ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build --flake .#snowfire; ${pkgs.attic-client}/bin/attic push emmet ./result; rm ./result; - nixos-rebuild build --flake .#duskfall; + ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build --flake .#duskfall; ${pkgs.attic-client}/bin/attic push emmet ./result; rm ./result; - nixos-rebuild build --flake .#zenith; + ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build --flake .#zenith; ${pkgs.attic-client}/bin/attic push emmet ./result; rm ./result; - nixos-rebuild build --flake .#stardust; + ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build --flake .#stardust; ${pkgs.attic-client}/bin/attic push emmet ./result; rm ./result; - nixos-rebuild build --flake .#ori; + ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build --flake .#ori; ${pkgs.attic-client}/bin/attic push emmet ./result; rm ./result; '';