From 256ba6d03cca6d48b7904f41229b45f3a9318da0 Mon Sep 17 00:00:00 2001
From: John Locke <john@freelock.com>
Date: Fri, 22 Mar 2024 11:18:50 -0700
Subject: [PATCH] Config updates for katmai

---
 hosts/desktop/katmai/configuration.nix          |  8 ++++++--
 hosts/desktop/katmai/hardware-configuration.nix | 15 +++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/hosts/desktop/katmai/configuration.nix b/hosts/desktop/katmai/configuration.nix
index 439e969..fe3e8cd 100644
--- a/hosts/desktop/katmai/configuration.nix
+++ b/hosts/desktop/katmai/configuration.nix
@@ -13,9 +13,13 @@
       ../../../users/owners.nix
     ];
 
+  # Bootloader.
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sdb";
+  boot.loader.grub.useOSProber = true;
+
   networking.hostName = "katmai"; # Define your hostname.
-  networking.wireless.enable = false;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
 
   # This value determines the NixOS release from which the default
diff --git a/hosts/desktop/katmai/hardware-configuration.nix b/hosts/desktop/katmai/hardware-configuration.nix
index 4a21de4..31af127 100644
--- a/hosts/desktop/katmai/hardware-configuration.nix
+++ b/hosts/desktop/katmai/hardware-configuration.nix
@@ -8,25 +8,20 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/ebd125c4-ab78-4604-a0be-826d0a3d0c03";
+    { device = "/dev/disk/by-uuid/7c747da5-2aed-4bfd-b24a-0ae6f27b7dbd";
       fsType = "btrfs";
       options = [ "subvol=@" ];
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/ED13-F512";
-      fsType = "vfat";
-    };
-
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/f5dd6012-e88b-444d-99f6-4a468493bd13";
-      fsType = "xfs";
+    { device = "/dev/disk/by-uuid/9e71ba51-384d-47f1-a9f1-27adacbb2d9d";
+      fsType = "ext4";
     };
 
   swapDevices = [ ];
@@ -36,7 +31,7 @@
   # 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.enp0s25.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";