From 4122a52949039fbbbd2d0a0bf36320a42078c717 Mon Sep 17 00:00:00 2001
From: Lyes Saadi <dev@lyes.eu>
Date: Sun, 5 May 2024 19:25:12 +0200
Subject: [PATCH] Changing file structure to prepare for ISO

---
 flake.nix                                     | 30 +++++++++++++------
 {configuration => generic}/configuration.nix  |  0
 {configuration => generic}/gaming.nix         |  0
 {configuration => generic}/networking.nix     |  0
 {configuration => generic}/packages.nix       |  0
 {configuration => generic}/specialisation.nix |  0
 {configuration => generic}/system.nix         | 14 +--------
 {configuration => generic}/user/home.nix      |  0
 {configuration => generic}/user/packages.nix  |  0
 {configuration => generic}/user/user.nix      |  0
 .../lyes-pc/configuration.nix                 | 15 ++++++++++
 .../lyes-pc/hardware-configuration.nix        |  0
 12 files changed, 37 insertions(+), 22 deletions(-)
 rename {configuration => generic}/configuration.nix (100%)
 rename {configuration => generic}/gaming.nix (100%)
 rename {configuration => generic}/networking.nix (100%)
 rename {configuration => generic}/packages.nix (100%)
 rename {configuration => generic}/specialisation.nix (100%)
 rename {configuration => generic}/system.nix (91%)
 rename {configuration => generic}/user/home.nix (100%)
 rename {configuration => generic}/user/packages.nix (100%)
 rename {configuration => generic}/user/user.nix (100%)
 rename {hardware => specific}/lyes-pc/configuration.nix (91%)
 rename {hardware => specific}/lyes-pc/hardware-configuration.nix (100%)

diff --git a/flake.nix b/flake.nix
index 4b60f8d..7ef0b7c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,15 +10,27 @@
   };
 
   outputs = { self, nixpkgs, nixos-hardware, nix-flatpak, ... }@attrs: {
-    nixosConfigurations.lyes-pc = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = attrs;
-      modules = [
-        ./configuration/configuration.nix
-        nix-flatpak.nixosModules.nix-flatpak
-        ./hardware/lyes-pc/configuration.nix
-        nixos-hardware.nixosModules.lenovo-thinkpad-x1-extreme-gen4
-      ];
+    nixosConfigurations = {
+      lyes-pc = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = attrs;
+        modules = [
+          ./general/configuration.nix
+          nix-flatpak.nixosModules.nix-flatpak
+          ./specific/lyes-pc/configuration.nix
+          nixos-hardware.nixosModules.lenovo-thinkpad-x1-extreme-gen4
+        ];
+      };
+
+      # iso = nixpkgs.lib.nixosSystem {
+      #   system = "x86_64-linux";
+      #   specialArgs = attrs;
+      #   modules = [
+      #     ./general/configuration.nix
+      #     nix-flatpak.nixosModules.nix-flatpak
+      #     ./specific/iso/configuration.nix
+      #   ];
+      # };
     };
   };
 }
diff --git a/configuration/configuration.nix b/generic/configuration.nix
similarity index 100%
rename from configuration/configuration.nix
rename to generic/configuration.nix
diff --git a/configuration/gaming.nix b/generic/gaming.nix
similarity index 100%
rename from configuration/gaming.nix
rename to generic/gaming.nix
diff --git a/configuration/networking.nix b/generic/networking.nix
similarity index 100%
rename from configuration/networking.nix
rename to generic/networking.nix
diff --git a/configuration/packages.nix b/generic/packages.nix
similarity index 100%
rename from configuration/packages.nix
rename to generic/packages.nix
diff --git a/configuration/specialisation.nix b/generic/specialisation.nix
similarity index 100%
rename from configuration/specialisation.nix
rename to generic/specialisation.nix
diff --git a/configuration/system.nix b/generic/system.nix
similarity index 91%
rename from configuration/system.nix
rename to generic/system.nix
index 60d1bea..de8c209 100644
--- a/configuration/system.nix
+++ b/generic/system.nix
@@ -1,14 +1,8 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 {
   # OS Configuration
   boot.loader.systemd-boot.enable = true;
-  boot.loader.systemd-boot.extraEntries = {
-    "fedora.conf" = ''
-      title Fedora
-      efi /EFI/fedora/grubx64.efi
-    '';
-  };
   boot.loader.systemd-boot.configurationLimit = 10;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.plymouth.enable = true;
@@ -16,12 +10,6 @@
 
   boot.supportedFilesystems = [ "ntfs" ];
 
-  fileSystems = {
-    "/".options = [ "compress=zstd:1" ];
-    "/home".options = [ "compress=zstd:1" ];
-    "/nix".options = [ "compress=zstd:1" "noatime" ];
-  };
-
   zramSwap.enable = true;
 
   # Firmware
diff --git a/configuration/user/home.nix b/generic/user/home.nix
similarity index 100%
rename from configuration/user/home.nix
rename to generic/user/home.nix
diff --git a/configuration/user/packages.nix b/generic/user/packages.nix
similarity index 100%
rename from configuration/user/packages.nix
rename to generic/user/packages.nix
diff --git a/configuration/user/user.nix b/generic/user/user.nix
similarity index 100%
rename from configuration/user/user.nix
rename to generic/user/user.nix
diff --git a/hardware/lyes-pc/configuration.nix b/specific/lyes-pc/configuration.nix
similarity index 91%
rename from hardware/lyes-pc/configuration.nix
rename to specific/lyes-pc/configuration.nix
index 6ef01c4..2d5ee6f 100644
--- a/hardware/lyes-pc/configuration.nix
+++ b/specific/lyes-pc/configuration.nix
@@ -74,6 +74,21 @@
   #   };
   # };
 
+  # Boot
+  boot.loader.systemd-boot.extraEntries = {
+    "fedora.conf" = ''
+      title Fedora
+      efi /EFI/fedora/grubx64.efi
+    '';
+  };
+
+  # Filesystem  
+  fileSystems = {
+    "/".options = [ "compress=zstd:1" ];
+    "/home".options = [ "compress=zstd:1" ];
+    "/nix".options = [ "compress=zstd:1" "noatime" ];
+  };
+
   # Networking
   networking.hostName = "lyes-pc";
  
diff --git a/hardware/lyes-pc/hardware-configuration.nix b/specific/lyes-pc/hardware-configuration.nix
similarity index 100%
rename from hardware/lyes-pc/hardware-configuration.nix
rename to specific/lyes-pc/hardware-configuration.nix