From debd040e83c9aea4f8d75c09df7d35e1349f373a Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Thu, 26 Sep 2024 20:15:20 -0700
Subject: [PATCH] refactor default configs

---
 provision/hosts/bulwark/default.nix                       | 4 ++--
 provision/hosts/default/default.nix                       | 4 ----
 provision/hosts/default/{ => physical}/configuration.nix  | 8 +++++++-
 .../hosts/default/{ => physical}/home-configuration.nix   | 0
 provision/hosts/kestrel/default.nix                       | 4 ++--
 provision/hosts/shivan/default.nix                        | 4 ++--
 provision/hosts/torus/default.nix                         | 4 ++--
 7 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 provision/hosts/default/default.nix
 rename provision/hosts/default/{ => physical}/configuration.nix (90%)
 rename provision/hosts/default/{ => physical}/home-configuration.nix (100%)

diff --git a/provision/hosts/bulwark/default.nix b/provision/hosts/bulwark/default.nix
index 385a44da..d98308c3 100644
--- a/provision/hosts/bulwark/default.nix
+++ b/provision/hosts/bulwark/default.nix
@@ -3,10 +3,10 @@
   inherit system;
   specialArgs = { inherit user inputs; };
   modules = [
-    ../default
-    ../../modules
+    ../default/physical/configuration.nix
     ./configuration.nix
     ./hardware.nix
+    ../../modules
     agenix.nixosModules.default
     home-manager.nixosModules.home-manager {
       home-manager.useGlobalPkgs = true;
diff --git a/provision/hosts/default/default.nix b/provision/hosts/default/default.nix
deleted file mode 100644
index 08e821e2..00000000
--- a/provision/hosts/default/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{ 
-  imports = [ ./git.nix ./backup.nix ./configuration.nix ./home-configuration.nix ];
-}
diff --git a/provision/hosts/default/configuration.nix b/provision/hosts/default/physical/configuration.nix
similarity index 90%
rename from provision/hosts/default/configuration.nix
rename to provision/hosts/default/physical/configuration.nix
index 1bf28dcc..ed3d2a6d 100644
--- a/provision/hosts/default/configuration.nix
+++ b/provision/hosts/default/physical/configuration.nix
@@ -1,5 +1,11 @@
 { config, pkgs, user, lib, inputs, ... }:
 {
+  imports = [ 
+    ../git.nix 
+    ../backup.nix 
+    ./home-configuration.nix
+  ];
+
   nix = {
     package = pkgs.nixFlakes;
     extraOptions = "experimental-features = nix-command flakes";
@@ -15,7 +21,7 @@
   # Add non-free packages
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" "openssl-1.1.1w" ];
-  nixpkgs.overlays = import ../../lib/overlays.nix;
+  nixpkgs.overlays = import ../../../lib/overlays.nix;
 
   # Hardware options
   hardware.bluetooth.enable = true;
diff --git a/provision/hosts/default/home-configuration.nix b/provision/hosts/default/physical/home-configuration.nix
similarity index 100%
rename from provision/hosts/default/home-configuration.nix
rename to provision/hosts/default/physical/home-configuration.nix
diff --git a/provision/hosts/kestrel/default.nix b/provision/hosts/kestrel/default.nix
index 8af9ba68..27a8f63e 100644
--- a/provision/hosts/kestrel/default.nix
+++ b/provision/hosts/kestrel/default.nix
@@ -3,10 +3,10 @@
   inherit system;
   specialArgs = { inherit user inputs; };
   modules = [
-    ../default
-    ../../modules
+    ../default/physical/configuration.nix
     ./configuration.nix
     ./hardware.nix
+    ../../modules
     agenix.nixosModules.default
     home-manager.nixosModules.home-manager {
       home-manager.useGlobalPkgs = true;
diff --git a/provision/hosts/shivan/default.nix b/provision/hosts/shivan/default.nix
index 8af9ba68..27a8f63e 100644
--- a/provision/hosts/shivan/default.nix
+++ b/provision/hosts/shivan/default.nix
@@ -3,10 +3,10 @@
   inherit system;
   specialArgs = { inherit user inputs; };
   modules = [
-    ../default
-    ../../modules
+    ../default/physical/configuration.nix
     ./configuration.nix
     ./hardware.nix
+    ../../modules
     agenix.nixosModules.default
     home-manager.nixosModules.home-manager {
       home-manager.useGlobalPkgs = true;
diff --git a/provision/hosts/torus/default.nix b/provision/hosts/torus/default.nix
index 8af9ba68..27a8f63e 100644
--- a/provision/hosts/torus/default.nix
+++ b/provision/hosts/torus/default.nix
@@ -3,10 +3,10 @@
   inherit system;
   specialArgs = { inherit user inputs; };
   modules = [
-    ../default
-    ../../modules
+    ../default/physical/configuration.nix
     ./configuration.nix
     ./hardware.nix
+    ../../modules
     agenix.nixosModules.default
     home-manager.nixosModules.home-manager {
       home-manager.useGlobalPkgs = true;