diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig index 10fa01d..6fe6902 160000 --- a/.config/nvim/pack/plugins/opt/lspconfig +++ b/.config/nvim/pack/plugins/opt/lspconfig @@ -1 +1 @@ -Subproject commit 10fa01d553ce10646350461ac5ddc71f189e9d1a +Subproject commit 6fe69025b8825029ea9bf291ab3b1750f9bcb39e diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index a825012..ac4020c 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit a82501244a75b3d59cdc42496e5ad841f31e4d6d +Subproject commit ac4020c70722337c326bf65b645b162ee6e1796b diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh index 4586808..b4f9698 160000 --- a/.config/zsh/ohmyzsh +++ b/.config/zsh/ohmyzsh @@ -1 +1 @@ -Subproject commit 4586808f86bf3bfdf97685380472b63597ce43c0 +Subproject commit b4f9698733d7b29cc495e649e26fd6c3a5dcfcae diff --git a/.xinitrc b/.xinitrc index dc71a13..8a4ac1f 100644 --- a/.xinitrc +++ b/.xinitrc @@ -4,33 +4,34 @@ numlockx & # display -xrandr \ - --output HDMI1 --auto --primary & -feh --bg-fill "$XDG_CONFIG_HOME/wallpapers/monerochan.png" --no-fehbg & ( - lockimg="$XDG_CONFIG_HOME/wallpapers/lock.png" - - # desktop - stimeout=1800 # laptop - ls -d /sys/class/power_supply/BAT*/ > /dev/null 2>&1 && stimeout=300 + if ls -d /sys/class/power_supply/BAT*/ > /dev/null 2>&1; then + stimeout=300 + xrandr \ + --output eDP --auto --primary + else # desktop + stimeout=1800 + xrandr \ + --output HDMI1 --auto --primary + fi cycle=15 # lock 15 sec after stimeout dpms="$((stimeout + cycle + 1))" # turn off screen 1 sec after lock - xss-lock -n "feh --fullscreen $lockimg" -- lock xset s "$stimeout" "$cycle" xset dpms "$dpms" "$dpms" "$dpms" ) & - +feh --bg-fill "$XDG_CONFIG_HOME/wallpapers/monerochan.png" --no-fehbg & +xss-lock -n "feh --fullscreen $XDG_CONFIG_HOME/wallpapers/lock.png" -- lock & # startup -/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & # arch -#/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 & # debian -#/usr/libexec/polkit-gnome-authentication-agent-1 & # fedora -picom & -gammastep & -dunst & -sbar & +/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 # arch + || /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 # debian + || /usr/libexec/polkit-gnome-authentication-agent-1 & # fedora +picom & +gammastep 2> /dev/null & +dunst & +sbar & exec dbus-launch dwm diff --git a/bin/crypto b/bin/crypto index dd6c84a..c72c585 100755 Binary files a/bin/crypto and b/bin/crypto differ diff --git a/bin/sbar b/bin/sbar index 72b61b3..22f298b 100755 --- a/bin/sbar +++ b/bin/sbar @@ -48,7 +48,6 @@ update_wlp() { [ -z "$ssid" ] && wlp='⚠' && return - echo "$sig" # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/libnmc-base/nm-client-utils.c#L628 { [ "$sig" -gt 5600 ] && wlp="▂▄▆█ $ssid"; } || { [ "$sig" -gt 3850 ] && wlp="▂▄▆_ $ssid"; } || @@ -73,7 +72,6 @@ while [ -z "$(wpctl get-volume '@DEFAULT_AUDIO_SINK@')" ]; do sleep 1 done update_vol -update_backlight reload_bar() { sec=0 @@ -100,7 +98,6 @@ while true; do update_time update_cpu update_memory - update_bat display }