Migrate to morph as a replacement to nixops

The deployment tasks are now independent of any state

3 files changed, 18 insertions, 0 deletions

diff --git a/overlays/default.nix b/overlays/default.nix
index 0c7c738..7444e15 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -32,5 +32,6 @@
   doing = import ./doing;
   khal = import ./khal;
   nix-direnv = import ./nix-direnv;
+  morph = import ./morph;
 }
 // import ./python-packages
diff --git a/overlays/morph/default.nix b/overlays/morph/default.nix
new file mode 100644
index 0000000..ee59e25
--- /dev/null
+++ b/overlays/morph/default.nix
@@ -0,0 +1,5 @@
+self: super: {
+  morph = super.morph.overrideAttrs(old: {
+    patches = (old.patches or []) ++ [ ./verbose_nix.patch ];
+  });
+}
diff --git a/overlays/morph/verbose_nix.patch b/overlays/morph/verbose_nix.patch
new file mode 100644
index 0000000..389a79c
--- /dev/null
+++ b/overlays/morph/verbose_nix.patch
@@ -0,0 +1,12 @@
+diff --git a/nix/nix.go b/nix/nix.go
+index bb63870..7fe04aa 100644
+--- a/nix/nix.go
++++ b/nix/nix.go
+@@ -347,6 +347,7 @@ func Push(ctx *ssh.SSHContext, host Host, paths ...string) (err error) {
+        options := mkOptions(host)
+        for _, path := range paths {
+                args := []string{
++                       "-v",
+                        "copy",
+                        path,
+                        "--to", "ssh://" + userArg + host.TargetHost + keyArg,