diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index 67be290..be67274 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -20,6 +20,8 @@ "rtc_cmos.use_acpi_alarm=1" "acpi.prefer_microsoft_dsm_guid=1" "amd_pstate=active" + # Disable the old and new display power-saving features (PSR and Panel Replay). + "amdgpu.dcdebugmask=0x410" ]; boot.extraModulePackages = [ ]; boot.plymouth = { diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index 2721546..ad2bfae 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -122,7 +122,6 @@ in "wheel" "tty" "dialout" - "plugdev" "uucp" "render" "video" diff --git a/modules/nixos/common/hardware/laptop-power.nix b/modules/nixos/common/hardware/laptop-power.nix index 0d40cb1..e321ad4 100644 --- a/modules/nixos/common/hardware/laptop-power.nix +++ b/modules/nixos/common/hardware/laptop-power.nix @@ -188,10 +188,13 @@ in # forever and cause constant overheating. Reset to "balanced" at boot # and also set a conservative CPU energy policy (balance_power) so the # chassis stays cooler when idle. + # Wanted by graphical.target, not multi-user.target: the daemon is + # After=multi-user.target upstream, so ordering this unit before + # multi-user.target forms a cycle and systemd drops the job. systemd.services.reset-power-profile = { description = "Reset power profile to balanced + conservative EPP at boot"; - wantedBy = [ "multi-user.target" ]; - after = [ "power-profiles-daemon.service" ]; + wantedBy = [ "graphical.target" ]; + after = [ "power-profiles-daemon.service" "multi-user.target" ]; wants = [ "power-profiles-daemon.service" ]; serviceConfig = { Type = "oneshot"; diff --git a/modules/nixos/desktop/crypto.nix b/modules/nixos/desktop/crypto.nix index b10e57f..dcf732a 100644 --- a/modules/nixos/desktop/crypto.nix +++ b/modules/nixos/desktop/crypto.nix @@ -24,15 +24,15 @@ in trezor-udev-rules ]; services.udev.extraRules = '' - ATTRS{idProduct}=="55d4", ATTRS{idVendor}=="1a86", SUBSYSTEM=="usb", TEST=="power/control", ATTR{power/control}="on", GROUP="plugdev", MODE="0660" + ATTRS{idProduct}=="55d4", ATTRS{idVendor}=="1a86", SUBSYSTEM=="usb", TEST=="power/control", ATTR{power/control}="on" + KERNEL=="ttyACM*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="55d4", MODE="0660", GROUP="dialout", SYMLINK+="jade%n" ''; # trezor groups users.groups.trezord = { }; users.groups.trezord.members = [ config.skyg.user.name ]; - # Ensure user is in dialout, plugdev, uucp groups for serial access + # Ensure user is in dialout, uucp groups for serial access users.users.${config.skyg.user.name}.extraGroups = [ "dialout" - "plugdev" "uucp" "trezord" ]; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 7d75144..f15e2ef 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -13,7 +13,6 @@ let "wheel" "tty" "dialout" - "plugdev" "uucp" ]; services.dbus.enable = true;