Commit 37efd707fcb9

@@ -1,18 +1,11 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:
-let
-  gpuIDs = [
-    "10de:1b80" # Graphics
-    "10de:10f0" # Audio
-  ];
-in
 {
   boot = {
-    supportedFilesystems = [ "zfs" ];
+    # supportedFilesystems = [ "zfs" ];
     initrd.availableKernelModules = [
       "xhci_pci"
       "ahci"
@@ -33,6 +26,18 @@ in
       "nvidia_drm"
     ];
     kernelModules = [
+      "ahci" # sata controller, might not be needed
+      "nvme" # required for nvme disks
+      "thunderbolt" # required for thunderbolt (dock, …)
+      # from thinkpad x1 gen 9
+      "dm-mod"
+      "cryptd" # required for encryption
+      "xhci_pci" # usb controller related
+      "usb_storage" # usb storage related
+      "sd_mod" # block device related
+      "sdhci_pci" # block device related as well
+      "aesni-intel" # advanced encryption for intel
+      "kvm_intel"
       "kvm-intel"
       "nvidia"
     ];
@@ -43,7 +48,7 @@ in
     kernelParams = [
       "intel_iommu=on"
       "kvm_intel.nested=1"
-      ("vfio-pci.ids=" + lib.concatStringsSep "," gpuIDs)
+      # ("vfio-pci.ids=" + lib.concatStringsSep "," gpuIDs)
     ];
 
     kernelPackages = pkgs.linuxPackages_latest;

@@ -3,6 +3,54 @@
   ...
 }:
 {
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/73fd8864-f6af-4fdd-b826-0dfdeacd3c19";
+    fsType = "ext4";
+    options = [
+      "noatime"
+      "discard"
+    ];
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/829D-BFD1";
+    fsType = "vfat";
+  };
+
+  # Extra data
+  # HDD:   b58e59a4-92e7-4278-97ba-6fe361913f50
+  fileSystems."/data" = {
+    device = "/dev/disk/by-uuid/b58e59a4-92e7-4278-97ba-6fe361913f50";
+    fsType = "ext4";
+    options = [ "noatime" ];
+  };
+  # ZFS Pool
+  # SSD1:  469077df-049f-4f5d-a34f-1f5449d782ec
+  # SSD2:  e11a3b63-791c-418b-9f4b-5ae0199f1f97
+  # NVME2: 3d2dff80-f2b1-4c48-8e76-12b01fdf4137
+  # boot.zfs.extraPools = [ "tank" ];
+  # networking.hostId = "03129692bea040488878aa0133e54914";
+  # networking.hostId = "03129692";
+  # fileSystems."/tank/data" =
+  #   {
+  #     device = "tank/data";
+  #     fsType = "zfs";
+  #     options = [ "zfsutil" ];
+  #   };
+  #
+  # fileSystems."/tank/virt" =
+  #   {
+  #     device = "tank/virt";
+  #     fsType = "zfs";
+  #     options = [ "zfsutil" ];
+  #   };
+
+  swapDevices = [
+    {
+      device = "/dev/disk/by-uuid/a9ec44e6-0c1d-4f60-9f5c-81a7eaa8e8fd";
+    }
+  ];
+
   networking = {
     hostId = builtins.substring 0 8 (builtins.hashString "md5" config.networking.hostName);
     # Bridge setup

@@ -91,6 +91,9 @@
         kobe = libx.mkHost {
           hostname = "kobe";
         };
+        shikoku = libx.mkHost {
+          hostname = "shikoku";
+        };
         # Servers (stable)
         athena = libx.mkHost {
           hostname = "athena";
@@ -113,7 +116,6 @@
           pkgsInput = inputs.nixpkgs-25_05;
           homeInput = inputs.home-manager-25_05;
         };
-        # shikoku = libx.mkHost { hostname = "shikoku"; };
         # sakhalin = libx.mkHost { hostname = "sakhalin"; };
         kerkouane = libx.mkHost {
           hostname = "kerkouane";
@@ -121,10 +123,6 @@
           homeInput = inputs.home-manager-25_05;
         };
         # FIXME migrate to libx.mkHost
-        shikoku = inputs.nixpkgs-24_11.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = commonModules ++ stableModules ++ [ ./systems/hosts/shikoku.nix ];
-        };
         sakhalin = inputs.nixpkgs-24_11.lib.nixosSystem {
           system = "x86_64-linux";
           modules =