From 120c8ea9f0c662fe044433ff371ce6e29a797393 Mon Sep 17 00:00:00 2001
From: Chris Dombroski <cdombroski@gmail.com>
Date: Thu, 19 Sep 2024 21:56:38 -0400
Subject: [PATCH] Move zeus to ezconfigs

---
 flake.nix                                     | 15 ------------
 .../zeus.nix                                  | 24 ++++++++++++-------
 .../zeus/hardware-configuration.nix           |  0
 systems/orangepihole/configuration.nix        |  4 ++--
 systems/smolboi/configuration.nix             |  2 +-
 5 files changed, 19 insertions(+), 26 deletions(-)
 rename systems/zeus/configuration.nix => nixos-configurations/zeus.nix (95%)
 rename {systems => nixos-configurations}/zeus/hardware-configuration.nix (100%)

diff --git a/flake.nix b/flake.nix
index a6ee7c4..22ed99e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -120,21 +120,6 @@
                 }
               ];
             };
-            zeus = inputs.nixpkgs.lib.nixosSystem {
-              specialArgs = {
-                inherit inputs;
-                pkgs-unstable = inputs.nixunstable.legacyPackages.x86_64-linux;
-              };
-              modules = [
-                ./systems/zeus/configuration.nix
-                inputs.impermanence.nixosModules.impermanence
-                inputs.nixos-hardware.nixosModules.supermicro
-                inputs.nixos-hardware.nixosModules.common-cpu-amd
-                inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
-                inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
-                inputs.nixos-hardware.nixosModules.common-pc
-              ];
-            };
             orangepihole = inputs.nixpkgs.lib.nixosSystem {
               specialArgs = {
                 inherit inputs;
diff --git a/systems/zeus/configuration.nix b/nixos-configurations/zeus.nix
similarity index 95%
rename from systems/zeus/configuration.nix
rename to nixos-configurations/zeus.nix
index 0a3d416..1a750fe 100644
--- a/systems/zeus/configuration.nix
+++ b/nixos-configurations/zeus.nix
@@ -1,20 +1,27 @@
 {
   config,
   pkgs,
-  pkgs-unstable,
   inputs,
+  ezModules,
   ...
 }:
-
+let
+  pkgs-unstable = import inputs.nixunstable { inherit (pkgs.stdenv) system; };
+in
 {
   imports = [
     # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ../../nixos-modules
-    ../../nixos-modules/aarch64-emu.nix
-    ../../nixos-modules/networkd-base.nix
-    ../../nixos-modules/smartd.nix
-    ../../nixos-modules/plymouth.nix
+    ./zeus/hardware-configuration.nix
+    inputs.impermanence.nixosModules.impermanence
+    inputs.nixos-hardware.nixosModules.supermicro
+    inputs.nixos-hardware.nixosModules.common-cpu-amd
+    inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
+    inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
+    inputs.nixos-hardware.nixosModules.common-pc
+    ezModules.aarch64-emu
+    ezModules.networkd-base
+    ezModules.smartd
+    ezModules.plymouth
   ];
 
   boot = {
@@ -407,6 +414,7 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH7rvqA2VG9kOPHBNgfna0YA+jEjIR6ZAKrdgWVWQjCV root@orangepihole"
     ];
   };
+  nix.settings.trusted-users = ["nixremote" ];
   environment = {
     systemPackages = with pkgs; [
       vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
diff --git a/systems/zeus/hardware-configuration.nix b/nixos-configurations/zeus/hardware-configuration.nix
similarity index 100%
rename from systems/zeus/hardware-configuration.nix
rename to nixos-configurations/zeus/hardware-configuration.nix
diff --git a/systems/orangepihole/configuration.nix b/systems/orangepihole/configuration.nix
index 96b30f4..7e2b9e7 100644
--- a/systems/orangepihole/configuration.nix
+++ b/systems/orangepihole/configuration.nix
@@ -153,6 +153,6 @@
     IdentitiesOnly yes
     IdentityFile ${config.sops.secrets."nixremote/sshkey".path}
   '';
-  nix.distributedBuilds = false;
-  #nix.settings.max-jobs = 0;
+  nix.distributedBuilds = true;
+  nix.settings.max-jobs = 0;
 }
diff --git a/systems/smolboi/configuration.nix b/systems/smolboi/configuration.nix
index 7e876e7..eeee353 100644
--- a/systems/smolboi/configuration.nix
+++ b/systems/smolboi/configuration.nix
@@ -109,7 +109,7 @@
 
   environment = {
     systemPackages = with pkgs; [
-      vim-full # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+      vim-full # Do not forget to add an editor to edit zeus.nix! The Nano editor is also installed by default.
       libreoffice-qt
       firefox
       syncthing