commit 066dae618f08e8186e71128dce4ae7ebf2d22820
parent 9a72bcdac5985ce58562aaf2bd776abac135d9dc
Author: Jacob R. Edwards <jacobouno@protonmail.com>
Date: Sun, 22 Nov 2020 11:10:31 -0800
Move `aliases' module to `shell'
The `ALIASES' variable is now renamed to `SHELL_MODULE_DIR' and, if
unset when sourcing main, defaults to /usr/local/share/shell.
Diffstat:
9 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,12 +1,12 @@
MODULE_DIR = modules
-MODULES = aliases\
- git\
+MODULES = git\
ksh\
mpd\
mpv\
profile\
readline\
scripts\
+ shell\
sxiv\
tmux\
vim\
diff --git a/modules/aliases/.config/aliases/main b/modules/aliases/.config/aliases/main
@@ -1,62 +0,0 @@
-# shell aliases and functions
-
-__progname=`basename -- $0`
-
-# include shell module.
-include() {
- local include="${ALIASES:?unset}/$1"
- test -f "$include" || {
- printf "%s: include: '%s': File nonexistent.\n" \
- $__progname $include;
- return 1
- }
- . "$include"
-}
-
-# Must be included here for ncpu.
-include openbsd
-
-alias ap="apropos"
-alias apf="apropos -f"
-alias doas="doas -- "
-alias dsu="doas su"
-alias fls="find . -maxdepth 1"
-alias get="curl -sSLO"
-alias gmake="gmake -j`ncpu`"
-alias grep="egrep"
-alias ls="ls -1"
-alias lsp="dmenu_path"
-alias make="make -j`ncpu`"
-alias man="man "
-alias mk="make"
-alias mtime="stat -t'$DATETIME_FMT' -f%Sm%t%N"
-alias pkill="pkill -x"
-alias sed="sed -E"
-alias self="reload"
-alias vim="vim -p"
-
-alias f="$EDITOR"
-alias g="git"
-alias l="$PAGER"
-alias t="tmux"
-
-doin() { (builtin cd ${1:?No directory} && shift && eval $@) ;}
-fed() { doin "$FEED_DIR" feed $@ ;}
-fman() { groff -man -Tascii $@ | l ;}
-lsc() { ls $* | rs ;}
-lsm() { ls ${ALIASES:?unset} ;}
-note() { doin $HOME/own/text/note/ $@ ;}
-np() { unset ALL_PROXY; unset HTTP_PROXY ;}
-reload() { . ~/.profile && include main ;}
-vol() { sndioctl output.level=$@ ;}
-
-fp() {
- local bin=`which $@ 2>/dev/null`
- f ${bin:?No such file or directory}
-}
-
-include cd
-include history
-include mpc
-include private
-include xorg
diff --git a/modules/ksh/.config/ksh.kshrc b/modules/ksh/.config/ksh.kshrc
@@ -3,8 +3,8 @@
set -Xbh
set -o vi
-ALIASES="$XDG_CONFIG_HOME/aliases"
-[ -f "$ALIASES/main" ] && . "$ALIASES/main"
+SHELL_MODULE_DIR="$XDG_CONFIG_HOME/shell"
+[ -f "$SHELL_MODULE_DIR/main" ] && . "$SHELL_MODULE_DIR/main"
HISTFILE="$HISTBASE/ksh/`date +%Y.%m`"
HISTSIZE="820000"
diff --git a/modules/aliases/.config/aliases/cd b/modules/shell/.config/shell/cd
diff --git a/modules/aliases/.config/aliases/history b/modules/shell/.config/shell/history
diff --git a/modules/shell/.config/shell/main b/modules/shell/.config/shell/main
@@ -0,0 +1,62 @@
+# shell aliases and functions
+
+__progname=`basename -- $0`
+
+# include shell module.
+include() {
+ local include="${SHELL_MODULE_DIR:='/usr/local/share/shell'}/$1"
+ test -f "$include" || {
+ printf "%s: include: '%s': File nonexistent.\n" \
+ $__progname $include;
+ return 1
+ }
+ . "$include"
+}
+
+# Must be included here for ncpu.
+include openbsd
+
+alias ap="apropos"
+alias apf="apropos -f"
+alias doas="doas -- "
+alias dsu="doas su"
+alias fls="find . -maxdepth 1"
+alias get="curl -sSLO"
+alias gmake="gmake -j`ncpu`"
+alias grep="egrep"
+alias ls="ls -1"
+alias lsp="dmenu_path"
+alias make="make -j`ncpu`"
+alias man="man "
+alias mk="make"
+alias mtime="stat -t'$DATETIME_FMT' -f%Sm%t%N"
+alias pkill="pkill -x"
+alias sed="sed -E"
+alias self="reload"
+alias vim="vim -p"
+
+alias f="$EDITOR"
+alias g="git"
+alias l="$PAGER"
+alias t="tmux"
+
+doin() { (builtin cd ${1:?No directory} && shift && eval $@) ;}
+fed() { doin "$FEED_DIR" feed $@ ;}
+fman() { groff -man -Tascii $@ | l ;}
+lsc() { ls $* | rs ;}
+lsm() { ls ${SHELL_MODULE_DIR:?unset} ;}
+note() { doin $HOME/own/text/note/ $@ ;}
+np() { unset ALL_PROXY; unset HTTP_PROXY ;}
+reload() { . ~/.profile && include main ;}
+vol() { sndioctl output.level=$@ ;}
+
+fp() {
+ local bin=`which $@ 2>/dev/null`
+ f ${bin:?No such file or directory}
+}
+
+include cd
+include history
+include mpc
+include private
+include xorg
diff --git a/modules/aliases/.config/aliases/mpc b/modules/shell/.config/shell/mpc
diff --git a/modules/aliases/.config/aliases/openbsd b/modules/shell/.config/shell/openbsd
diff --git a/modules/aliases/.config/aliases/xorg b/modules/shell/.config/shell/xorg
