config

commit 1815250161881aca17587c04bba72a26cc9b94bd
parent 571690bdb6ecd89ecaaa937e858a815a73280c26
Author: Jacob R. Edwards <jacobouno@protonmail.com>
Date:   Wed,  2 Sep 2020 22:24:26 -0700

Remove and modify functions and aliases

remove unused entries.

greatly improve mpc functions by calling 'eval echo' in mpdconfig.

use local variables in funcitions.

append ':' to section comments.

Diffstat:
M
aliases/.config/aliases
 | 
92
++++++++++++++++++++++---------------------------------------------------------

1 file changed, 25 insertions(+), 67 deletions(-)
diff --git a/aliases/.config/aliases b/aliases/.config/aliases
@@ -4,41 +4,30 @@ if [ -f "$XDG_CONFIG_HOME/aliases.private" ]; then
 	. "$XDG_CONFIG_HOME/aliases.private"
 fi
 
-# random
+# random:
 alias pkill="pkill -x"
 alias col="column -t"
 alias la="ls -A"
 alias cmd="command"
 alias mupdf="mupdf -I"
-alias w3m="w3m -cols 80"
-alias dcsv="col -s,"
 alias wq="webq"
-alias wh="which"
-
-# the trailing space expands aliases
 alias doas="doas -- "
 alias man="man "
-
-# multiple file options opened as tabs
-alias nvim="nvim -p"
 alias vim="vim -p"
 
-# use extended regular expressions
+# use EREs:
 alias sed="sed -E"
 alias grep="egrep"
 
-# clipboard
-alias grab="xclip -selection clipboard"
-alias push="xclip -selection clipboard -out"
-
-# very short
+# short:
 alias f="$EDITOR"
 alias l="$PAGER"
-alias g="grep"
-alias ic="ifconfig"
-alias nb="newsboat"
 
-# package manager
+# clipboard:
+alias grab="xclip -selection clipboard"
+alias push="grab -out"
+
+# package management:
 alias pkg_add="pkg_add -xV"
 alias pa="doas pkg_add"
 alias pu="doas pkg_add -u"
@@ -46,7 +35,7 @@ alias pd="doas pkg_delete"
 alias pq="pkg_info -Q"
 alias pi="pkg_info"
 
-# git
+# git:
 alias gd="git diff"
 alias ga="git add"
 alias gc="git commit"
@@ -57,13 +46,7 @@ alias gdc="gd --cached"
 # get git commit count
 alias gcc="git rev-list HEAD --count"
 
-# cargo/rust
-alias rs="cargo"
-alias rsdoc="rs doc"
-alias rss="rs search"
-alias rsfmt="rustfmt"
-
-# mpc
+# mpc:
 alias m="mpc"
 alias mc="m current"
 alias ma="m a"
@@ -80,36 +63,36 @@ alias mL="m load"
 alias mq="m search any"
 alias mC="m clear"
 
-# get mpd configuration (oneline options only)
-mpd-config() { grep $1 $XDG_CONFIG_HOME/mpd/mpd.conf | sed -E 's/.*"(.*)\"/\1/g' ;}
+# get mpd settings
+mpdconfig() { eval echo `grep $1 $XDG_CONFIG_HOME/mpd/mpd.conf | sed -E 's/.*"(.*)\"/\1/g'` ;}
 
 # grep mpc playlists
-mgrep() { grep -h $@ `eval echo $(mpd-config playlist_directory)/*` | sort -u ;}
+mgrep() { grep -h $@ `mpdconfig playlist_directory/*` | sort -u ;}
 
 # add current song to playlist(s)
 mato() {
-	track="$(mpc current -f "%file%")"
-	while [ $# -ne 0 ]; do
-		echo "$track" >> $(eval echo $(mpd-config playlist_directory))/$1.m3u
+	local track="`mpc current -f "%file%`"
+	while [ $# -gt 0 ]; do
+		echo "$track" >> `mpdconfig playlist_directory`/$1.m3u
 		shift
 	done
 }
 
-# replace playlist with current
+# replace m3u playlist with loaded playlist
 mrepl() {
-	dir="$(eval echo $(mpd-config playlist_directory))"
-	mv -v $dir/$1.m3u $dir/.$1.m3u && mpc save $1
+	local dir="`mpdconfig playlist_directory`"
+	mv -v "$dir/$1.m3u" "$dir/.$1.m3u" && mpc save "$1"
 }
 
 # find music directories
 mfind() {
-	dir="$(eval echo "$(mpd-config music_directory)")"
+	local dir="`mpdconfig music_directory`"
 	find "$dir" -type d | grep ${@-""} | sed "s:$dir/?::"
 }
 
 # mps wrapper to work in states directory
 mps() {
-	dir="$(eval echo "$(mpd-config music_directory)")/.states"
+	local dir="`mpdconfig music_directory`/.states"
 	case $#
 	in
 		0) ls -1 "$dir";;
@@ -121,23 +104,14 @@ mps() {
 # search all history for `regex`
 hs() { fc -nl 0 | egrep "$1" ;}
 
-# display podcast names if no arguments are specified
-rpa() {
-	if [ $# -eq 0 ]; then
-		command rpa -ni0 | cut -d':' -f1
-	else
-		command rpa $@
-	fi
-}
-
 # unset proxy env variables
-nproxy() { unset ALL_PROXY; unset HTTP_PROXY ;}
+np() { unset ALL_PROXY; unset HTTP_PROXY ;}
 
 # search sxhkd keybinds
 lk() { egrep "${@-.}" -iC3 $XDG_CONFIG_HOME/sxhkd/sxhkdrc ;}
 
 # pipe du into sort -h
-ds() { du -sh $@ | sort -h ;}
+dus() { du -sh $@ | sort -h ;}
 
 # redo last command (I frequently type k+enter before escape in vi mode)
 k() { fc -s ;}
@@ -148,27 +122,11 @@ ff() {
 	f $1
 }
 
-# get percentage of one number compared to another
-prc()
-{
-	if [ $# -eq 2 ]; then
-		calc -d "$2 / ($1 / 100)" | grep -o "[0-9]+" || echo "prc: error" 1>&2
-	else
-		echo "usage, prc [FLOAT] [FLOAT]"
-	fi
-}
-
 # reinitialize shell
-self()
-{
-	exec $0
-}
+self() { exec $0 ;}
 
 # get nth line from stdout
-nth()
-{
-	head -n ${1:?"nth: no index"} | tail -1
-}
+nth() { head -n ${1:?"nth: no index"} | tail -1 ;}
 
 wQ() { webq "$*" ;}
 rr() { fc -s "$*" ;}