From 40111ae59211a8cf504ee62f16a9db4ca8e5ef46 Mon Sep 17 00:00:00 2001 From: AngeD Date: Wed, 12 Apr 2023 10:09:06 +0200 Subject: [PATCH 1/2] fix: xss-lock blocking xset commands --- .config/nvim/pack/plugins/opt/lspconfig | 2 +- .config/nvim/pack/plugins/opt/treesitter | 2 +- .config/zsh/ohmyzsh | 2 +- .xinitrc | 8 +++----- bin/crypto | Bin 18280 -> 18280 bytes bin/sbar | 1 - 6 files changed, 6 insertions(+), 9 deletions(-) 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 2053419..75c01e1 100644 --- a/.xinitrc +++ b/.xinitrc @@ -5,11 +5,10 @@ numlockx & # display xrandr \ - --output eDP-1 --auto --primary & + --output eDP --auto --primary & feh --bg-fill "$XDG_CONFIG_HOME/wallpapers/monerochan.png" --no-fehbg & +xss-lock -n "feh --fullscreen $XDG_CONFIG_HOME/wallpapers/lock.png" -- lock & ( - lockimg="$XDG_CONFIG_HOME/wallpapers/lock.png" - # desktop stimeout=1800 # laptop @@ -18,7 +17,6 @@ feh --bg-fill "$XDG_CONFIG_HOME/wallpapers/monerochan.png" --no-fehbg & 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" ) & @@ -28,7 +26,7 @@ feh --bg-fill "$XDG_CONFIG_HOME/wallpapers/monerochan.png" --no-fehbg & #/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 & # debian #/usr/libexec/polkit-gnome-authentication-agent-1 & # fedora picom & -gammastep & +gammastep 2> /dev/null & dunst & sbar & diff --git a/bin/crypto b/bin/crypto index dd6c84a0b529e8fb4d685699199518722c4f14d1..c72c585451bbb890e893c7b9dba0ea23fd352431 100755 GIT binary patch delta 197 zcmaFS$M~X;aRUbUf7$|NQWGrVAS+w<5?0d&6Nq$n9|J`RNS#j-+F4;VXd6@un zX>rPCSCLiB9Q(O|8eXvfocvZ?oUQK1|NkcsZ|0GB!#+vDR!K!w&mawAAdFN})rwBk zt%_B$s#XG-5wGx+Rk(=}DDB86(8lD<%f?*G$ivRDSy950eewj|3PzF5oO=1}j7^g( eP1S*%g{I4S8Lv$Cbk^q-k${*gvboXuIWquyq&NNm delta 211 zcmaFS$M~X;aRUb8K+3%a@FfS8e zPAx6k>?*Q~S#}3Vy+?QGj}#AW5mgN!r-b!I$B+O2PabAq*eoLPhJEq@CXPu8wo0mc zMrn_l)_~225=yFC(TTcMu}W6eN+1*C6`ryRS1n4Edpn2Q;C*f};UN?5W_ to}gR7$g`PKFQ1*UVsfRaI*_x_bU82MsmY$s`kXux5JP!3H#$FO1^~46KHvZV diff --git a/bin/sbar b/bin/sbar index c168094..d99cd0b 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"; } || From 330c74104f92a37efd4ed541efd4daf4242592e6 Mon Sep 17 00:00:00 2001 From: AngeD Date: Wed, 12 Apr 2023 10:14:43 +0200 Subject: [PATCH 2/2] feat: distro independent .xinitrc --- .xinitrc | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/.xinitrc b/.xinitrc index 75c01e1..8a4ac1f 100644 --- a/.xinitrc +++ b/.xinitrc @@ -4,15 +4,17 @@ numlockx & # display -xrandr \ - --output eDP --auto --primary & -feh --bg-fill "$XDG_CONFIG_HOME/wallpapers/monerochan.png" --no-fehbg & -xss-lock -n "feh --fullscreen $XDG_CONFIG_HOME/wallpapers/lock.png" -- lock & ( - # 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 @@ -20,14 +22,16 @@ xss-lock -n "feh --fullscreen $XDG_CONFIG_HOME/wallpapers/lock.png" -- 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 2> /dev/null & -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