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

Merge pull request #6 from MatthewCroughan/mc/use-nixos-rebuild

Browse source 
Use nixos-rebuild instead of switch-to-configuration script
This commit is contained in:
MatthewCroughan 2022-02-07 01:19:42 +00:00 • committed by GitHub
commit 9299d595e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -63,16 +63,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1640887906, "lastModified": 1643852787,
"narHash": "sha256-Eupk1UlNicCD2UNZuEKt6yhE6kFWAxXM/HyziOjG9CA=", "narHash": "sha256-RHrvroV61jcfTXfW0Rwc0qu/8lHmfYxSy49adyXkB0I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a053bc2255659c5ca52706b9e12e76a8f50dbdd", "rev": "76e3df7c0687d5b9ff31431fd4ee4d4cd07a4b2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-21.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

11
flake.nix
View file

@ -1,7 +1,7 @@
{ {
description = "Nixinate your systems 🕶️"; description = "Nixinate your systems 🕶️";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
examples.url = "path:./examples"; examples.url = "path:./examples";
}; };
outputs = { self, nixpkgs, examples, ... }: outputs = { self, nixpkgs, examples, ... }:
@ -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