tristan/nixinate
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Use nixos-rebuild switch instead of switch-to-configuration

Browse source 
This fixes https://github.com/MatthewCroughan/nixinate/issues/5
This commit is contained in:
matthewcroughan 2022-02-07 00:58:06 +00:00
parent 32953fe5f0
commit b7d47ddd37
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
flake.nix
View file

@ -22,8 +22,6 @@
SSH_USER=${flake.nixosConfigurations.${machine}._module.args.nixinate.sshUser} SSH_USER=${flake.nixosConfigurations.${machine}._module.args.nixinate.sshUser}
SSH_HOST=${flake.nixosConfigurations.${machine}._module.args.nixinate.host} SSH_HOST=${flake.nixosConfigurations.${machine}._module.args.nixinate.host}
BUILD_ON=${flake.nixosConfigurations.${machine}._module.args.nixinate.buildOn} BUILD_ON=${flake.nixosConfigurations.${machine}._module.args.nixinate.buildOn}
SYSTEM_CLOSURE=${flake}#nixosConfigurations.${machine}.config.system.build.toplevel
echo "🚀 Deploying nixosConfigurations.${machine} from ${flake}" echo "🚀 Deploying nixosConfigurations.${machine} from ${flake}"
echo "👤 SSH User: $SSH_USER" echo "👤 SSH User: $SSH_USER"
echo "🌐 SSH Host: $SSH_HOST" echo "🌐 SSH Host: $SSH_HOST"
@ -33,11 +31,8 @@
echo "🤞 Activating configuration on ${machine} via ssh:" echo "🤞 Activating configuration on ${machine} via ssh:"
( set -x; ${final.openssh}/bin/ssh -t $SSH_USER@$SSH_HOST 'sudo nixos-rebuild switch --flake /tmp/nixcfg#${machine}' ) ( set -x; ${final.openssh}/bin/ssh -t $SSH_USER@$SSH_HOST 'sudo nixos-rebuild switch --flake /tmp/nixcfg#${machine}' )
elif [ $BUILD_ON = "local" ]; then elif [ $BUILD_ON = "local" ]; then
echo "🔨 Building system closure locally and copying it to remote store:" echo "🔨 Building system closure locally, copying it to remote store and activating it:"
( set -x; ${final.nixFlakes}/bin/nix copy --to ssh://$SSH_USER@$SSH_HOST $SYSTEM_CLOSURE ) ( set -x; NIX_SSHOPTS="-t" ${final.nixos-rebuild}/bin/nixos-rebuild switch --flake ${flake}#${machine} --target-host $SSH_USER@$SSH_HOST --use-remote-sudo )
echo "🤞 Activating configuration on ${machine} via ssh:"
SYSTEM_CLOSURE_PATH=$(${final.nixFlakes}/bin/nix path-info $SYSTEM_CLOSURE)
( set -x; ${final.openssh}/bin/ssh -t $SSH_USER@$SSH_HOST "sudo $SYSTEM_CLOSURE_PATH/bin/switch-to-configuration switch" )
else else
echo "_module.args.nixinate.buildOn is not set to a valid value of 'local' or 'remote'" echo "_module.args.nixinate.buildOn is not set to a valid value of 'local' or 'remote'"
fi fi