From a1e7a589d0c07de5f80d1139330686c564978999 Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Thu, 21 Dec 2023 22:27:23 +0100 Subject: [PATCH] Update 2023-12-21 22:27 OpenBSD/amd64-x13 --- .bin/_config | 20 +++++++++++-------- .bin/apps/amused | 18 ++++++++--------- .bin/cbar | Bin 10816 -> 11120 bytes .bin/dexec_browser | 2 +- .bin/dexec_vpn | 6 +++--- .bin/drink | 2 +- .config/herbstluftwm/autostart | 34 ++++++++++++++++++++------------- .config/spectrwm/spectrwm.conf | 2 -- .kshrc | 24 ++++++++++++----------- 9 files changed, 60 insertions(+), 48 deletions(-) diff --git a/.bin/_config b/.bin/_config index 7cd3674..2945b12 100644 --- a/.bin/_config +++ b/.bin/_config @@ -10,8 +10,10 @@ PIMDIR="${HOME}/Documents" # COLORS # -COLOR_NB="#181818" -COLOR_NF="#707070" +#COLOR_NB="#121212" # notion +#COLOR_NF="#707070" # notion +COLOR_NB="#181818" # spectrwm +COLOR_NF="#FF6A00" # spectrwm COLOR_SB="#222222" COLOR_SF="#CCCCCC" @@ -27,7 +29,7 @@ HTERM="st -f spleen:pixelsize=32" # DMENU # -DMENUOPTS="-fn Terminus:pixelsize=20 \ +DMENUOPTS="-fn Terminus:pixelsize=18 \ -nb $COLOR_NB \ -nf $COLOR_NF \ -sf $COLOR_SF \ @@ -59,8 +61,10 @@ needs() { # CONNECT TO GPG-AGENT # -export GPG_TTY=$(tty) -export GPG_AGENT_INFO="$HOME/.gnupg/S.gpg-agent:0:1" -export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -export SSH_AUTH_SOCK_EXTRA=${SSH_AUTH_SOCK%%.ssh}.extra -gpg-connect-agent /bye +eval $(keychain -Q -q --noask --agents ssh,gpg --noask --eval id_rsa) + +# export GPG_TTY=$(tty) +# export GPG_AGENT_INFO="$HOME/.gnupg/S.gpg-agent:0:1" +# export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +# export SSH_AUTH_SOCK_EXTRA=${SSH_AUTH_SOCK%%.ssh}.extra +# gpg-connect-agent /bye diff --git a/.bin/apps/amused b/.bin/apps/amused index 5a28718..00f872b 100755 --- a/.bin/apps/amused +++ b/.bin/apps/amused @@ -21,28 +21,28 @@ amused show | cut -d'/' -f5- SEL="$( showlist | $DMENU_CMD -p Playlist -l 30)" amused_shuffle() {( - $NOTIFY_CMD "shuffle started in background"; + NOTIFY_CMD "shuffle started in background"; amused show | sort -R | amused load; - $NOTIFY_CMD "shuffle finished"; + NOTIFY_CMD "shuffle finished"; )&} amused_sort() {( - $NOTIFY_CMD "sorting started in background" + NOTIFY_CMD "sorting started in background" amused show | sort -u | amused load - $NOTIFY_CMD "sorting finished" + NOTIFY_CMD "sorting finished" )&} amused_load_tank() {( - $NOTIFY_CMD "loading started in background" + NOTIFY_CMD "loading started in background" amused load < /home/sdk/.music.all.txt - $NOTIFY_CMD "loading finished" + NOTIFY_CMD "loading finished" )&} amused_load_local() {( - $NOTIFY_CMD "loading started in background" + NOTIFY_CMD "loading started in background" find ~/MusicSelection -type f | amused load - $NOTIFY_CMD "loading finished" + NOTIFY_CMD "loading finished" )&} amused_cmd() { amused "${@}" - $NOTIFY_CMD "$(amused status | head -1 | cut -d'/' -f5-)" + NOTIFY_CMD "$(amused status | head -1 | cut -d'/' -f5-)" } case "${SEL}" in diff --git a/.bin/cbar b/.bin/cbar index 4897060a7a9086d16be0e739212739fa224617ba..7d96f1f30abb3534e04b13bddacbc654492832bc 100755 GIT binary patch delta 4333 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 Q?vLV{N`!Wtem1k{-^J)FVgLXD diff --git a/.bin/dexec_browser b/.bin/dexec_browser index 4096c6b..81df543 100755 --- a/.bin/dexec_browser +++ b/.bin/dexec_browser @@ -125,7 +125,7 @@ choose_browser() { gemini://*) DEFAULT="Lagrange (default)"; ;; 192.168.*) DEFAULT="Chrome (default)"; ;; *github.com*) DEFAULT="Chrome (default)"; ;; - *amazon.de*) DEFAULT="Vimb (default)"; ;; + *amazon.de*) DEFAULT="Chrome (default)"; ;; *chaos.social*) DEFAULT="Chrome (default)"; ;; *hetzner.cloud*) DEFAULT="Chrome (default)"; ;; *hetzner.de*) DEFAULT="Vimb (default)"; ;; diff --git a/.bin/dexec_vpn b/.bin/dexec_vpn index ae4f5b3..29bf0d1 100755 --- a/.bin/dexec_vpn +++ b/.bin/dexec_vpn @@ -12,7 +12,7 @@ then ACTIVE=$(ifconfig | grep wg-quick | cut -d: -f3 | tr -d " ") if [ ! -z "$ACTIVE" ] then - doas wg-quick down $ACTIVE && $NOTIFY_CMD "VPN: disconnected" + doas wg-quick down $ACTIVE && NOTIFY_CMD "VPN: disconnected" sleep 1 fi exit 0 @@ -27,8 +27,8 @@ doas mv /tmp/vpn.conf /etc/wireguard/vpn.conf ACTIVE=$(ifconfig | grep wg-quick | cut -d: -f3 | tr -d " ") if [ ! -z "$ACTIVE" ] then - doas wg-quick down $ACTIVE && $NOTIFY_CMD "VPN: disconnected" + doas wg-quick down $ACTIVE && NOTIFY_CMD "VPN: disconnected" sleep 1 fi -doas wg-quick up vpn && $NOTIFY_CMD "VPN: $HOST" +doas wg-quick up vpn && NOTIFY_CMD "VPN: $HOST" diff --git a/.bin/drink b/.bin/drink index 15a6962..4bf2982 100755 --- a/.bin/drink +++ b/.bin/drink @@ -3,5 +3,5 @@ . /home/sdk/.bin/_config MSG="Drink some water!" -$NOTIFY_CMD "$MSG" +NOTIFY_CMD "$MSG" diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart index bd05819..13c2708 100755 --- a/.config/herbstluftwm/autostart +++ b/.config/herbstluftwm/autostart @@ -7,6 +7,8 @@ hc() { herbstclient "$@"; } hc emit_hook reload +hc detect_monitors +#hc attr settings.auto_detect_monitors true xsetroot -solid '#000000' @@ -41,6 +43,7 @@ hc keybind $Mod-q close_or_remove hc keybind $Mod-Return spawn sterm hc keybind $Mod-Shift-Return spawn bterm hc keybind $Mod-d spawn dexec +hc keybind $Mod-a spawn dexec_apps hc keybind $Mod-Shift-f spawn dexec_browser hc keybind $Mod-Shift-p spawn dexec_pass hc keybind $Mod-p spawn dexec_pim @@ -55,16 +58,16 @@ hc keybind $Mod-Right focus right # splitting frames # create an empty frame at the specified direction -hc keybind $Mod-Control-Down chain . split bottom 0.5 . focus down -hc keybind $Mod-Control-Right chain . split right 0.5 . focus right -hc keybind $Mod-Control-Left chain . split left 0.5 . focus left -hc keybind $Mod-Control-Up chain . split top 0.5 . focus up +hc keybind $Mod-Shift-Down chain . split bottom 0.5 . focus down +hc keybind $Mod-Shift-Right chain . split right 0.5 . focus right +hc keybind $Mod-Shift-Left chain . split left 0.5 . focus left +hc keybind $Mod-Shift-Up chain . split top 0.5 . focus up # move window between frames -hc keybind $Mod-Shift-Left shift left -hc keybind $Mod-Shift-Right shift right -hc keybind $Mod-Shift-Up shift up -hc keybind $Mod-Shift-Down shift down +hc keybind $Mod-Control-Left shift left +hc keybind $Mod-Control-Right shift right +hc keybind $Mod-Control-Up shift up +hc keybind $Mod-Control-Down shift down # cycle tabs hc keybind $Mod-Prior cycle -1 @@ -81,6 +84,9 @@ hc keybind $Mod-Control-Next chain . move_index +1 . use_index +1 # float hc keybind $Mod-space set_attr clients.focus.floating toggle +# scratchpad +hc keybind $Mod-minus spawn scratchpad.sh + ####################################################################### # MOUSE BINDINGS ####################################################################### @@ -135,9 +141,11 @@ hc set frame_bg_transparent on hc set frame_transparent_width 5 hc set frame_gap 4 +hc attr settings.frame_transparent_width 1 + hc attr theme.title_height 15 hc attr theme.title_when always -hc attr theme.title_font 'Dejavu Sans:pixelsize=12' # example using Xft +hc attr theme.title_font 'CozetteVector:pixelsize=13' # example using Xft # hc attr theme.title_font '-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*' hc attr theme.title_depth 3 # space below the title's baseline hc attr theme.active.color '#345F0Cef' @@ -151,8 +159,8 @@ hc attr theme.active.tab_title_color '#ababab' hc attr theme.normal.title_color '#898989' hc attr theme.inner_width 1 hc attr theme.inner_color black -hc attr theme.border_width 3 -hc attr theme.floating.border_width 4 +hc attr theme.border_width 1 +hc attr theme.floating.border_width 1 hc attr theme.floating.outer_width 1 hc attr theme.floating.outer_color black hc attr theme.active.inner_color '#789161' @@ -199,5 +207,5 @@ hc unlock # "$panel" "$monitor" & # done -pkill -lf polybar -polybar & +# pkill -lf "^polybar$" +# polybar & diff --git a/.config/spectrwm/spectrwm.conf b/.config/spectrwm/spectrwm.conf index 44600a1..7c19c4c 100644 --- a/.config/spectrwm/spectrwm.conf +++ b/.config/spectrwm/spectrwm.conf @@ -258,5 +258,3 @@ bind[wind_del] = MOD+q bind[wind_kill] = MOD+Shift+q bind[restart] = MOD+Shift+r - -# autorun = ws[10]:xcons diff --git a/.kshrc b/.kshrc index 7fe1f4e..7d917c6 100644 --- a/.kshrc +++ b/.kshrc @@ -123,14 +123,14 @@ set bell-style none alias kshrc="vim ~/.kshrc" alias muttrc="vim ~/.mutt/rc-common" alias vimrc="vim ~/.vim/vimrc" -alias hcrc="vim ~/.config/herbstluftwm/autostart" +alias hlconf="vim ~/.config/herbstluftwm/autostart" alias hc="herbstclient" alias bspwmrc="vim ~/.config/bspwm/bspwmrc" alias sxhkdrc="vim ~/.config/bspwm/sxhkdrc" alias vimbrc="vim ~/.config/vimb/config" alias exrc="vim ~/.exrc" -alias web-ebay="chrome https://www.ebay-kleinanzeigen.de/m-nachrichten.html &" +alias web-ebay="chrome https://www.kleinanzeigen.de/m-nachrichten.html &" alias web-scottsbasslessons="chrome https://scottsbasslessons.com &" alias refake="rm -f pkg/*.orig; make clean=fake && make fake" @@ -397,7 +397,7 @@ alias omisc="mutt -f $MUTT_HOST/Virtual/OpenBSD-misc" export CVSROOT=sdk@cvs.openbsd.org:/cvs alias cvs-diff="doas -u sdk cvs -d $CVSROOT diff -uNp" alias cvs-commit="doas -u sdk cvs -d $CVSROOT commit" -alias cvs-update="doas -u sdk cvs -z3 -d $CVSROOT -q up -Pd -A" +alias cvs-update="doas -u sdk cvs -z1 -d $CVSROOT -q up -Pd -A" cvs-update-all() {( set -x @@ -695,11 +695,13 @@ alias xrandr_mirror_hdmi="xrandr --output HDMI-A-0 --same-as eDP --mode 1920x108 # GNUPG AGENT ######################################################################## -if [ -f $HOME/.enable_gpg ] -then - GPG_TTY=$(tty) - SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - SSH_AUTH_SOCK_EXTRA=${SSH_AUTH_SOCK%%.ssh}.extra - export GPG_TTY SSH_AUTH_SOCK SSH_AUTH_SOCK_EXTRA - pgrep -qu sdk gpg-agent || gpg-connect-agent -q /bye -fi +eval $(keychain -Q -q --noask --agents ssh,gpg --noask --eval id_rsa) + +# if [ -f $HOME/.enable_gpg ] +# then +# GPG_TTY=$(tty) +# SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +# SSH_AUTH_SOCK_EXTRA=${SSH_AUTH_SOCK%%.ssh}.extra +# export GPG_TTY SSH_AUTH_SOCK SSH_AUTH_SOCK_EXTRA +# pgrep -qu sdk gpg-agent || gpg-connect-agent -q /bye +# fi