From b651c90c66d64e40d6688108f0984054c0357c4d Mon Sep 17 00:00:00 2001
From: intergrav <devin@devins.page>
Date: Thu, 30 Jul 2026 03:31:26 -0400
Subject: [PATCH] chore: clean up hardware

---
 hosts/nixos/bluepill-proxy/hardware.nix    | 18 ++++-----
 hosts/nixos/bluepill/hardware.nix          | 44 ++++++++++------------
 hosts/nixos/bluepill/services/jellyfin.nix | 10 +----
 3 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/hosts/nixos/bluepill-proxy/hardware.nix b/hosts/nixos/bluepill-proxy/hardware.nix
index 3250e00..cf61fa8 100644
--- a/hosts/nixos/bluepill-proxy/hardware.nix
+++ b/hosts/nixos/bluepill-proxy/hardware.nix
@@ -1,6 +1,3 @@
-/*
-auto-generated, no touchy
-*/
 {
   lib,
   modulesPath,
@@ -8,19 +5,18 @@ auto-generated, no touchy
 }: {
   imports = [(modulesPath + "/profiles/qemu-guest.nix")];
 
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" "virtio_pci" "virtio_scsi" "sd_mod"];
-  boot.initrd.kernelModules = ["nvme"];
-  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [];
-
   fileSystems."/" = {
     device = "/dev/sda1";
     fsType = "ext4";
   };
 
-  boot.loader.grub.device = "/dev/sda";
-
-  swapDevices = [];
+  boot = {
+    initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" "virtio_pci" "virtio_scsi" "sd_mod"];
+    loader.limine = {
+      enable = true;
+      biosDevice = "/dev/sda";
+    };
+  };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
diff --git a/hosts/nixos/bluepill/hardware.nix b/hosts/nixos/bluepill/hardware.nix
index 114d362..cc5c180 100644
--- a/hosts/nixos/bluepill/hardware.nix
+++ b/hosts/nixos/bluepill/hardware.nix
@@ -1,6 +1,3 @@
-/*
-auto-generated, no touchy
-*/
 {
   config,
   lib,
@@ -9,10 +6,17 @@ auto-generated, no touchy
 }: {
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "xhci_pci_renesas" "usbhid" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = [];
-  boot.extraModulePackages = [];
+  hardware = {
+    cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    graphics.enable = true;
+    nvidia = {
+      open = false;
+      nvidiaSettings = false;
+      branch = "legacy_580";
+    };
+  };
+
+  services.xserver.videoDrivers = ["nvidia"];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/649b9c36-dd13-4cb7-9561-dff01fa3641b";
@@ -28,26 +32,16 @@ auto-generated, no touchy
   fileSystems."/mnt/backup" = {
     device = "/dev/disk/by-uuid/ec387aee-c588-4e84-9ddc-3be935c43257";
     fsType = "ext4";
-    options = [
-      "defaults"
-      "noatime"
-      "nofail"
-      "noauto"
-      "x-systemd.automount"
-      "x-systemd.idle-timeout=600"
-    ];
+    options = ["noatime" "nofail" "x-systemd.automount" "x-systemd.idle-timeout=600"];
   };
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  swapDevices = [
-    {
-      device = "/var/lib/swapfile";
-      size = 32 * 1024;
-    }
-  ];
+  boot = {
+    initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "xhci_pci_renesas" "usbhid" "sd_mod"];
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/nixos/bluepill/services/jellyfin.nix b/hosts/nixos/bluepill/services/jellyfin.nix
index 4cee94d..8379831 100644
--- a/hosts/nixos/bluepill/services/jellyfin.nix
+++ b/hosts/nixos/bluepill/services/jellyfin.nix
@@ -1,14 +1,6 @@
-{config, ...}: {
+{
   services.jellyfin = {
     enable = true;
     openFirewall = true;
   };
-
-  hardware.graphics.enable = true;
-  services.xserver.videoDrivers = ["nvidia"];
-  hardware.nvidia = {
-    open = false;
-    nvidiaSettings = false;
-    branch = "legacy_580";
-  };
 }
-- 
2.51.2