3 files changed, 19 insertions, 18 deletions
diff --git a/config/default.nix b/config/default.nix
index 974736f..b36b01f 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -6,6 +6,7 @@
     ./hardware
     ./networking
     ./nix.nix
+    ./system.nix
     ./users.nix
   ];
 
diff --git a/config/nix.nix b/config/nix.nix
index 4c95ce6..3142f93 100644
--- a/config/nix.nix
+++ b/config/nix.nix
@@ -1,28 +1,11 @@
 {...}: {
   personal.nix = {
     enable = true;
-    autoUpgrade.enable = true;
     gc.enable = true;
-    flake = "git+file:///etc/nixos/";
-    remoteBuilds = {
-      enable = true;
-      machines.hephaistos = {
-        enable = true;
-        domain = "local";
-      };
-    };
   };
-  # disable local builds
-  nix.settings.max-jobs = 0;
+
   nixpkgs.flake = {
     setNixPath = true;
     setFlakeRegistry = true;
   };
-  system.autoUpgrade = {
-    flags = [
-      # for reading secrets from a file
-      "--impure"
-    ];
-    dates = "02:00";
-  };
 }
diff --git a/config/system.nix b/config/system.nix
new file mode 100644
index 0000000..5b6ba5f
--- /dev/null
+++ b/config/system.nix
@@ -0,0 +1,17 @@
+{...}: {
+  personal.system = {
+    flake = "git+file:///etc/nixos/";
+    autoUpgrade = {
+      enable = true;
+      remoteBuilding = {
+        enable = true;
+        builder.domain = "local";
+      };
+    };
+  };
+
+  system.autoUpgrade = {
+    allowReboot = true;
+    dates = "02:00";
+  };
+}