merge: main

This commit is contained in:
AngeD 2023-04-12 10:57:13 +02:00
commit 9d60cdd4a5

View File

@ -4,31 +4,29 @@
numlockx & numlockx &
# display # display
( ## laptop
# laptop if ls -d /sys/class/power_supply/BAT*/ > /dev/null 2>&1; then
if ls -d /sys/class/power_supply/BAT*/ > /dev/null 2>&1; then stimeout=300
stimeout=300 xrandr \
xrandr \ --output eDP --auto --primary
--output eDP --auto --primary else # desktop
else # desktop stimeout=1800
stimeout=1800 xrandr \
xrandr \ --output HDMI1 --auto --primary
--output HDMI1 --auto --primary fi
fi
cycle=15 # lock 15 sec after stimeout cycle=15 # lock 15 sec after stimeout
dpms="$((stimeout + cycle + 1))" # turn off screen 1 sec after lock dpms="$((stimeout + cycle + 1))" # turn off screen 1 sec after lock
xset s "$stimeout" "$cycle" xset s "$stimeout" "$cycle" &
xset dpms "$dpms" "$dpms" "$dpms" xset dpms "$dpms" "$dpms" "$dpms" &
) &
feh --bg-fill "$XDG_CONFIG_HOME/wallpapers/monerochan.png" --no-fehbg & feh --bg-fill "$XDG_CONFIG_HOME/wallpapers/monerochan.png" --no-fehbg &
xss-lock -n "feh --fullscreen $XDG_CONFIG_HOME/wallpapers/lock.png" -- lock & xss-lock -n "feh --fullscreen $XDG_CONFIG_HOME/wallpapers/lock.png" -- lock &
# startup # startup
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 # arch /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 || # arch
|| /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 # debian /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 || # debian
|| /usr/libexec/polkit-gnome-authentication-agent-1 & # fedora /usr/libexec/polkit-gnome-authentication-agent-1 & # fedora
picom & picom &
gammastep 2> /dev/null & gammastep 2> /dev/null &
dunst & dunst &