From 71ec2a349fc079fea60dd9cfe1f107f70ac30d1a Mon Sep 17 00:00:00 2001
From: Polen <polensky@pm.me>
Date: Mon, 28 Oct 2024 11:17:43 -0400
Subject: [PATCH] rearrange for modularity

---
 .../assets}/a_forest_of_trees_with_fog.jpg    | Bin
 .../xps13/configuration.nix                   |   0
 .../xps13/hardware-configuration.nix          |   0
 .../xps13/sddm-theme.nix                      |   0
 flake.nix                                     |  26 ++++++++++--------
 iso/sl1_cath.nix                              |   7 -----
 modules/default.nix                           |   5 ++++
 result                                        |   1 +
 8 files changed, 20 insertions(+), 19 deletions(-)
 rename {assets => devices/xps13/assets}/a_forest_of_trees_with_fog.jpg (100%)
 rename configuration.nix => devices/xps13/configuration.nix (100%)
 rename hardware-configuration.nix => devices/xps13/hardware-configuration.nix (100%)
 rename sddm-theme.nix => devices/xps13/sddm-theme.nix (100%)
 delete mode 100644 iso/sl1_cath.nix
 create mode 100644 modules/default.nix
 create mode 120000 result

diff --git a/assets/a_forest_of_trees_with_fog.jpg b/devices/xps13/assets/a_forest_of_trees_with_fog.jpg
similarity index 100%
rename from assets/a_forest_of_trees_with_fog.jpg
rename to devices/xps13/assets/a_forest_of_trees_with_fog.jpg
diff --git a/configuration.nix b/devices/xps13/configuration.nix
similarity index 100%
rename from configuration.nix
rename to devices/xps13/configuration.nix
diff --git a/hardware-configuration.nix b/devices/xps13/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to devices/xps13/hardware-configuration.nix
diff --git a/sddm-theme.nix b/devices/xps13/sddm-theme.nix
similarity index 100%
rename from sddm-theme.nix
rename to devices/xps13/sddm-theme.nix
diff --git a/flake.nix b/flake.nix
index 809e905..1916d20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,18 +9,20 @@
     {
       nixosConfigurations =  {
 				default = nixpkgs.lib.nixosSystem {
-						specialArgs = {inherit inputs;};
-						system = "x86_64-linux";
-						modules = [ 
-							./configuration.nix
-						];
-					};
-				};
-				iso_cath = nixpkgs.lib.nixosSystem {
-						specialArgs = {inherit inputs;};
-						modules = [ 
-							./iso/sl1_cath.nix
-						];
+					specialArgs = {inherit inputs;};
+					system = "x86_64-linux";
+					modules = [ 
+						./devices/xps13/configuration.nix
+						./modules
+					];
 				};
+				# pi = nixpkgs.lib.nixosSystem {
+				# 	specialArgs = {inherit inputs;};
+				# 	system = "aarch64-linux";
+				# 	modules = [ 
+				# 		./devices/pi/configuration.nix
+				# 	];
+				# };
+			};
     };
 }
diff --git a/iso/sl1_cath.nix b/iso/sl1_cath.nix
deleted file mode 100644
index bfebd18..0000000
--- a/iso/sl1_cath.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, modulesPath, ... }: {
-	import = [
-		"${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
-	];
-
-	nixpkgs.hostPlatform = "x86_64-linux";
-}
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..ea4fa06
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, lib, ... }: {
+
+	imports = [
+	];
+}
diff --git a/result b/result
new file mode 120000
index 0000000..c7ea4e6
--- /dev/null
+++ b/result
@@ -0,0 +1 @@
+/nix/store/a3swrfqfbvw6imdmgb2rarkz9bq5xkbg-nixos-24.11.20240616.b60ebf5-x86_64-linux.iso
\ No newline at end of file