jsutter/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify framework.nix in hopes it fixes broken suspend

Browse source
This commit is contained in:
Julian Sutter 2025-11-22 20:13:49 -08:00
parent 498b2dcce1
commit 88c207341f
1 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

96
systems/framework.nix
View file

@ -29,22 +29,22 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
# Modified TLP for power management with less aggressive settings
services.tlp = {
enable = true;
settings = {
CPU_BOOST_ON_BAT = 0;
CPU_SCALING_GOVERNOR_ON_BATTERY = "powersave";
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance";
START_CHARGE_THRESH_BAT0 = 90;
STOP_CHARGE_THRESH_BAT0 = 97;
RUNTIME_PM_ON_BAT = "on"; # Less aggressive power management
HANDLE_LID_SWITCH = 1; # Suspend on lid close
HANDLE_LID_SWITCH_DOCKED = 0; # Do nothing when docked
# services.tlp = {
# enable = true;
# settings = {
# CPU_BOOST_ON_BAT = 0;
# CPU_SCALING_GOVERNOR_ON_BATTERY = "powersave";
# CPU_SCALING_GOVERNOR_ON_AC = "performance";
# CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance";
# START_CHARGE_THRESH_BAT0 = 90;
# STOP_CHARGE_THRESH_BAT0 = 97;
# RUNTIME_PM_ON_BAT = "on"; # Less aggressive power management
# HANDLE_LID_SWITCH = 1; # Suspend on lid close
# HANDLE_LID_SWITCH_DOCKED = 0; # Do nothing when docked
# Disable USB autosuspend
USB_AUTOSUSPEND = 0;
};
};
# USB_AUTOSUSPEND = 0;
# };
# };
# Powersac
@ -65,13 +65,13 @@
# Disable power-profiles-daemon to resolve conflict
services.power-profiles-daemon.enable = false;
# services.power-profiles-daemon.enable = false;
# GPU settings
services.xserver.videoDrivers = [ "amdgpu" ];
environment.variables = {
DRI_PRIME = "1"; # Ensure iGPU is default
};
# services.xserver.videoDrivers = [ "amdgpu" ];
# environment.variables = {
# DRI_PRIME = "1"; # Ensure iGPU is default
# };
# Brightness control
hardware.acpilight.enable = lib.mkDefault true;
@ -80,40 +80,40 @@
services.fstrim.enable = lib.mkDefault true;
# Logind lid-switch configuration
services.logind = {
lidSwitch = "suspend";
lidSwitchDocked = "ignore"; # Prevent suspend when connected to a dock
lidSwitchExternalPower = "ignore";
powerKey = "poweroff"; # Optional: configure behavior for the power key
suspendKey = "suspend"; # Optional: configure behavior for the suspend key
};
# services.logind = {
# lidSwitch = "suspend";
# lidSwitchDocked = "ignore"; # Prevent suspend when connected to a dock
# lidSwitchExternalPower = "ignore";
# powerKey = "poweroff"; # Optional: configure behavior for the power key
# suspendKey = "suspend"; # Optional: configure behavior for the suspend key
# };
# Suspend-then-hibernate configuration
systemd.services.suspendThenHibernate = {
description = "Suspend and then hibernate";
after = [ "suspend.target" ];
serviceConfig = {
ExecStart = "/bin/sh -c 'sleep 3600 && systemctl hibernate'"; # Hibernate after 60 minutes
Type = "oneshot";
};
wantedBy = [ "suspend.target" ];
};
# systemd.services.suspendThenHibernate = {
# description = "Suspend and then hibernate";
# after = [ "suspend.target" ];
# serviceConfig = {
# ExecStart = "/bin/sh -c 'sleep 3600 && systemctl hibernate'"; # Hibernate after 60 minutes
# Type = "oneshot";
# };
# wantedBy = [ "suspend.target" ];
# };
# Modified udev rules for runtime PM - disable problematic USB autosuspend
services.udev.extraRules = ''
ACTION=="add", SUBSYSTEM=="pci", ATTR{power/control}="auto"
# ACTION=="add", SUBSYSTEM=="usb", ATTR{power/autosuspend}="10"
'';
# services.udev.extraRules = ''
# ACTION=="add", SUBSYSTEM=="pci", ATTR{power/control}="auto"
# # ACTION=="add", SUBSYSTEM=="usb", ATTR{power/autosuspend}="10"
# '';
# ACPI lid event handler
environment.etc."acpi/events/lid".source = pkgs.writeText "lid-event-handler" ''
event=button/lid.*
action=/etc/acpi/actions/lid.sh
'';
environment.etc."acpi/actions/lid.sh".source = pkgs.writeText "lid-sh-handler" ''
#!/bin/bash
systemctl suspend
'';
# environment.etc."acpi/events/lid".source = pkgs.writeText "lid-event-handler" ''
# event=button/lid.*
# action=/etc/acpi/actions/lid.sh
# '';
# environment.etc."acpi/actions/lid.sh".source = pkgs.writeText "lid-sh-handler" ''
# #!/bin/bash
# systemctl suspend
# '';
environment.systemPackages = with pkgs; [
via