commit 62bb5574261bc2692f8375625425c13ef82986d4
parent e9bfdb1e00e5c2b5d1ca0bdf04134b7b4bc73eec
Author: Jacob R. Edwards <jacobouno@protonmail.com>
Date: Tue, 3 Nov 2020 15:12:38 -0800
Reorganize
Add openbsd, git, history, and locate modules.
Remove `gps' alias.
Move pkg aliases to openbsd module.
Move reload function to util module.
Diffstat:
11 files changed, 73 insertions(+), 68 deletions(-)
diff --git a/aliases/.config/aliases/cd b/aliases/.config/aliases/cd
@@ -1,4 +1,4 @@
-# cd functions to record directories visited and revisit them
+# cd builtin shell aliases and functions
# record directories visited.
cd() { builtin cd $@ && echo $PWD >> $PWDLOG ;}
diff --git a/aliases/.config/aliases/complex b/aliases/.config/aliases/complex
@@ -1,5 +1,4 @@
-# Complex aliases; I would say non-posix but I don't know if my other
-# ones are compliant.
+# complex shell aliases and functions
# mark directory
dm() {
diff --git a/aliases/.config/aliases/git b/aliases/.config/aliases/git
@@ -0,0 +1,16 @@
+# git shell aliases and functions
+
+alias g="git"
+alias gcc="git rev-list HEAD --count"
+
+# git remote init
+gitrinit() {
+ local rpath="${1:?Remote path not given}"
+ local remote="${2:-git}"
+
+ ssh "$remote" "git init --bare --shared=true '$rpath'"
+ git init
+ git remote add origin "$remote:$rpath"
+ git config branch.master.remote origin
+ git config branch.master.merge refs/heads/master
+}
diff --git a/aliases/.config/aliases/history b/aliases/.config/aliases/history
@@ -0,0 +1,10 @@
+# shell history shell aliases and functions
+
+alias k="fc -s"
+
+# history search
+hs() { fc -nl 0 | egrep "$1" ;}
+
+unalias r 2>/dev/null
+# use all arguments for history search
+r() { fc -s "$*" ;}
diff --git a/aliases/.config/aliases/locate b/aliases/.config/aliases/locate
@@ -0,0 +1,17 @@
+# file locating shell alias and functions
+
+# edit executable file in PATH
+fp() {
+ local bin=`which $@ 2>/dev/null`
+ f ${bin:?No such file or directory}
+}
+
+# edit locate's findings
+fl() {
+ local files="$(locate $@)"
+ if test `echo "$files" | wc -l` -gt 1; then
+ echo "$files"
+ elif test ${#files} -gt 0; then
+ f $files
+ fi
+}
diff --git a/aliases/.config/aliases/main b/aliases/.config/aliases/main
@@ -1,83 +1,36 @@
-# shell aliases
+# shell aliases and functions
. $ALIASES/util
include cd
+include complex
+include git
+include history
+include locate
include mpc
-include pkg
+include openbsd
include private
include xorg
-include complex
-# aliases
alias cmd="command"
alias doas="doas -- "
alias f="$EDITOR"
-alias gps="command gp"
alias grep="egrep"
-alias k="fc -s"
alias l="$PAGER"
alias la="ls -A"
alias man="man "
-alias mupdf="mupdf -I"
alias pkill="pkill -x"
alias sed="sed -E"
alias vim="vim -p"
alias inc="command include"
alias get="curl -sSLO"
-alias g="git"
-alias gcc="git rev-list HEAD --count"
alias t=tmux
-alias ncpu="sysctl -n hw.ncpufound"
+alias self="reload"
alias make="make -j`ncpu`"
-# edit executable file in PATH
-fp() {
- local bin=`which $@ 2>/dev/null`
- f ${bin:?No such file or directory}
-}
-
-# edit locate's findings
-fl() {
- local files="$(locate $@)"
- if test `echo "$files" | wc -l` -gt 1; then
- echo "$files"
- elif test ${#files} -gt 0; then
- f $files
- fi
-}
-
-# history search
-hs() { fc -nl 0 | egrep "$1" ;}
-
-# unset proxy variables
np() { unset ALL_PROXY; unset HTTP_PROXY ;}
-
-unalias r 2>/dev/null
-# use all arguments for history search
-r() { fc -s "$*" ;}
-
-# reload shell
-reload() {
- . ~/.profile
- include main
-}
-alias self="reload"
-
vol() { sndioctl output.level=$@ ;}
doin() { (builtin cd ${1:?No directory} && shift && eval $@) ;}
note() { doin $HOME/own/text/note/ $@ ;}
fed() { doin "$FEED_DIR" feed $@ ;}
fman() { groff -man -Tascii $@ | l ;}
-
-# git remote init
-gitrinit() {
- local rpath="${1:?Remote path not given}"
- local remote="${2:-git}"
-
- ssh "$remote" "git init --bare --shared=true '$rpath'"
- git init
- git remote add origin "$remote:$rpath"
- git config branch.master.remote origin
- git config branch.master.merge refs/heads/master
-}
diff --git a/aliases/.config/aliases/mpc b/aliases/.config/aliases/mpc
@@ -1,4 +1,4 @@
-# mpc aliases
+# mpc aliases and functions
alias m="mpc"
alias mp="m play"
diff --git a/aliases/.config/aliases/openbsd b/aliases/.config/aliases/openbsd
@@ -0,0 +1,11 @@
+# OpenBSD specific shell aliases and functions
+
+alias ncpu="sysctl -n hw.ncpufound"
+
+# package management
+alias pkg_add="pkg_add -xV"
+alias pa="doas pkg_add"
+alias pu="doas pkg_add -u"
+alias pd="doas pkg_delete"
+pq() { pkglocate "${@}*:*" | cut -d: -f1 | uniq ;}
+alias pi="pkg_info"
diff --git a/aliases/.config/aliases/pkg b/aliases/.config/aliases/pkg
@@ -1,8 +0,0 @@
-# OpenBSD package management aliases
-
-alias pkg_add="pkg_add -xV"
-alias pa="doas pkg_add"
-alias pu="doas pkg_add -u"
-alias pd="doas pkg_delete"
-pq() { pkglocate "${@}*:*" | cut -d: -f1 | uniq ;}
-alias pi="pkg_info"
diff --git a/aliases/.config/aliases/util b/aliases/.config/aliases/util
@@ -1,4 +1,4 @@
-# shell utility functions
+# utility shell aliases and functions
verb() {
echo "$@" 1>&2
@@ -21,3 +21,9 @@ include() {
test -f "$include" || { warn "'$include': File non-existent."; return 1 ;}
. "$include"
}
+
+# reload shell
+reload() {
+ . ~/.profile
+ include main
+}
diff --git a/aliases/.config/aliases/xorg b/aliases/.config/aliases/xorg
@@ -1,10 +1,11 @@
-# xorg aliases
+# xorg shell aliases and functions
alias startx="startx -- -retard"
alias x="startx"
alias grab="xclip -selection clipboard"
alias push="grab -out"
alias blend="blender"
+alias mupdf="mupdf -I"
# 3 letter aliases to open special files
alias pdf=zathura
