swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 17:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: remove dirchange in swarsel-deploy

Browse source
This commit is contained in:
Leon Schwarzäugl 2025-06-11 21:38:23 +02:00
parent f414735247
commit 27968d69ba
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SwarselSystems.org
View file

@ -3727,7 +3727,6 @@ AppImage version of mgba in which the lua scripting works.
T_START="$T_END" T_START="$T_END"
} }
cd ~/.dotfiles
USER_FLAKE_DIR=$(git rev-parse --show-toplevel 2> /dev/null || pwd) || USER_FLAKE_DIR=$(git rev-parse --show-toplevel 2> /dev/null || pwd) ||
die "Could not determine current working directory. Something went very wrong." die "Could not determine current working directory. Something went very wrong."
[[ -e "$USER_FLAKE_DIR/flake.nix" ]] || [[ -e "$USER_FLAKE_DIR/flake.nix" ]] ||
@ -3774,7 +3773,8 @@ AppImage version of mgba in which the lua scripting works.
declare -A TOPLEVEL_STORE_PATHS declare -A TOPLEVEL_STORE_PATHS
for host in "''${HOSTS[@]}"; do for host in "''${HOSTS[@]}"; do
toplevel="''${TOPLEVEL_FLAKE_PATHS["$host"]}" toplevel="''${TOPLEVEL_FLAKE_PATHS["$host"]}"
echo " Building 📦 $host" # Make sudo call to get prompt out of the way
sudo echo " Building 📦 $host"
nix build --no-link "''${OPTIONS[@]}" --show-trace --log-format internal-json -v "$toplevel" |& ${nix-output-monitor}/bin/nom --json || nix build --no-link "''${OPTIONS[@]}" --show-trace --log-format internal-json -v "$toplevel" |& ${nix-output-monitor}/bin/nom --json ||
die "Failed to get derivation path for $host from ''${TOPLEVEL_FLAKE_PATHS["$host"]}" die "Failed to get derivation path for $host from ''${TOPLEVEL_FLAKE_PATHS["$host"]}"
TOPLEVEL_STORE_PATHS["$host"]=$(nix build --no-link --print-out-paths "''${OPTIONS[@]}" "$toplevel") TOPLEVEL_STORE_PATHS["$host"]=$(nix build --no-link --print-out-paths "''${OPTIONS[@]}" "$toplevel")
@ -3812,7 +3812,6 @@ AppImage version of mgba in which the lua scripting works.
time_next time_next
echo -e "\033[1;32m Applied \033[m✅ \033[34m$host\033[m \033[90min ''${T_LAST}s\033[m" echo -e "\033[1;32m Applied \033[m✅ \033[34m$host\033[m \033[90min ''${T_LAST}s\033[m"
done done
cd -
''; '';
} }

5
pkgs/swarsel-deploy/default.nix
View file

@ -34,7 +34,6 @@ writeShellApplication {
T_START="$T_END" T_START="$T_END"
} }
cd ~/.dotfiles
USER_FLAKE_DIR=$(git rev-parse --show-toplevel 2> /dev/null || pwd) || USER_FLAKE_DIR=$(git rev-parse --show-toplevel 2> /dev/null || pwd) ||
die "Could not determine current working directory. Something went very wrong." die "Could not determine current working directory. Something went very wrong."
[[ -e "$USER_FLAKE_DIR/flake.nix" ]] || [[ -e "$USER_FLAKE_DIR/flake.nix" ]] ||
@ -81,7 +80,8 @@ writeShellApplication {
declare -A TOPLEVEL_STORE_PATHS declare -A TOPLEVEL_STORE_PATHS
for host in "''${HOSTS[@]}"; do for host in "''${HOSTS[@]}"; do
toplevel="''${TOPLEVEL_FLAKE_PATHS["$host"]}" toplevel="''${TOPLEVEL_FLAKE_PATHS["$host"]}"
echo " Building 📦 $host" # Make sudo call to get prompt out of the way
sudo echo " Building 📦 $host"
nix build --no-link "''${OPTIONS[@]}" --show-trace --log-format internal-json -v "$toplevel" |& ${nix-output-monitor}/bin/nom --json || nix build --no-link "''${OPTIONS[@]}" --show-trace --log-format internal-json -v "$toplevel" |& ${nix-output-monitor}/bin/nom --json ||
die "Failed to get derivation path for $host from ''${TOPLEVEL_FLAKE_PATHS["$host"]}" die "Failed to get derivation path for $host from ''${TOPLEVEL_FLAKE_PATHS["$host"]}"
TOPLEVEL_STORE_PATHS["$host"]=$(nix build --no-link --print-out-paths "''${OPTIONS[@]}" "$toplevel") TOPLEVEL_STORE_PATHS["$host"]=$(nix build --no-link --print-out-paths "''${OPTIONS[@]}" "$toplevel")
@ -119,6 +119,5 @@ writeShellApplication {
time_next time_next
echo -e "\033[1;32m Applied \033[m✅ \033[34m$host\033[m \033[90min ''${T_LAST}s\033[m" echo -e "\033[1;32m Applied \033[m✅ \033[34m$host\033[m \033[90min ''${T_LAST}s\033[m"
done done
cd -
''; '';
} }