Compare commits

...

5 commits

4 changed files with 36 additions and 20 deletions

View file

@ -188,15 +188,19 @@ in {
}; };
"custom/taghw1" = { "custom/taghw1" = {
exec = "echo "; exec = "echo ";
tooltip = false;
}; };
"custom/taghw2" = { "custom/taghw2" = {
exec = "echo "; exec = "echo ";
tooltip = false;
}; };
"custom/tagbt1" = { "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" = { "custom/tagbt2" = {
exec = "test -e /sys/class/power_supply/BAT*/capacity && echo "; exec = "test -e /sys/class/power_supply/BAT*/capacity && echo ";
tooltip = false;
}; };
}; };
} }

View file

@ -3,7 +3,6 @@
pkgs, pkgs,
... ...
}: let }: let
tbase = 45;
wm2fc = pkgs.callPackage <package/wm2fc> {}; wm2fc = pkgs.callPackage <package/wm2fc> {};
in { in {
# hardware.cpu.amd.ryzen-smu.enable = true; # hardware.cpu.amd.ryzen-smu.enable = true;
@ -31,9 +30,10 @@ in {
ryzenadj ryzenadj
]; ];
script = '' script = ''
ryzenadj --tctl-temp=55
while true; do while true; do
ryzenadj --tctl-temp=${toString tbase}
sleep 60 sleep 60
ryzenadj --tctl-temp=55 &> /dev/null
done done
''; '';
}; };
@ -51,29 +51,40 @@ in {
wm2fc wm2fc
]; ];
script = '' script = ''
old=0
smooth=0
while true; do while true; do
temp=$(cat /sys/devices/pci0000\:00/0000\:00\:18.3/hwmon/*/temp1_input) temp=$(cat /sys/devices/pci0000\:00/0000\:00\:18.3/hwmon/*/temp1_input)
value=0 value=0
if [ $temp -gt ${toString (tbase+35)}000 ] if [ $temp -gt 80000 ]
then value=184 then value=184
elif [ $temp -gt ${toString (tbase+30)}000 ] elif [ $temp -gt 70000 ]
then value=161 then value=128
elif [ $temp -gt ${toString (tbase+25)}000 ] elif [ $temp -gt 60000 ]
then value=138
elif [ $temp -gt ${toString (tbase+20)}000 ]
then value=115
elif [ $temp -gt ${toString (tbase+15)}000 ]
then value=92 then value=92
elif [ $temp -gt ${toString (tbase+10)}000 ] # elif [ $temp -gt 50000 ]
then value=69 # then value=69
elif [ $temp -gt ${toString (tbase+5)}000 ] elif [ $temp -gt 45000 ]
then value=46 then value=46
elif [ $temp -gt ${toString tbase}000 ] elif [ $temp -gt 40000 ]
then value=23 then value=23
else value=0
fi fi
if [[ $old != $value ]]; then
# 30 = 60s smooth.
if [[ $value -lt $old ]] && [[ $smooth -lt 30 ]]; then
smooth=$((smooth+1))
else
old=$value
smooth=0
wm2fc $value wm2fc $value
fi
else
smooth=0
fi
sleep 2 sleep 2
done done
''; '';

View file

@ -30,7 +30,7 @@
if [[ "''${_bts}" != "" ]]; then if [[ "''${_bts}" != "" ]]; then
icon="󱛃" icon="󱛃"
if [[ "''${_bt_lowest}" != "" ]] && [[ ''${_bt_lowest} -lt 20 ]]; then if [[ "''${_bt_lowest}" != "" ]] && [[ ''${_bt_lowest} -lt 21 ]]; then
class="btlow" class="btlow"
fi fi
fi fi

View file

@ -1,4 +1,5 @@
# SRC: https://github.com/matega/win-max-2-fan-control # SRC: https://github.com/matega/win-max-2-fan-control
# NOTE: Speeds are from 0 to 184 (23 int). "a" for auto (disable).
{ {
autoPatchelfHook, autoPatchelfHook,
fetchFromGitHub, fetchFromGitHub,