1 files changed, 10 insertions, 3 deletions

diff --git a/nixops/Makefile b/nixops/Makefile
index f3d06ef..fb9da4c 100644
--- a/nixops/Makefile
+++ b/nixops/Makefile
@@ -26,7 +26,14 @@ endif
 SSH_ARGS ?=
 
 edit_env:
-        pass edit Nixops/files/environment.nix || true
+        $(EDITOR) secrets/environment.nix || true
+        git -C secrets add environment.nix || true
+        git -C secrets commit -m "Edit environment.nix" environment.nix || true
+
+edit_vars:
+        sops secrets/vars.yml || true
+        git -C secrets add vars.yml || true
+        git -C secrets commit -m "Edit password for vars.yml using sops." vars.yml || true
 
 ssh-eldiron:
         ./scripts/with_env bash -c 'ssh -i $$SSH_IDENTITY_FILE root@eldiron $(SSH_ARGS)'
@@ -77,8 +84,8 @@ list-generations:
 .PHONY: list-generations
 
 delete-generations:
-        echo "make sure you ran a complete build before cleaning up!"
-        false
+        @echo "making sure that a complete build is done before cleaning up"
+        $(MAKE) build MORPH_ARGS=--keep-result
         nix-env -p $(PROFILE) --delete-generations $(GEN)
         $(MAKE) ssh-eldiron SSH_ARGS="nix-env -p /nix/var/nix/profiles/system --delete-generations $(GEN)"
         $(MAKE) ssh-dilion SSH_ARGS="nix-env -p /nix/var/nix/profiles/system --delete-generations $(GEN)"