move to module defined deploy variables

5 files changed, 9 insertions, 11 deletions

diff --git a/machines/ettves/default.nix b/machines/ettves/default.nix
index cf3fe23..5ffbad7 100644
--- a/machines/ettves/default.nix
+++ b/machines/ettves/default.nix
@@ -128,11 +128,10 @@ in {
     allowedIPs = [ "10.10.0.0/24" "10.102.0.0/24" "fd15:3d8c:d429:102::/72" ];
   };
 
-  _module.args.nixinate = {
+  deploy = {
     host = endpoint;
     buildOn = "remote";
     substituteOnTarget = true;
     hermetic = false;
-    nixOptions = [ "--show-trace" ];
   };
 }
diff --git a/machines/fra01/default.nix b/machines/fra01/default.nix
index 6e2f80f..f296fc1 100644
--- a/machines/fra01/default.nix
+++ b/machines/fra01/default.nix
@@ -30,10 +30,10 @@ in
     allowedIPs = [ "10.102.5.0/24" "fd15:3d8c:d429:102:500::/72" ];
   };
 
-  _module.args.nixinate = {
+  deploy = {
     host = endpoint;
     buildOn = "local";
     substituteOnTarget = true;
-    hermetic = true;
+    hermetic = false;
   };
 }
diff --git a/machines/nyc01/default.nix b/machines/nyc01/default.nix
index ef81a57..8331c8f 100644
--- a/machines/nyc01/default.nix
+++ b/machines/nyc01/default.nix
@@ -30,10 +30,10 @@ in
     allowedIPs = [ "10.102.3.0/24" "fd15:3d8c:d429:102:300::/72" ];
   };
 
-  _module.args.nixinate = {
+  deploy = {
     host = endpoint;
     buildOn = "local";
     substituteOnTarget = true;
-    hermetic = true;
+    hermetic = false;
   };
 }
diff --git a/machines/phaenn/default.nix b/machines/phaenn/default.nix
index 866f865..01649db 100644
--- a/machines/phaenn/default.nix
+++ b/machines/phaenn/default.nix
@@ -53,11 +53,10 @@ in
     allowedIPs = [ "10.102.1.0/24" "fd15:3d8c:d429:102:100::/72" ];
   };
 
-  _module.args.nixinate = {
+  deploy = {
     host = endpoint;
     buildOn = "remote";
     substituteOnTarget = true;
-    hermetic = true;
-    nixOptions = [ "--show-trace" ];
+    hermetic = false;
   };
 }
diff --git a/machines/sin01/default.nix b/machines/sin01/default.nix
index 4b168fc..ab70162 100644
--- a/machines/sin01/default.nix
+++ b/machines/sin01/default.nix
@@ -30,10 +30,10 @@ in
     allowedIPs = [ "10.102.4.0/24" "fd15:3d8c:d429:102:400::/72" ];
   };
 
-  _module.args.nixinate = {
+  deploy = {
     host = endpoint;
     buildOn = "local";
     substituteOnTarget = true;
-    hermetic = true;
+    hermetic = false;
   };
 }