From 1969fd1e145bdd4587cf693c213adf6469dab090 Mon Sep 17 00:00:00 2001 From: chase Date: Tue, 24 Jun 2025 12:48:07 -0400 Subject: [PATCH] Refactoring, added amdgpu to initrd modules --- .gitignore | 1 - hosts/anzu/configuration.nix | 5 ++++- hosts/anzu/hardware-configuration.nix | 2 +- hosts/ichigo/configuration.nix | 2 ++ hosts/ichigo/hardware-configuration.nix | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d946c7d..cd3c43b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -smb-secrets nixos-switch.log diff --git a/hosts/anzu/configuration.nix b/hosts/anzu/configuration.nix index b23dd31..7d364fc 100644 --- a/hosts/anzu/configuration.nix +++ b/hosts/anzu/configuration.nix @@ -7,6 +7,7 @@ imports = [ ./hardware-configuration.nix ../../nixos/desktop.nix + ../../nixos/plasma.nix ../../nixos/hypr.nix ]; @@ -19,6 +20,8 @@ ]; }; + services.xserver.videoDrivers = [ "amdgpu" ]; + # Mount SMB share fileSystems."/mnt/share" = { device = "//haruko/share"; @@ -27,7 +30,6 @@ automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,user,users"; credentials = "${config.sops.templates."smb-credentials".path}"; in ["${automount_opts},credentials=${credentials},uid=1000,gid=100"]; - #in ["${automount_opts},credentials=/etc/nixos/smb-secrets,uid=1000,gid=100"]; }; boot.loader.systemd-boot.enable = lib.mkForce false; @@ -36,5 +38,6 @@ enable = true; pkiBundle = "/var/lib/sbctl"; }; + system.stateVersion = "24.11"; } diff --git a/hosts/anzu/hardware-configuration.nix b/hosts/anzu/hardware-configuration.nix index bb63c05..0c3b19c 100644 --- a/hosts/anzu/hardware-configuration.nix +++ b/hosts/anzu/hardware-configuration.nix @@ -20,7 +20,7 @@ boot.initrd.luks.devices."luks-9527937d-2d02-4feb-9a16-c9c417b33d0d".device = "/dev/disk/by-uuid/9527937d-2d02-4feb-9a16-c9c417b33d0d"; boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; + boot.initrd.kernelModules = ["amdgpu"]; boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = []; diff --git a/hosts/ichigo/configuration.nix b/hosts/ichigo/configuration.nix index f4dee03..5058e99 100644 --- a/hosts/ichigo/configuration.nix +++ b/hosts/ichigo/configuration.nix @@ -19,6 +19,8 @@ ]; }; + services.xserver.videoDrivers = [ "amdgpu" ]; + # Mount SMB share fileSystems."/mnt/share" = { device = "//haruko/share"; diff --git a/hosts/ichigo/hardware-configuration.nix b/hosts/ichigo/hardware-configuration.nix index 14bae54..be70662 100644 --- a/hosts/ichigo/hardware-configuration.nix +++ b/hosts/ichigo/hardware-configuration.nix @@ -19,7 +19,7 @@ boot.initrd.luks.devices."luks-877310a4-b495-4060-9ee6-e7a841862f22".device = "/dev/disk/by-uuid/877310a4-b495-4060-9ee6-e7a841862f22"; boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; + boot.initrd.kernelModules = ["amdgpu"]; boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = [];