lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Daniel Flanagan 2023-11-17 05:33:04 -06:00
commit dab54a00bd
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/nixos/common.nix
View file

@ -63,6 +63,7 @@
sops sops
smartmontools smartmontools
sqlite sqlite
skim
sysstat sysstat
unzip unzip
usbutils usbutils

7
nixos/foxtrot/default.nix
View file

@ -35,7 +35,12 @@
}; };
kernelPackages = pkgs.linuxPackages_6_5; kernelPackages = pkgs.linuxPackages_6_5;
# many of these come from https://wiki.archlinux.org/title/Framework_Laptop_13#Suspend # many of these come from https://wiki.archlinux.org/title/Framework_Laptop_13#Suspend
kernelParams = ["amdgpu.sg_display=0" "acpi_osi=\"!Windows 2020\"" "nvme.noacpi=1" "rtc_cmos.use_acpi_alarm=1"]; kernelParams = [
"amdgpu.sg_display=0"
"acpi_osi=\"!Windows 2020\""
# "nvme.noacpi=1" # maybe causing crashes?
"rtc_cmos.use_acpi_alarm=1"
];
initrd.availableKernelModules = ["xhci_pci" "nvme" "thunderbolt"]; initrd.availableKernelModules = ["xhci_pci" "nvme" "thunderbolt"];
kernelModules = ["kvm-amd"]; kernelModules = ["kvm-amd"];
extraModprobeConfig = '' extraModprobeConfig = ''