diff --git a/home/file/waybar/config/default.nix b/home/file/waybar/config/default.nix index 7a6f4c2e..f56d11f4 100644 --- a/home/file/waybar/config/default.nix +++ b/home/file/waybar/config/default.nix @@ -187,16 +187,20 @@ in { signal = 7; }; "custom/taghw1" = { - exec = "echo ​"; + exec = "echo ​"; + tooltip = false; }; "custom/taghw2" = { - exec = "echo ​"; + exec = "echo ​"; + tooltip = false; }; "custom/tagbt1" = { - exec = "test -e /sys/class/power_supply/BAT*/capacity && echo ​"; + exec = "test -e /sys/class/power_supply/BAT*/capacity && echo ​"; + tooltip = false; }; "custom/tagbt2" = { - exec = "test -e /sys/class/power_supply/BAT*/capacity && echo ​"; + exec = "test -e /sys/class/power_supply/BAT*/capacity && echo ​"; + tooltip = false; }; }; } diff --git a/host/x86_64-linux/max/Power.nix b/host/x86_64-linux/max/Power.nix index bfcf2b7b..d10de60f 100644 --- a/host/x86_64-linux/max/Power.nix +++ b/host/x86_64-linux/max/Power.nix @@ -30,10 +30,10 @@ in { ryzenadj ]; script = '' - ryzenadj --tctl-temp=50 + ryzenadj --tctl-temp=55 while true; do sleep 60 - ryzenadj --tctl-temp=50 &> /dev/null + ryzenadj --tctl-temp=55 &> /dev/null done ''; }; @@ -52,6 +52,7 @@ in { ]; script = '' old=0 + smooth=0 while true; do temp=$(cat /sys/devices/pci0000\:00/0000\:00\:18.3/hwmon/*/temp1_input) value=0 @@ -62,18 +63,28 @@ in { then value=128 elif [ $temp -gt 60000 ] then value=92 - elif [ $temp -gt 50000 ] - then value=46 + # elif [ $temp -gt 50000 ] + # then value=69 elif [ $temp -gt 45000 ] + then value=46 + elif [ $temp -gt 40000 ] then value=23 + else value=0 fi if [[ $old != $value ]]; then - old=$value - printf "%s: %d\n" "New fan speed" $value + # 30 = 60s smooth. + if [[ $value -lt $old ]] && [[ $smooth -lt 30 ]]; then + smooth=$((smooth+1)) + else + old=$value + smooth=0 + wm2fc $value + fi + else + smooth=0 fi - wm2fc $value &> /dev/null sleep 2 done ''; diff --git a/package/wm2fc/default.nix b/package/wm2fc/default.nix index c55a13a4..d4d85386 100644 --- a/package/wm2fc/default.nix +++ b/package/wm2fc/default.nix @@ -1,4 +1,5 @@ # SRC: https://github.com/matega/win-max-2-fan-control +# NOTE: Speeds are from 0 to 184 (23 int). "a" for auto (disable). { autoPatchelfHook, fetchFromGitHub,