summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2017-10-30 04:37:32 -0400
committerJesse Luehrs <doy@tozt.net>2017-10-30 04:39:37 -0400
commitbd593bdeb9cd5effed8dc6f017dc8f8db8ff221b (patch)
tree522346cda7cadfdda8ebd7c1791c5f1b8e8fc3b8
parent24c058fba26cb7f4414e0c25123fc1bab7797e59 (diff)
downloadconf-bd593bdeb9cd5effed8dc6f017dc8f8db8ff221b.tar.gz
conf-bd593bdeb9cd5effed8dc6f017dc8f8db8ff221b.zip
move shared shell files to ~/.sh
-rw-r--r--Makefile4
-rw-r--r--bash_logout2
-rw-r--r--bashrc6
-rw-r--r--sh/aliases (renamed from aliases)0
-rw-r--r--sh/env (renamed from env)0
-rw-r--r--sh/functions (renamed from functions)0
-rw-r--r--sh/logout (renamed from logout)0
-rw-r--r--zlogout2
-rw-r--r--zshrc6
9 files changed, 8 insertions, 12 deletions
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/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/aliases b/sh/aliases
index 52ec592..52ec592 100644
--- a/aliases
+++ b/sh/aliases
diff --git a/env b/sh/env
index 7e945e3..7e945e3 100644
--- a/env
+++ b/sh/env
diff --git a/functions b/sh/functions
index d6068e0..d6068e0 100644
--- a/functions
+++ b/sh/functions
diff --git a/logout b/sh/logout
index acf55d6..acf55d6 100644
--- a/logout
+++ b/sh/logout
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