X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2FMakefile;h=18d48eb552c4eda3da184c2b991ba3dd8b8f69ad;hb=5dda316b382211733cda7163b33bf388dd052671;hp=c5216829862c4c27bca76605bb4052611428c494;hpb=7ff0f7be4890ffd5d6af614fcade3d64eaa66ffc;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/Makefile b/nixops/Makefile
index c521682..18d48eb 100644
--- a/nixops/Makefile
+++ b/nixops/Makefile
@@ -1,17 +1,8 @@
-export
-ifndef NIXOPS_CONFIG_PASS_SUBTREE_PATH
-  $(error Please set NIXOPS_CONFIG_PASS_SUBTREE_PATH to the password-store subtree path)
+ifndef NIXOPS_ENV_LOADED
+  $(error "Please load environment with direnv")
 endif
 
-NIXOPS_STATE ?= ./state/eldiron.nixops
-NIXOPS_DEPLOYMENT = cef694f3-081d-11e9-b31f-0242ec186adf
-nixpkgs ?= $(shell cat ../nix/sources.json | jq -r '."nixpkgs-nixops".url')
-nixpkgsNext ?= $(shell cat ../nix/sources.json | jq -r '."nixpkgs-nixops-next".url')
-nixpkgsPrevious ?= $(shell cat ../nix/sources.json | jq -r '."nixpkgs-nixops-previous".url')
-NIX_PATH = nixpkgs=${nixpkgs}:nixpkgsNext=${nixpkgsNext}:nixpkgsPrevious=${nixpkgsPrevious}
-
-NIXOPS := $(shell NIX_PATH=$(NIX_PATH) nix-build --no-out-link -E "with import <nixpkgs> { overlays = builtins.attrValues (import ../overlays); }; nixops")/bin/nixops
-NIXOPS_PRIV = ./scripts/with_env $(NIXOPS)
+NIXOPS_PRIV = ./scripts/with_env nixops
 
 ###### Current channel information
 nix-info:
@@ -34,6 +25,9 @@ ifdef TARGET
 endif
 SSH_ARGS ?=
 
+edit_env:
+	pass edit Nixops/files/environment.nix || true
+
 nixops:
 	$(NIXOPS_PRIV) $(NIXOPS_ARGS)
 
@@ -101,43 +95,22 @@ cleanup: delete-generations
 .PHONY: cleanup
 
 ###### Pull environment and deployment from remote
-# Don't include pull_deployment by default as this should happen only rarely
-pull: pull_environment;
-.PHONY: pull
-
-pull_environment:
-ifndef NIXOPS_CONFIG_PASS_SUBTREE_REMOTE
-	$(error "Please set NIXOPS_CONFIG_PASS_SUBTREE_REMOTE to the password-store subtree remote name")
-endif
-	pass git subtree pull --prefix=$(NIXOPS_CONFIG_PASS_SUBTREE_PATH) $(NIXOPS_CONFIG_PASS_SUBTREE_REMOTE) master
-.PHONY: pull_environment
-
 pull_deployment:
-	@if $(NIXOPS) info -d $(NIXOPS_DEPLOYMENT) 2>/dev/null >/dev/null ; then \
+	@if nixops info -d $(NIXOPS_DEPLOYMENT) 2>/dev/null >/dev/null ; then \
 	  echo "This will remove your current deployment file and recreate it!. Continue? [y/N]" && \
 	  read y && \
 	  [ "$$y" = "y" -o "$$y" = "Y" ] && \
-	  $(NIXOPS) delete --force -d $(NIXOPS_DEPLOYMENT); \
+	  nixops delete --force -d $(NIXOPS_DEPLOYMENT); \
 	fi
-	pass show $(NIXOPS_CONFIG_PASS_SUBTREE_PATH)/Nixops/Deployment | $(NIXOPS) import
-	$(NIXOPS) modify -d $(NIXOPS_DEPLOYMENT) "$$(pwd)/default.nix"
+	pass show Nixops/Deployment | nixops import
+	nixops modify -d $(NIXOPS_DEPLOYMENT) "$$(pwd)/default.nix"
 .PHONY: pull_deployment
 
 deployment_is_set:
-	$(NIXOPS) info -d $(NIXOPS_DEPLOYMENT) 2>/dev/null >/dev/null
+	nixops info -d $(NIXOPS_DEPLOYMENT) 2>/dev/null >/dev/null
 .PHONY: deployment_is_set
 
-###### Push environment and deployment information to password store
-push: push_deployment push_environment;
-.PHONY: push
-
+###### Push deployment information to password store
 push_deployment:
-	$(NIXOPS) export | pass insert -m $(NIXOPS_CONFIG_PASS_SUBTREE_PATH)/Nixops/Deployment
-.PHONY: push_deployment
-
-push_environment:
-ifndef NIXOPS_CONFIG_PASS_SUBTREE_REMOTE
-	$(error "Please set NIXOPS_CONFIG_PASS_SUBTREE_REMOTE to the password-store subtree remote name")
-endif
-	pass git subtree push --prefix=$(NIXOPS_CONFIG_PASS_SUBTREE_PATH) $(NIXOPS_CONFIG_PASS_SUBTREE_REMOTE) master
-.PHONY: push_environment
+	nixops export | pass insert -m Nixops/Deployment
+.PHONY: push