3 files changed, 20 insertions, 14 deletions
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index 5d9e2fc..222f36b 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -1,18 +1,26 @@
 { config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
-    kernelPackages = pkgs.linuxPackages_6_12;
-    loader.grub.enable = true;
+    kernelPackages = pkgs.linuxPackages_6_18;
+    loader = {
+      efi.canTouchEfiVariables = true;
+      systemd-boot = {
+        enable = true;
+        memtest86.enable = true;
+      };
+      timeout = 3;
+    };
     supportedFilesystems = [ "zfs" ];
     zfs = {
       devNodes = "/dev/disk/by-label";
-      package = pkgs.master.zfs;
+      forceImportRoot = false;
+      package = pkgs.zfs_2_4;
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    git-review
-    master.openstackclient-full
+  environment.systemPackages = [
+    pkgs.git-review
+    pkgs.openstackclient-full
   ];
 
   imports = [
@@ -21,6 +29,7 @@
     ../common/core
     #../common/optional/db.nix
     ../common/optional/dev.nix
+    ../common/optional/gui.nix
     ../common/optional/misc.nix
     #../common/optional/multimedia.nix
     ../common/optional/pipewire.nix
@@ -49,7 +58,7 @@
   };
 
   services.openssh.openFirewall = false;
-  services.xserver.videoDrivers = lib.mkForce [ "vmware" "virtualbox" "modesetting" ];
+  services.xserver.videoDrivers = lib.mkForce [ "modesetting" ];
 
   sops = {
     age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
@@ -57,6 +66,7 @@
 
     secrets = {
       "nix-access-token-github" = {};
+      "ssh_config".path = "/root/.ssh/config";
     };
   };
 
@@ -83,5 +93,5 @@
     (builtins.readFile ../common/users/nipsy/keys/id_att.pub)
   ];
 
-  virtualisation.virtualbox.guest.enable = true;
+  virtualisation.hypervGuest.enable = true;
 }
diff --git a/hosts/richese/disks.nix b/hosts/richese/disks.nix
index 02c6ffe..a626a80 100644
--- a/hosts/richese/disks.nix
+++ b/hosts/richese/disks.nix
@@ -7,10 +7,6 @@
         content = {
           type = "gpt";
           partitions = {
-            MBR = {
-              size = "4M";
-              type = "EF02";
-            };
             ESP = {
               size = "1G";
               type = "EF00";
@@ -52,7 +48,7 @@
           encryption = "aes-256-gcm";
           keyformat = "passphrase";
           keylocation = "file:///tmp/data.keyfile";
-          normalization = "formD";
+          #normalization = "formD"; # disabled due to previous issue: https://github.com/NixOS/nixpkgs/pull/86432
           relatime = "on";
           xattr = "sa";
         };
diff --git a/hosts/richese/hardware-configuration.nix b/hosts/richese/hardware-configuration.nix
index d1c33b7..07b3857 100644
--- a/hosts/richese/hardware-configuration.nix
+++ b/hosts/richese/hardware-configuration.nix
@@ -8,7 +8,7 @@
     [ #(modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ohci_pci" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];