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

Foxtrot fixes?

Browse source
This commit is contained in:
Daniel Flanagan 2023-11-13 09:10:04 -06:00
parent 638c9c66dc
commit 63eb8f543a
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -145,11 +145,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1696161939, "lastModified": 1699701045,
"narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=", "narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532", "rev": "b689465d0c5d88e158e7d76094fca08cc0223aad",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
nixos/foxtrot/default.nix
View file

@ -21,9 +21,7 @@
wifi wifi
]) ])
++ [ ++ [
inputs.hardware.nixosModules.common-cpu-amd inputs.hardware.nixosModules.framework-13-7040-amd
# inputs.hardware.nixosModules.common-cpu-amd-pstate
inputs.hardware.nixosModules.common-pc-laptop-ssd
]; ];
# TODO: hibernation? does sleep suffice? # TODO: hibernation? does sleep suffice?
@ -34,7 +32,8 @@
systemd-boot.enable = true; systemd-boot.enable = true;
}; };
kernelPackages = pkgs.linuxPackages_6_5; kernelPackages = pkgs.linuxPackages_6_5;
kernelParams = ["amdgpu.sg_display=0"]; # 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"];
initrd.availableKernelModules = ["xhci_pci" "nvme" "thunderbolt"]; initrd.availableKernelModules = ["xhci_pci" "nvme" "thunderbolt"];
kernelModules = ["kvm-amd"]; kernelModules = ["kvm-amd"];
}; };
@ -42,13 +41,12 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
services.printing.enable = true; services.printing.enable = true;
services.fprintd = { services.fprintd = {
enable = true; enable = false;
# tod.enable = true; # tod.enable = true;
# tod.driver = pkgs.libfprint-2-tod1-goodix; # tod.driver = pkgs.libfprint-2-tod1-goodix;
}; };
services.power-profiles-daemon.enable = false;
services.tlp = { services.tlp = {
enable = true; enable = false;
settings = { settings = {
CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave";