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 4897060..7d96f1f 100755 Binary files a/.bin/cbar and b/.bin/cbar differ 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