diff --git a/.bin/_config b/.bin/_config index 43d03c3..e245266 100644 --- a/.bin/_config +++ b/.bin/_config @@ -15,21 +15,6 @@ COLOR_NF="#707070" COLOR_SB="#222222" COLOR_SF="#CCCCCC" -# SEL_ACTIVE -# selected frame -# border -# active tab fg -# active tab bg -# inactive tab fg -# inactive tab bg - -# inactive frame -# border -# active tab fg -# active tab bg -# inactive tab fg -# inactive tab bg - # # TERMINALS # @@ -42,7 +27,7 @@ HTERM="st -f spleen:pixelsize=32" # DMENU # -DMENUOPTS="-fn Terminus:pixelsize=18 \ +DMENUOPTS="-fn Terminus:pixelsize=20 \ -nb $COLOR_NB \ -nf $COLOR_NF \ -sf $COLOR_SF \ @@ -58,7 +43,10 @@ DMENURUN_CMD="dmenu_run $DMENUOPTS" # NOTIFY_CMD() { - notify-send -- "$@ ($(date +%H:%M))" + twmnc -i "${VAR##*/}" \ + -d 5000 \ + -t "$(date +%H:%M)" \ + -c "$@" } # @@ -74,10 +62,5 @@ needs() { # CONNECT TO GPG-AGENT # -#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 +[ -f ~/.ksh/gnupg.ksh ] \ + && . ~/.ksh/gnupg.ksh diff --git a/.bin/apps/amused b/.bin/apps/amused index 00f872b..e6ae97b 100755 --- a/.bin/apps/amused +++ b/.bin/apps/amused @@ -32,12 +32,12 @@ amused_sort() {( )&} amused_load_tank() {( NOTIFY_CMD "loading started in background" - amused load < /home/sdk/.music.all.txt + ssh 192.168.1.20 "find /tank/pub/Audio_* -type f" | grep -Ev "jpg|jpeg|png|gif|/[Cc]over\." | amused load NOTIFY_CMD "loading finished" )&} amused_load_local() {( NOTIFY_CMD "loading started in background" - find ~/MusicSelection -type f | amused load + find /home/sdk/Music -type f | grep -Ev "jpg|jpeg|png|gif|/[Cc]over\." | amused load NOTIFY_CMD "loading finished" )&} amused_cmd() { @@ -47,7 +47,7 @@ amused_cmd() { case "${SEL}" in play) amused_cmd play; ;; - prev) amused_cmd pref; ;; + prev) amused_cmd prev; ;; stop) amused_cmd stop; ;; next) amused_cmd next; ;; shuffle) amused_shuffle; ;; diff --git a/.bin/cbar b/.bin/cbar index 6c28702..1016558 100755 Binary files a/.bin/cbar and b/.bin/cbar differ diff --git a/.bin/chrome b/.bin/chrome index 20e25c2..1efa0f4 100755 --- a/.bin/chrome +++ b/.bin/chrome @@ -1,4 +1,5 @@ #!/bin/sh +. ~/.bin/_config /usr/local/bin/ungoogled-chromium \ --bwsi \ --enable-easy-off-store-extension-install \ diff --git a/.bin/nnn.sh b/.bin/nnn.sh index 7958fc2..d45c9aa 100755 --- a/.bin/nnn.sh +++ b/.bin/nnn.sh @@ -66,6 +66,7 @@ case "$EXT" in txt) vim "$f"; ;; m2ts) mpv "$f"; ;; flv) mpv "$f"; ;; + aiff) mpva "$f"; ;; sid) sidplay "$f"; ;; out) kdump -RTf "$f" | less; ;; torrent) aria2c "$f"; ;; @@ -83,14 +84,14 @@ fi case "$(file -ib "$f")" in # full qualified - application/ogg) ogg123 "$f"; ;; + application/ogg) aplay "$f"; ;; application/pdf) mupdf "$f"; ;; application/postscript) mupdf "$f"; ;; application/vnd.oasis.opendocument.*) libreoffice "$f"; ;; - audio/mpeg) mpg123 "$f"; ;; + audio/mpeg) aplay "$f"; ;; audio/midi) timidity "$f"; ;; # with wildcards - audio/*) mpv "$f"; ;; + audio/*) aplay "$f"; ;; video/*) mpv "$f"; ;; image/webp) mpv "$f"; ;; image/*) nsxiv -N floating -g 1280x720+300+180 -ab "$f"; ;; diff --git a/.config/spectrwm/spectrwm.conf b/.config/spectrwm/spectrwm.conf index 4dbc3eb..1b51572 100644 --- a/.config/spectrwm/spectrwm.conf +++ b/.config/spectrwm/spectrwm.conf @@ -39,8 +39,8 @@ bar_font_color = rgb:99/99/99 bar_font_color_free = rgb:99/99/99 bar_font_color_selected = rgb:ff/ff/ff -bar_font = Terminus:pixelsize=18 -bar_font_pua = PowerlineExtraSymbols:pixelsize=18 +bar_font = Terminess Nerd Font:pixelsize=18 +#bar_font_pua = PowerlineExtraSymbols:pixelsize=18 bar_action = cbar bar_action_expand = 0 bar_at_bottom = 0 diff --git a/.gnupg/pinentry-dmenu.conf b/.gnupg/pinentry-dmenu.conf index 0e6cfd7..7fe7b01 100644 --- a/.gnupg/pinentry-dmenu.conf +++ b/.gnupg/pinentry-dmenu.conf @@ -1,6 +1,6 @@ asterisk = "*"; prompt = ""; -font = "Terminus:pixelsize=16"; +font = "Terminus:pixelsize=20"; bottom = false; prompt_fg = "#FFFFFF"; diff --git a/.ksh/aliases.ksh b/.ksh/aliases.ksh index 345fc39..78f1c51 100644 --- a/.ksh/aliases.ksh +++ b/.ksh/aliases.ksh @@ -29,9 +29,10 @@ alias cv="sacc gopher://codevoid.de" # pim alias notes="vim ~/Documents/notes/notes.txt" -alias events="vim ~/Documents/events.txt" +alias events="vim ~/Documents/notes/events.txt" alias caly="ncal -Cy" alias calm="ncal -3C" +alias sendnote="mail sh@codevoid.de" # music alias music_psychedelik="mpg123 -b 1024 http://62.210.114.63:8000" @@ -107,4 +108,3 @@ alias bbs='ssh -t sdk@home.codevoid.de "LANG=de_DE.UTF-8 syncterm -iC localhost: alias toot-sh="toot-wrapper sh@bsd.network" alias toot-uug="toot-wrapper uugrn@chaos.social" alias tuta="tut -u 'sh@bsd.network uugrn@chaos.social'" - diff --git a/.ksh/amused.ksh b/.ksh/amused.ksh new file mode 100644 index 0000000..9ee213e --- /dev/null +++ b/.ksh/amused.ksh @@ -0,0 +1,23 @@ +######################################################################## +# AMUSED +######################################################################## + +alias amused-next="_amused_cmd next" +alias amused-prev="_amused_cmd prev" +alias amused-play="_amused_cmd play" +alias amused-stop="_amused_cmd stop" +alias amused-seek="_amused_cmd seek 30" +alias amused-jump="_amused_jump" + +_amused_cmd() { + . ~/.bin/_config + amused "${@}" + STATUS="$(amused status | head -1 | cut -d'/' -f5-)" + NOTIFY_CMD "$STATUS" + echo "now playing: $STATUS" +} + +_amused_jump() { + _amused_cmd jump \ + "$(echo "$(amused show | cut -d'/' -f5-)" | fzf -i -e)" +} diff --git a/.ksh/porttools.ksh b/.ksh/porttools.ksh index 0ddc4c1..8ef5ed9 100644 --- a/.ksh/porttools.ksh +++ b/.ksh/porttools.ksh @@ -130,6 +130,7 @@ _remake() { _repackage() { make clean=packages + doas -u _pbuild rm -f $(make show="PLIST_REPOSITORY ARCH FULLPKGNAME" | tr '\n' '/' | sed 's|/$||g') FETCH_PACKAGES=No make package } diff --git a/.kshrc b/.kshrc index 2e2912b..2a6ef12 100644 --- a/.kshrc +++ b/.kshrc @@ -86,6 +86,7 @@ load email.ksh load porttools.ksh load remind.ksh load ytdl.ksh +load amused.ksh load gnupg.ksh load localstuff.ksh