From 439e5c69539a6642e9cf507ae9edd34786be1eb5 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sat, 16 Jan 2021 19:03:27 +0100
Subject: [PATCH] Refactor deploy script

---
 utils/deploy               | 14 ++++++++++++++
 deploy => utils/gen-config | 19 +++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100755 utils/deploy
 rename deploy => utils/gen-config (76%)

diff --git a/utils/deploy b/utils/deploy
new file mode 100755
index 0000000..0e7a87c
--- /dev/null
+++ b/utils/deploy
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+if [ -z "$1" ]
+then
+	echo "usage: deploy <hostname>"
+	exit 1
+fi
+
+git push
+
+gen-config $1 | ssh "${host}".dadada.li 'sudo cat - > /etc/nixos/configuration.nix && (nixos-rebuild test && nixos-rebuild switch) || (nixos-rebuild switch --rollback && exit 1)'
diff --git a/deploy b/utils/gen-config
similarity index 76%
rename from deploy
rename to utils/gen-config
index 10dc47e..dc13b7b 100755
--- a/deploy
+++ b/utils/gen-config
@@ -1,16 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-set -o pipefail
-
-if [ -z "$1" ]
-then
-	echo "usage: deploy <hostname>"
-	exit 1
-fi
-
-git push
-
 function hash {
 	archive="$(mktemp /tmp/nix-config.XXX.tar.gz)"
 	git archive "$1" | gzip > "$archive"
@@ -18,11 +7,17 @@ function hash {
 	rm "$archive"
 }
 
+if [ -z "$1" ]
+then
+	echo "usage: deploy <hostname>"
+	exit 1
+fi
+
 host="${1}"
 rev="$(git rev-parse HEAD)"
 sha256=$(hash "$rev")
 
-cat <<EOF | ssh "${host}".dadada.li 'sudo cat - > /etc/nixos/configuration.nix && (nixos-rebuild test && nixos-rebuild switch) || (nixos-rebuild switch --rollback && exit 1)'
+cat <<EOF
 { config, pkgs, ... }:
 let
   host = "$host";