Feat: Made more configuration host independent

6 files changed, 13 insertions, 47 deletions

diff --git a/hosts/IDOHVE/hardware/filesystems.nix b/hosts/IDOHVE/hardware/filesystems.nix
deleted file mode 100644
index a188df18..00000000
--- a/hosts/IDOHVE/hardware/filesystems.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{config, ...}: let
-  main_disk = "/dev/disk/by-uuid/<uuid>";
-in {
-  fileSystems = {
-    "/" = {
-      device = "none";
-      fsType = "tmpfs";
-      options = ["defaults" "size=2G" "mode=755"];
-    };
-    "/nix" = {
-      device = main_disk;
-      fsType = "btrfs";
-      options = ["subvol=@nix" "compress-force=zstd:9"];
-    };
-    "/boot" = {
-      device = "/dev/disk/by-uuid/<uuid>";
-      fsType = "vfat";
-    };
-
-    "/srv/home" = {
-      device = main_disk;
-      fsType = "btrfs";
-      options = ["subvol=@home" "compress-force=zstd:9"];
-    };
-    "/srv/nixos-config" = {
-      device = main_disk;
-      fsType = "btrfs";
-      options = ["subvol=@nixos-config" "compress-force=zstd:9"];
-    };
-
-    "/etc/nixos" = {
-      device = "/srv/nix-config";
-      options = ["bind"];
-    };
-    "/home" = {
-      device = "/srv/home";
-      options = ["bind"];
-    };
-  };
-  swapDevices = [];
-}
diff --git a/hosts/IDOHVE/hardware/hardware.nix b/hosts/IDOHVE/hardware/hardware.nix
index 2d21ce8a..c36b7062 100644
--- a/hosts/IDOHVE/hardware/hardware.nix
+++ b/hosts/IDOHVE/hardware/hardware.nix
@@ -9,9 +9,20 @@
     (modulesPath + "/installer/scan/not-detected.nix") # TODO is this necessary?
     ./cpu.nix
     ./gpu.nix
-    ./boot.nix
-    ./filesystems.nix
   ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  system.filesystemLayouts = {
+    enable = true;
+    mainDisk = "/dev/disk/by-uuid/<uuid>";
+    efiDisk = "/dev/disk/by-uuid/<uuid>";
+  };
+
+  boot = {
+    kernelModules = ["kvm-amd"];
+
+    # TODO check this:
+    initrd.availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"];
+  };
 }
diff --git a/hosts/IDOHVE/hardware/boot.nix b/system/boot/boot.nix
index 4cd94191..629e63ae 100644
--- a/hosts/IDOHVE/hardware/boot.nix
+++ b/system/boot/boot.nix
@@ -7,12 +7,8 @@
     initrd = {
       compressor = "lz4";
       compressorArgs = ["-9"];
-
-      # TODO check this:
-      availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"];
     };
 
-    kernelModules = ["kvm-amd"];
     kernelPackages = pkgs.linuxPackages_latest;
     loader = {
       grub = {
diff --git a/hosts/IDOHVE/hardware/boot_pictures/gnu.png b/system/boot/boot_pictures/gnu.png
index d07dee3e..d07dee3e 100755
--- a/hosts/IDOHVE/hardware/boot_pictures/gnu.png
+++ b/system/boot/boot_pictures/gnu.png
Binary files differdiff --git a/hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_1.png b/system/boot/boot_pictures/gnulin_emb_1.png
index 483f2681..483f2681 100755
--- a/hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_1.png
+++ b/system/boot/boot_pictures/gnulin_emb_1.png
Binary files differdiff --git a/hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_2.png b/system/boot/boot_pictures/gnulin_emb_2.png
index 48cd6ad7..48cd6ad7 100755
--- a/hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_2.png
+++ b/system/boot/boot_pictures/gnulin_emb_2.png
Binary files differ