From c0c6c8db96b99a7b2e6a0b832722c64afb6577eb Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Mon, 7 Mar 2022 15:31:19 +0100
Subject: [PATCH] Update kharbranth for new device

---
 machines/kharbranth/default.nix  | 6 ++----
 machines/kharbranth/hardware.nix | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/machines/kharbranth/default.nix b/machines/kharbranth/default.nix
index 5f12f358..9f41afa7 100644
--- a/machines/kharbranth/default.nix
+++ b/machines/kharbranth/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [ ./hardware.nix ];
 
-  networking.hostId = "e718389d";
+  networking.hostId = "7a62a099";
 
   time.timeZone = "Europe/Brussels";
 
@@ -14,10 +14,8 @@
       bluetooth.enable = true;
       network.mobile = {
         enable = true;
-        wireless-interface = "wlp2s0";
+        wireless-interface = "wlp0s20f3";
         wired-interfaces = {
-          "enp0s20f0u1u2" = { macAddress = "10:65:30:df:80:f5"; };
-          "enp0s31f6" = { macAddress = "10:65:30:df:80:f5"; };
         };
       };
       zfs = {
diff --git a/machines/kharbranth/hardware.nix b/machines/kharbranth/hardware.nix
index 91d1a691..3cbabd33 100644
--- a/machines/kharbranth/hardware.nix
+++ b/machines/kharbranth/hardware.nix
@@ -9,7 +9,7 @@
       efi.canTouchEfiVariables = true;
     };
     initrd = {
-      availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+      availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
       kernelModules = [ "i915" ];
     };
     kernelModules = [ "kvm-intel" ];
@@ -50,12 +50,12 @@
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/A5BA-352A";
+    device = "/dev/disk/by-uuid/CFDD-B4A6";
     fsType = "vfat";
   };
 
   swapDevices = [
-    { device = "/dev/disk/by-uuid/1de27da4-5e97-4104-ab2b-18ab14a2b90b"; }
+    { device = "/dev/disk/by-label/swap"; }
   ];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";