Changing file structure to prepare for ISO

flake.nix

@@ -10,15 +10,27 @@
   };
 
   outputs = { self, nixpkgs, nixos-hardware, nix-flatpak, ... }@attrs: {
-    nixosConfigurations.lyes-pc = nixpkgs.lib.nixosSystem {
+    nixosConfigurations = {
+      lyes-pc = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = attrs;
         modules = [
-        ./configuration/configuration.nix
+          ./general/configuration.nix
           nix-flatpak.nixosModules.nix-flatpak
-        ./hardware/lyes-pc/configuration.nix
+          ./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
+      #   ];
+      # };
+    };
   };
 }

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

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";