X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fnixops_wrap;h=20949246349d3828229d18dfb51e8eb4194ea891;hb=431759ea54b401d9f2eb74af5a9302691996b069;hp=914f2cc79faf84d0225884a155f72fa4d7a43258;hpb=9fb4205e2ceadb79a93cbe44bd77ebebe8c94625;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index 914f2cc..2094924 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -12,7 +12,6 @@ chmod go-rwx $TEMP
 finish() {
   rm -rf "$TEMP"
   nixops set-args --unset privateFiles
-  nixops set-args --unset nixpkgsNext
 }
 
 trap finish EXIT
@@ -28,7 +27,7 @@ for file in $files; do
   pass show "$NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files/$file" > $TEMP/$file
 done
 nixops set-args --argstr privateFiles "$TEMP"
-nixops set-args --argstr nixpkgsNext "$HOME/.nix-defexpr/channels/immaeNixpkgsNext"
 
-export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs"
+source $(dirname $(dirname $DIR))/nix_path_env
+export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH"
 nixops "$@"