X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=Makefile;h=466b63a7d045ebc1d7de27214eb4f2e3972ef2e4;hp=fafbe00f7eb21d456733cfdfeadf9b59d79a416e;hb=ce95026934c4ea8c647365f68eb195459fcdff08;hpb=e820134d38c3b7470ea5112f40a6dc967f039878

diff --git a/Makefile b/Makefile
index fafbe00..466b63a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,11 @@
-subrecipes = setup
-subrecipes += nixops ssh-eldiron ssh-backup-2 ssh-monitoring-1
-subrecipes += info debug dry-run build upload deploy deploy-reboot reboot
+subrecipes = setup nix-info edit_env
+subrecipes += ssh-eldiron ssh-backup-2 ssh-monitoring-1 ssh-4c
+subrecipes += debug build dry-run upload deploy deploy-reboot
 subrecipes += list-generations delete-generations cleanup
-subrecipes += pull pull_environment pull_deployment deployment_is_set push push_deployment push_environment
 ${subrecipes}:
 	@$(MAKE) --no-print-directory -C nixops/ $@
 .PHONY: ${subrecipes}
 
-# This will automatically upgrade to latest version at each build
-nixpkgs ?= https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz
-NIX_PATH = nixpkgs=${nixpkgs}:nixpkgsNext=${nixpkgs}:nixpkgsPrevious=${nixpkgs}
-
-nix-path:
-	@echo "export NIX_PATH=$(NIX_PATH)"
-
-env:
-	./scripts/make-env
-
-env-dry-run:
-	./scripts/make-env --dry-run
-
-nix-info:
-	@version=$$(nix eval --option tarball-ttl 1 --raw nixpkgs.lib.version) && \
-	  mainversion=$$(echo $$version | cut -d"." -f -2) && \
-	  echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \
-	  nix-instantiate --find-file nixpkgs
-
-nix-info-nixops:
-	@$(MAKE) --no-print-directory -C nixops/ nix-info
-
 nur:
 	./scripts/make-nur
 	curl -o /dev/null -XPOST "https://nur-update.herokuapp.com/update?repo=immae"
@@ -36,4 +13,4 @@ nur:
 shellcheck:
 	shellcheck scripts/* nixops/scripts/* modules/private/gitolite/gitolite_ldap_groups.sh modules/private/ssh/ldap_authorized_keys.sh modules/private/pub/restrict
 
-.PHONY: env env-dry-run nix-info nur shellcheck
+.PHONY: nur shellcheck