diff --git a/.Xdefaults b/.Xdefaults index 915b109..8addd9c 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -1,7 +1,6 @@ ! -- CURSOR --! !Xcursor.size: 32 -!Xcursor.size: 32 -Xcursor.size: +Xcursor.size: 32 Xcursor.theme: xterm.cursorTheme: diff --git a/.bin/OLD/subsonic b/.bin/OLD/subsonic deleted file mode 100755 index bbc63b4..0000000 --- a/.bin/OLD/subsonic +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# subsonic -alias subsonic-cli="\subsonic-cli -c $HOME/.subsonic-cli.conf" - -subsonic-play() { - # $1 songId - for song in $@ - do - echo $song > /tmp/.playing - subsonic-cli stream -p id $song \ - | mpv --loop=no - || exit 0 - done -} - -subsonic-random() { - while true; - do - echo "Fetching moar dataaa.." - subsonic-play $(subsonic-cli getRandomSongs \ - | jq -r '.randomSongs[][].id') - done -} - -subsonic-favorites() { - while true; - do - echo "Fetching moar dataaa.." - subsonic-play $(subsonic-cli getStarred \ - | jq -r '.starred[][].id' \ - | sort -r) - done -} - -subsonic-search() { - { - echo "|ALBUMID|ID|ALBUM|ARTIST|TITLE|GENRE|" - printf "|%s|%s|%s|%s|%s|%s|\n" "--------------------------------"\ - "--------------------------------"\ - "--------" "--------" "--------" "--------" - subsonic-cli search3 \ - -p songcount 200 \ - -p query "$@" \ - | jq -r '.searchResult3[][]|select(.contentType!=null)|[.albumId,.id,.album,.title,.artist,.genre]' \ - | tr -d '", ' \ - | awk '/^\[/ { S++ } \ - /^\]/ { S-- } \ - S==0 { NR=0 } \ - NR==2 { AID=$0 } \ - NR==3 { ID=$0 } \ - NR==4 { ALBUM=$0 } \ - NR==5 { TITLE=$0 } \ - NR==6 { ARTIST=$0 } \ - NR==7 { GENRE=$0 } \ - NR==0 { printf("|%s|%s|%s|%s|%s|%s|\n", AID, ID, ALBUM, ARTIST, TITLE, GENRE) }' - } | column -s'|' -t -} - -subsonic-star() { - [ -f /tmp/.playing ] \ - && subsonic-cli star -p id $(cat /tmp/.playing | tail -1) \ - || echo bruh. -} - -subsonic-unstar() { - [ -f /tmp/.playing ] \ - && subsonic-cli unstar -p id $(cat /tmp/.playing | tail -1) \ - || echo bruh. -} - -subsonic-download() { - # $1 albumId - NAME=$(subsonic-cli getAlbum -p id $1 \ - | jq -r '.album.artist,.album.name' | xargs | tr ' ' '-') - printf "Downloading to %s/subsonic-download/%s.zip\n" "$HOME" "$NAME" - mkdir -p "$HOME/subsonic-download" - subsonic-cli download -p id $1 | pv > "$HOME/subsonic-download/$NAME.zip" -} - -if [ -z $1 ] -then - cat <<"EOF" - usage: subsonic - - play - play song with id - download - download album with id - [un]star - [un]star currently playing song - search - show song/album for term - favorites - play starred songs - random - play random songs - -EOF -else - subsonic-$1 $2 -fi - - diff --git a/.bin/apps/amused b/.bin/apps/amused index 2c841fd..5305f10 100755 --- a/.bin/apps/amused +++ b/.bin/apps/amused @@ -34,7 +34,7 @@ amused_sort() {( amused_load_tank() {( NOTIFY_CMD "loading started in background" - ssh 192.168.1.20 "find /tank/pub/Audio_* -type f" | grep -Ev "jpg|jpeg|png|gif|/[Cc]over\." | amused load + ssh 10.20.30.20 "find /tank/pub/Audio_* -type f" | grep -Ev "jpg|jpeg|png|gif|/[Cc]over\." | amused load NOTIFY_CMD "loading finished" amused_cmd play )&} diff --git a/.bin/cbar b/.bin/cbar index 157c4a5..8ce219f 100755 Binary files a/.bin/cbar and b/.bin/cbar differ diff --git a/.mutt/scripts/portpatch2.sh b/.mutt/scripts/portpatch2.sh index 917a0bf..b041ee2 100755 --- a/.mutt/scripts/portpatch2.sh +++ b/.mutt/scripts/portpatch2.sh @@ -5,15 +5,14 @@ clear -. ~/.ksh/porttools.ksh - printf '\n---------------------------------------------------------------------\n' grep -E 'Subject: |^Index|^RCS|^diff --git|^file +|^[-+]{3} ' "${1}" printf '---------------------------------------------------------------------\n\n' printf "Apply patch on path? " read -r _path -_path=$(port-jump $_path; pwd) +_path="$(port-jump $_path | fzf)" +cd $_path print "Using: $_path" diff --git a/.vim/pack/plugins/start/vim-snipmate/snippets/c.snippets b/.vim/pack/plugins/start/vim-snipmate/snippets/c.snippets index 89b81ba..654e889 100644 --- a/.vim/pack/plugins/start/vim-snipmate/snippets/c.snippets +++ b/.vim/pack/plugins/start/vim-snipmate/snippets/c.snippets @@ -1,6 +1,6 @@ # main() snippet main - int main(int argc, const char *argv[]) + int main(int argc, const * char argv[]) { ${1} return 0; diff --git a/.vim/vimrc b/.vim/vimrc index 9e1100d..2d7b378 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -100,6 +100,9 @@ set nowritebackup " no extra backup before writing set writeany " write to any file (:w!) set directory=~/.vim/swapfiles// " move swapfiles out of the way +set runtimepath^=/home/sdk/.vim/pack/plugins/start/vim-clap +let g:clap_plugin_experimental = v:true + " CREATE DIRECTORIES silent execute '!mkdir -p ~/.vim/undo ~/.vim/backup ~/.vim/swapfiles'