feat: start migrating steveej-t14 and sj-vps-htz-0 to sops

Justfile

@@ -28,44 +28,29 @@ _render_templates:
 		# nix/scripts/pre-eval-fixed.sh nix/home-manager/profiles/dotfiles/vcsh{.tmpl,}.nix
 	fi
 
-rebuild-remote-device device target rebuildarg="dry-activate" :
+rebuild-remote-device device +rebuildargs="dry-activate":
 	#!/usr/bin/env bash
 	set -ex
-	just -v _rebuild-device nix/os/devices/{{device}} {{rebuildarg}} --argstr moreargs "'--target-host\ {{target}}'"
+	nix run .#colmena -- apply --on {{device}} {{rebuildargs}}
 
 # Rebuild this device's NixOS
 rebuild-this-device +rebuildargs="dry-activate":
 	nix run .#colmena -- apply-local --sudo {{rebuildargs}}
 
 # Re-render the versions of a remote device and rebuild its environment
-update-remote-device devicename target rebuildmode='switch':
+update-remote-device devicename rebuildmode='build':
 	#!/usr/bin/env bash
 	set -e
 
-	template=nix/os/devices/{{ devicename }}/versions.tmpl.nix
-	outfile=nix/os/devices/{{ devicename }}/versions.nix
-	
-	if ! test -e ${template}; then
-		template="$(just _DEFAULT_VERSION_TMPL)"
-	fi
+	(
+		set -xe
+		cd nix/os/devices/{{devicename}}
+		nix flake update
+	)
 
-	esh -o ${outfile} ${template}
-	if ! test "$(git diff ${outfile})"; then
-		echo Already on latest versions
-		exit 0
-	fi
+	just -v rebuild-remote-device {{devicename}} {{rebuildmode}}
 
-	just -v rebuild-remote-device {{ devicename }} {{target}} dry-activate || {
-		echo ERROR: rebuild in mode 'dry-active' failed after updating ${outfile}
-		exit 1
-	}
-
-	just -v rebuild-remote-device {{ devicename }} {{ target }} {{ rebuildmode }} || {
-		echo ERROR: rebuild in mode '{{ rebuildmode }}' failed after updating ${outfile}
-		exit 1
-	}
-
-	git commit -v ${outfile} -m "nix/os/devices/{{ devicename }}: bump versions"
+	git commit -v nix/os/devices/{{devicename}}/flake.{nix,lock} -m "nix/os/devices/{{devicename}}: bump versions"
 
 # Re-render the versions of the current device and rebuild its environment
 update-this-device rebuild-mode='switch':