From bd593bdeb9cd5effed8dc6f017dc8f8db8ff221b Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Mon, 30 Oct 2017 04:37:32 -0400 Subject: move shared shell files to ~/.sh --- Makefile | 4 ---- aliases | 42 ------------------------------------------ bash_logout | 2 +- bashrc | 6 +++--- env | 18 ------------------ functions | 20 -------------------- logout | 5 ----- sh/aliases | 42 ++++++++++++++++++++++++++++++++++++++++++ sh/env | 18 ++++++++++++++++++ sh/functions | 20 ++++++++++++++++++++ sh/logout | 5 +++++ zlogout | 2 +- zshrc | 6 +++--- 13 files changed, 93 insertions(+), 97 deletions(-) delete mode 100644 aliases delete mode 100644 env delete mode 100644 functions delete mode 100644 logout create mode 100644 sh/aliases create mode 100644 sh/env create mode 100644 sh/functions create mode 100644 sh/logout diff --git a/Makefile b/Makefile index 4d3141c..826cc2d 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,9 @@ INTO = $(HOME) INSTALL = agignore \ - aliases \ bash_logout \ bash_profile \ bashrc \ crawlrc \ - env \ - functions \ gdbinit \ gitconfig \ gitignore \ @@ -14,7 +11,6 @@ INSTALL = agignore \ inputrc \ ledgerrc \ less \ - logout \ mailcap \ minicpanrc \ mpdconf \ diff --git a/aliases b/aliases deleted file mode 100644 index 52ec592..0000000 --- a/aliases +++ /dev/null @@ -1,42 +0,0 @@ -# improvements to common commands {{{ -alias ls="exa --group-directories-first --time-style=long-iso --git --color-scale" -alias ll="ls -l" -alias grep="grep --color=auto" -alias rm="rm -i" -alias cp="cp -i" -alias mv="mv -i" -alias bc="bc -lq" -alias ag="ag --pager=less --smart-case" -type forkprove > /dev/null 2>&1 && alias prove="forkprove" -type tput > /dev/null 2>&1 && alias reset="tput reset" -# }}} -# games {{{ -alias nao="env TERM=rxvt telnet nethack.alt.org" -alias cao="env TERM=rxvt /usr/bin/ssh -C -i $HOME/.ssh/cao_key joshua@crawl.akrasiac.org" -alias cdo="ssh -C -i $HOME/.ssh/cao_key crawl@crawl.develz.org" -# }}} -# termcast {{{ -alias tc="telnet termcast.org" -# }}} -# shells {{{ -alias bishamon='ssh doy@bishamon' -alias tozt="ssh doy@tozt.net" -# }}} -# tmux sessions {{{ -alias main='tmux a -t main' -alias chat='tmux a -t chat' -alias work='tmux a -t work' -alias docs='tmux a -t docs' -alias misc='tmux a -t misc' -# }}} -# other {{{ -alias pm="fd --type f . lib" -alias bootstrap_cpanm="curl -Ls http://cpanmin.us/ | perl - App::cpanminus" -alias v="vim --cmd 'let g:startify_disable_at_vimenter = 1' -c 'call feedkeys(\"t\")'" -alias g="vim --cmd 'let g:startify_disable_at_vimenter = 1' -c 'call feedkeys(\"ff\")'" -alias wifi="sudo systemctl restart netctl-auto@wlp3s0" -alias utc="env TZ=UTC date" -alias pd="perldoc" -# }}} - -# vim:ft=sh:fdm=marker diff --git a/bash_logout b/bash_logout index 744203a..a8cb83a 100644 --- a/bash_logout +++ b/bash_logout @@ -1,4 +1,4 @@ # This file is sourced when a login shell terminates. -source ~/.logout +source ~/.sh/logout # vim:ft=sh: diff --git a/bashrc b/bashrc index 9e33db0..a02ab57 100644 --- a/bashrc +++ b/bashrc @@ -1,6 +1,6 @@ # environment {{{ export PATH="/usr/share/git/diff-highlight:${HOME}/.bin/local:${HOME}/.bin:/usr/lib/ccache/bin:$PATH" -[ -f "$HOME/.env" ] && source $HOME/.env +[ -f "$HOME/.sh/env" ] && source $HOME/.sh/env # }}} # language environments {{{ test -f $HOME/perl5/perlbrew/etc/bashrc && source $HOME/perl5/perlbrew/etc/bashrc @@ -23,8 +23,8 @@ case ${TERM} in ;; esac # }}} # aliases {{{ -[ -f "$HOME/.aliases" ] && source $HOME/.aliases -[ -f "$HOME/.functions" ] && source $HOME/.functions +[ -f "$HOME/.sh/aliases" ] && source $HOME/.sh/aliases +[ -f "$HOME/.sh/functions" ] && source $HOME/.sh/functions # }}} # completion {{{ [ -f /etc/bash_completion ] && source /etc/bash_completion diff --git a/env b/env deleted file mode 100644 index 7e945e3..0000000 --- a/env +++ /dev/null @@ -1,18 +0,0 @@ -export GPG_TTY=$(tty) -export MPD_HOST=bishamon -export MANPAGER="$HOME/.bin/vimmanpager" -export PERLDOC_PAGER="$HOME/.bin/vimmanpager" -export EDITOR=$(/usr/bin/which vim) -export GIT_SSH="$HOME/.bin/ssh" -export RSYNC_RSH="$HOME/.bin/ssh" -export TEXINPUTS=".:$HOME/conf/tex:" -export LESS='-QR' -export NOPASTE_SERVICES="ssh" -export NOPASTE_SSH_SERVER="doy@paste.tozt.net" -export NOPASTE_SSH_DOCROOT="paste" -export NOPASTE_SSH_WEBPATH="http://paste.tozt.net" -export NOPASTE_SSH_MODE=0644 -export PERL_CPANM_OPT="-q --mirror file://$HOME/perl5/minicpan/ --mirror http://mirrors.kernel.org/cpan/ --mirror http://cpan.metacpan.org/ --prompt" -export FZF_DEFAULT_OPTS="--reverse --border --inline-info --bind=tab:down,shift-tab:up,change:top" - -# vim:ft=sh: diff --git a/functions b/functions deleted file mode 100644 index d6068e0..0000000 --- a/functions +++ /dev/null @@ -1,20 +0,0 @@ -function perldoc { - # XXX bash specific - if type cpandoc > /dev/null 2>&1; then - cpandoc "$@" - else - command perldoc "$@" - fi -} - -function cdu { - local root - root="$(git rev-parse --show-superproject-working-tree 2>/dev/null)" - if [ -n "$root" ]; then - cd "$root" - else - cd "$(git rev-parse --show-toplevel)" - fi -} - -# vim:ft=sh: diff --git a/logout b/logout deleted file mode 100644 index acf55d6..0000000 --- a/logout +++ /dev/null @@ -1,5 +0,0 @@ -# This file is sourced when a login shell terminates. -sudo -k -clear - -# vim:ft=sh: diff --git a/sh/aliases b/sh/aliases new file mode 100644 index 0000000..52ec592 --- /dev/null +++ b/sh/aliases @@ -0,0 +1,42 @@ +# improvements to common commands {{{ +alias ls="exa --group-directories-first --time-style=long-iso --git --color-scale" +alias ll="ls -l" +alias grep="grep --color=auto" +alias rm="rm -i" +alias cp="cp -i" +alias mv="mv -i" +alias bc="bc -lq" +alias ag="ag --pager=less --smart-case" +type forkprove > /dev/null 2>&1 && alias prove="forkprove" +type tput > /dev/null 2>&1 && alias reset="tput reset" +# }}} +# games {{{ +alias nao="env TERM=rxvt telnet nethack.alt.org" +alias cao="env TERM=rxvt /usr/bin/ssh -C -i $HOME/.ssh/cao_key joshua@crawl.akrasiac.org" +alias cdo="ssh -C -i $HOME/.ssh/cao_key crawl@crawl.develz.org" +# }}} +# termcast {{{ +alias tc="telnet termcast.org" +# }}} +# shells {{{ +alias bishamon='ssh doy@bishamon' +alias tozt="ssh doy@tozt.net" +# }}} +# tmux sessions {{{ +alias main='tmux a -t main' +alias chat='tmux a -t chat' +alias work='tmux a -t work' +alias docs='tmux a -t docs' +alias misc='tmux a -t misc' +# }}} +# other {{{ +alias pm="fd --type f . lib" +alias bootstrap_cpanm="curl -Ls http://cpanmin.us/ | perl - App::cpanminus" +alias v="vim --cmd 'let g:startify_disable_at_vimenter = 1' -c 'call feedkeys(\"t\")'" +alias g="vim --cmd 'let g:startify_disable_at_vimenter = 1' -c 'call feedkeys(\"ff\")'" +alias wifi="sudo systemctl restart netctl-auto@wlp3s0" +alias utc="env TZ=UTC date" +alias pd="perldoc" +# }}} + +# vim:ft=sh:fdm=marker diff --git a/sh/env b/sh/env new file mode 100644 index 0000000..7e945e3 --- /dev/null +++ b/sh/env @@ -0,0 +1,18 @@ +export GPG_TTY=$(tty) +export MPD_HOST=bishamon +export MANPAGER="$HOME/.bin/vimmanpager" +export PERLDOC_PAGER="$HOME/.bin/vimmanpager" +export EDITOR=$(/usr/bin/which vim) +export GIT_SSH="$HOME/.bin/ssh" +export RSYNC_RSH="$HOME/.bin/ssh" +export TEXINPUTS=".:$HOME/conf/tex:" +export LESS='-QR' +export NOPASTE_SERVICES="ssh" +export NOPASTE_SSH_SERVER="doy@paste.tozt.net" +export NOPASTE_SSH_DOCROOT="paste" +export NOPASTE_SSH_WEBPATH="http://paste.tozt.net" +export NOPASTE_SSH_MODE=0644 +export PERL_CPANM_OPT="-q --mirror file://$HOME/perl5/minicpan/ --mirror http://mirrors.kernel.org/cpan/ --mirror http://cpan.metacpan.org/ --prompt" +export FZF_DEFAULT_OPTS="--reverse --border --inline-info --bind=tab:down,shift-tab:up,change:top" + +# vim:ft=sh: diff --git a/sh/functions b/sh/functions new file mode 100644 index 0000000..d6068e0 --- /dev/null +++ b/sh/functions @@ -0,0 +1,20 @@ +function perldoc { + # XXX bash specific + if type cpandoc > /dev/null 2>&1; then + cpandoc "$@" + else + command perldoc "$@" + fi +} + +function cdu { + local root + root="$(git rev-parse --show-superproject-working-tree 2>/dev/null)" + if [ -n "$root" ]; then + cd "$root" + else + cd "$(git rev-parse --show-toplevel)" + fi +} + +# vim:ft=sh: diff --git a/sh/logout b/sh/logout new file mode 100644 index 0000000..acf55d6 --- /dev/null +++ b/sh/logout @@ -0,0 +1,5 @@ +# This file is sourced when a login shell terminates. +sudo -k +clear + +# vim:ft=sh: diff --git a/zlogout b/zlogout index 84dd371..5a1ed91 100644 --- a/zlogout +++ b/zlogout @@ -1,4 +1,4 @@ # This file is sourced when a login shell terminates. -source ~/.logout +source ~/.sh/logout # vim:ft=zsh: diff --git a/zshrc b/zshrc index c9237a1..25bc92e 100644 --- a/zshrc +++ b/zshrc @@ -2,7 +2,7 @@ # not using .zshenv, because it runs before /etc/profile, and /etc/profile # tends to hard-set $PATH and such export PATH="/usr/share/git/diff-highlight:${HOME}/.bin/local:${HOME}/.bin:/usr/lib/ccache/bin:$PATH" -[ -f "$HOME/.env" ] && source $HOME/.env +[ -f "$HOME/.sh/env" ] && source $HOME/.sh/env # }}} # language environments {{{ test -f $HOME/perl5/perlbrew/etc/bashrc && source $HOME/perl5/perlbrew/etc/bashrc @@ -20,8 +20,8 @@ case ${TERM} in ;; esac # }}} # aliases {{{ -[ -f "$HOME/.aliases" ] && source $HOME/.aliases -[ -f "$HOME/.functions" ] && source $HOME/.functions +[ -f "$HOME/.sh/aliases" ] && source $HOME/.sh/aliases +[ -f "$HOME/.sh/functions" ] && source $HOME/.sh/functions mkdir -p $HOME/.cache/vim/hist function vim { local zsh_hist_fname -- cgit v1.2.3-54-g00ecf