X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fsetup;h=cc0348286a6100f087658700b5e0d5e928c3f714;hb=dbcba2ea2b7301aaa7e6487c2589b09ef09ba066;hp=58dbf5516bbc9a2656526a3d63af008eded150e6;hpb=d823e010d653a6bf33ff232da5f90103be7515b8;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 58dbf55..cc03482 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -94,12 +94,11 @@ if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source $(dirname $(dirname $DIR))/nix_path_env
-nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops"
+source $(dirname $(dirname $DIR))/scripts/nix_env
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
 
-if ! $nixops info 2>/dev/null >/dev/null; then
+if ! nixops_custom info 2>/dev/null >/dev/null; then
   cat <<-EOF
 	Importing deployment file into nixops:
 	Continue? [y/N]
@@ -107,15 +106,15 @@ if ! $nixops info 2>/dev/null >/dev/null; then
   read y
   if [ "$y" = "y" -o "$y" = "Y" ]; then
     deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
-    echo "$deployment" | $nixops import
-
-    $nixops modify "$(dirname $DIR)/eldiron.nix"
+    echo "$deployment" | nixops_custom import
   else
     echo "Aborting"
     exit 1
   fi
 fi
 
+nixops_custom modify "$(dirname $DIR)/default.nix"
+
 cat <<-EOF
 	All set up.
 	Please make sure you’re using scripts/nixops_wrap when deploying