From e661c7df71a3d37714288253b2ecdbc86bdf7372 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 13 Nov 2023 17:24:52 -0600 Subject: [PATCH] Foxtrot suspend --- modules/nixos/common.nix | 1 + nixos/foxtrot/default.nix | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index 88bed33..25d8205 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -63,6 +63,7 @@ sops smartmontools sqlite + skim sysstat unzip usbutils diff --git a/nixos/foxtrot/default.nix b/nixos/foxtrot/default.nix index e625a04..6fd4fb7 100644 --- a/nixos/foxtrot/default.nix +++ b/nixos/foxtrot/default.nix @@ -33,7 +33,12 @@ }; kernelPackages = pkgs.linuxPackages_6_5; # 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"]; kernelModules = ["kvm-amd"]; };