From 75b442acb64bac70294681ae6d318a470afeac3c Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sat, 4 Feb 2023 11:54:55 +0100
Subject: Feat: Made more configuration host independent

---
 hosts/IDOHVE/hardware/boot.nix                     |  32 ----------------
 hosts/IDOHVE/hardware/boot_pictures/gnu.png        | Bin 327518 -> 0 bytes
 .../IDOHVE/hardware/boot_pictures/gnulin_emb_1.png | Bin 207444 -> 0 bytes
 .../IDOHVE/hardware/boot_pictures/gnulin_emb_2.png | Bin 208347 -> 0 bytes
 hosts/IDOHVE/hardware/filesystems.nix              |  41 ---------------------
 hosts/IDOHVE/hardware/hardware.nix                 |  15 +++++++-
 6 files changed, 13 insertions(+), 75 deletions(-)
 delete mode 100644 hosts/IDOHVE/hardware/boot.nix
 delete mode 100755 hosts/IDOHVE/hardware/boot_pictures/gnu.png
 delete mode 100755 hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_1.png
 delete mode 100755 hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_2.png
 delete mode 100644 hosts/IDOHVE/hardware/filesystems.nix

(limited to 'hosts')

diff --git a/hosts/IDOHVE/hardware/boot.nix b/hosts/IDOHVE/hardware/boot.nix
deleted file mode 100644
index 4cd94191..00000000
--- a/hosts/IDOHVE/hardware/boot.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  boot = {
-    initrd = {
-      compressor = "lz4";
-      compressorArgs = ["-9"];
-
-      # TODO check this:
-      availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"];
-    };
-
-    kernelModules = ["kvm-amd"];
-    kernelPackages = pkgs.linuxPackages_latest;
-    loader = {
-      grub = {
-        enable = true;
-        version = 2;
-        theme = pkgs.nixos-grub2-theme;
-        splashImage = ./boot_pictures/gnu.png;
-        efiSupport = true;
-        device = "nodev"; # only for efi
-      };
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
-      };
-    };
-  };
-}
diff --git a/hosts/IDOHVE/hardware/boot_pictures/gnu.png b/hosts/IDOHVE/hardware/boot_pictures/gnu.png
deleted file mode 100755
index d07dee3e..00000000
Binary files a/hosts/IDOHVE/hardware/boot_pictures/gnu.png and /dev/null differ
diff --git a/hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_1.png b/hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_1.png
deleted file mode 100755
index 483f2681..00000000
Binary files a/hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_1.png and /dev/null differ
diff --git a/hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_2.png b/hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_2.png
deleted file mode 100755
index 48cd6ad7..00000000
Binary files a/hosts/IDOHVE/hardware/boot_pictures/gnulin_emb_2.png and /dev/null differ
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"];
+  };
 }
-- 
cgit 1.4.1