From e0bead4ced7185e9e153c9fa695aed422ef34957 Mon Sep 17 00:00:00 2001
From: Kaybee <kb01@kb-one.de>
Date: Thu, 30 Oct 2025 18:40:23 +0100
Subject: [PATCH] Organized Properties, Added HW Token support

---
 systems/i686-linux/Rubtrm/hardware.nix | 45 ++++++++++++++++++--------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/systems/i686-linux/Rubtrm/hardware.nix b/systems/i686-linux/Rubtrm/hardware.nix
index 62731cf..052bc18 100644
--- a/systems/i686-linux/Rubtrm/hardware.nix
+++ b/systems/i686-linux/Rubtrm/hardware.nix
@@ -5,38 +5,57 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
+  # Nix Config
+  nixpkgs.hostPlatform = lib.mkDefault "i686-linux";
+
+  # Kernel
   boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "usbhid" "usb_storage" "ums_realtek" "sd_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
-  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NIXOS_LUKS";
-  boot.initrd.luks.devices."cryptroot".crypttabExtraOpts = [ "fido2-device=auto" ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
   boot.kernelParams = [ "i915.force_probe=27ae" ];
 
-  fileSystems."/" = { 
-    device = "/dev/disk/by-label/NIXOS_ROOT";
-    fsType = "ext4";
-  };
 
+  # Boot Process
+  boot.loader.grub = {
+    enable = true;
+    copyKernels = true;
+  };
+  boot.initrd.systemd.enable = true;
+  #boot.plymouth.enable = true;
+  #boot.plymouth.logo = pkgs.fetchurl {
+  #  url = "https://forum.auxolotl.org/uploads/default/original/1X/be37690f0748737fc813dd3592848f5323a7f277.png";
+  #  hash = "sha256-+E7mAoEMnHsavKzEdTosli08Oohq+yt3WB4Uhwpi0Vg=";
+  #};
+
+  # Filesystems
   fileSystems."/boot" = {
     device = "/dev/disk/by-label/NIXOS_BOOT";
     fsType = "vfat";
   };
-
+  fileSystems."/" = { 
+    device = "/dev/disk/by-label/NIXOS_ROOT";
+    fsType = "ext4";
+  };
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NIXOS_LUKS";
+  boot.initrd.luks.devices."cryptroot".crypttabExtraOpts = [ "fido2-device=auto" ];
   swapDevices = [ 
     {
       device = "/.swapfile";
     }
   ];
 
+  # Misc
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
 
-  nixpkgs.hostPlatform = lib.mkDefault "i686-linux";
-  # networking.enableIntel3945ABGFirmware = true;
-  hardware.graphics.extraPackages = [ pkgs.intel-vaapi-driver ];
-  hardware.graphics.extraPackages32 = [ pkgs.intel-vaapi-driver ];
+  # Firmware
+  # intel-media-driver
+  # intel-vaapi-driver
+  # libva-vdpau-drivemesar
+  # libvdpau-va-gl
+  # mesa
+  hardware.graphics.extraPackages = [ pkgs.driversi686Linux.mesa ];
+  hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.mesa ];
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.enableAllFirmware = true;
 }