chase/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring, added amdgpu to initrd modules

Browse Source
This commit is contained in:
chase
2025-06-24 12:48:07 -04:00
parent f4dd67085e
commit 1969fd1e14
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,2 +1 @@
smb-secrets
nixos-switch.log nixos-switch.log

5
hosts/anzu/configuration.nix
View File

@@ -7,6 +7,7 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../nixos/desktop.nix ../../nixos/desktop.nix
../../nixos/plasma.nix
../../nixos/hypr.nix ../../nixos/hypr.nix
]; ];
@@ -19,6 +20,8 @@
]; ];
}; };
services.xserver.videoDrivers = [ "amdgpu" ];
# Mount SMB share # Mount SMB share
fileSystems."/mnt/share" = { fileSystems."/mnt/share" = {
device = "//haruko/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"; 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}"; credentials = "${config.sops.templates."smb-credentials".path}";
in ["${automount_opts},credentials=${credentials},uid=1000,gid=100"]; 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; boot.loader.systemd-boot.enable = lib.mkForce false;
@@ -36,5 +38,6 @@
enable = true; enable = true;
pkiBundle = "/var/lib/sbctl"; pkiBundle = "/var/lib/sbctl";
}; };
system.stateVersion = "24.11"; system.stateVersion = "24.11";
} }

2
hosts/anzu/hardware-configuration.nix
View File

@@ -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.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.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = ["amdgpu"];
boot.kernelModules = ["kvm-amd"]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = []; boot.extraModulePackages = [];

2
hosts/ichigo/configuration.nix
View File

@@ -19,6 +19,8 @@
]; ];
}; };
services.xserver.videoDrivers = [ "amdgpu" ];
# Mount SMB share # Mount SMB share
fileSystems."/mnt/share" = { fileSystems."/mnt/share" = {
device = "//haruko/share"; device = "//haruko/share";

2
hosts/ichigo/hardware-configuration.nix
View File

@@ -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.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.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = ["amdgpu"];
boot.kernelModules = ["kvm-amd"]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = []; boot.extraModulePackages = [];