From e408b3cf609b986d398fe7b10530e1d3f8c96d05 Mon Sep 17 00:00:00 2001
From: mtgmonkey <mtgmonkey@nixos>
Date: Thu, 3 Jul 2025 08:35:24 -0400
Subject: [PATCH] new hardware

---
 configuration.nix          |  9 ------
 hardware-configuration.nix | 63 ++++++++++++++++++++------------------
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index cf22a2c..59fa1d9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,15 +9,6 @@
   ];
 
   boot.kernelPackages = pkgs.linuxKernel.packages.linux_hardened;
-  boot.kernelParams = ["resume_offset=1560576"];
-  boot.resumeDevice = "/dev/disk/by-uuid/3b4660ec-45c5-47ca-9418-1667c373d4b2";
-  powerManagement.enable = true;
-  swapDevices = [
-    {
-      device = "/var/lib/swapfile";
-      size = 4 * 1024;
-    }
-  ];
 
   boot.loader = {
     limine = {
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index ca25e21..59b978d 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -1,48 +1,53 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/3b4660ec-45c5-47ca-9418-1667c373d4b2";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/6546ea32-a94f-4d2d-8949-fe5f7009bd22";
+    fsType = "ext4";
+  };
 
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/46528a73-fb81-447d-bb01-a16796fe3f65";
-      fsType = "ext4";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/5AEC-83B7";
+    fsType = "vfat";
+    options = ["fmask=0077" "dmask=0077"];
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C878-D629";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/bc77f555-144f-4c8c-86cb-e2785783c49a";
+    fsType = "ext4";
+  };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/f7ebe753-19cc-4226-9500-48fa1d4d8178";
-      fsType = "ext4";
-    };
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/038cd71d-c0c6-4e3b-950c-2b239d67670b";
+    fsType = "ext4";
+  };
 
-  swapDevices = [ ];
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/394f46fe-65c3-4e35-acf8-44d81ed5a674";}
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;