From 8ff0f91bf7c9fbbb18f50f0a3d29ea5b2fcacb16 Mon Sep 17 00:00:00 2001 From: Lander Van den Bulcke Date: Wed, 25 Dec 2024 15:12:05 +0100 Subject: [PATCH] feat: update hardware config for widar Signed-off-by: Lander Van den Bulcke --- hosts/widar/default.nix | 6 ++---- hosts/widar/hardware-configuration.nix | 14 ++++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/hosts/widar/default.nix b/hosts/widar/default.nix index 6432c32..be2cf7b 100644 --- a/hosts/widar/default.nix +++ b/hosts/widar/default.nix @@ -12,7 +12,7 @@ ]; networking = { - hostName = "widar1"; + hostName = "widar"; networkmanager.enable = true; }; @@ -21,8 +21,6 @@ systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; - - initrd.luks.devices."luks-ed2282ac-fd73-4d82-9224-b7596b5b7cac".device = "/dev/disk/by-uuid/ed2282ac-fd73-4d82-9224-b7596b5b7cac"; }; services.xserver.enable = true; @@ -65,5 +63,5 @@ services.printing.enable = true; services.printing.drivers = [pkgs.brlaser]; - system.stateVersion = "24.10"; + system.stateVersion = "24.11"; } diff --git a/hosts/widar/hardware-configuration.nix b/hosts/widar/hardware-configuration.nix index 9861136..01b218f 100644 --- a/hosts/widar/hardware-configuration.nix +++ b/hosts/widar/hardware-configuration.nix @@ -12,26 +12,24 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; + boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = []; fileSystems."/" = { - device = "/dev/disk/by-uuid/1f43e0d1-65c6-4954-a943-968152e40a5e"; + device = "/dev/disk/by-uuid/64ab10a4-408a-4be5-bb83-0dfee17765dc"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-a9fe90af-2f6b-41ad-a086-d1b9df2db5d2".device = "/dev/disk/by-uuid/a9fe90af-2f6b-41ad-a086-d1b9df2db5d2"; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/0EB6-0E42"; + device = "/dev/disk/by-uuid/9A74-A670"; fsType = "vfat"; options = ["fmask=0077" "dmask=0077"]; }; swapDevices = [ - {device = "/dev/disk/by-uuid/d7432008-bd3e-4bd5-b6d7-0fcd7df00c54";} + {device = "/dev/disk/by-uuid/c6012928-063f-4a63-ae99-2d4f942bcd56";} ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -43,5 +41,5 @@ # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }