Reorganize files

4 files changed, 6 insertions, 6 deletions

diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index e75fa2f..28aa917 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -8,7 +8,7 @@ fi
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
-source $(dirname $(dirname $DIR))/nix_path_env
+source $(dirname $(dirname $DIR))/scripts/nix_env
 
 TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files)
 chmod go-rwx $TEMP
diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment
index ef0f221..2f50875 100755
--- a/nixops/scripts/pull_deployment
+++ b/nixops/scripts/pull_deployment
@@ -8,7 +8,7 @@ fi
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
-source $(dirname $(dirname $DIR))/nix_path_env
+source $(dirname $(dirname $DIR))/scripts/nix_env
 
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 
diff --git a/nixops/scripts/push_deployment b/nixops/scripts/push_deployment
index 26f8cd2..f2d25f9 100755
--- a/nixops/scripts/push_deployment
+++ b/nixops/scripts/push_deployment
@@ -8,6 +8,6 @@ fi
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
-source $(dirname $(dirname $DIR))/nix_path_env
+source $(dirname $(dirname $DIR))/scripts/nix_env
 
 nixops_custom export | pass insert -m $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment
diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 72b19c0..cc03482 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -94,7 +94,7 @@ 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
+source $(dirname $(dirname $DIR))/scripts/nix_env
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
 
@@ -107,14 +107,14 @@ if ! nixops_custom info 2>/dev/null >/dev/null; then
   if [ "$y" = "y" -o "$y" = "Y" ]; then
     deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
     echo "$deployment" | nixops_custom import
-
-    nixops_custom modify "$(dirname $DIR)/eldiron.nix"
   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