Hoisted includes, simplified syntax

Also improved bash tab completion a ton
This commit is contained in:
Josh Sherman 2017-12-24 15:23:09 -06:00
parent b1a8b114d9
commit fc7b21429b
No known key found for this signature in database
GPG key ID: 55B058A80530EF22
2 changed files with 10 additions and 13 deletions

11
bashrc
View file

@ -2,9 +2,10 @@
export DOTFILES=$HOME/.dotfiles
source $DOTFILES/env
source $DOTFILES/aliases
[ -f $DOTFILES/env ] && source $DOTFILES/env
[ -f $DOTFILES/aliases ] && source $DOTFILES/aliases
[ -x /usr/bin/dircolors ] && eval `dircolors $DOTFILES/dircolors`
[ -f ~/.fzf.bash ] && source ~/.fzf.bash
if [ -x /usr/bin/dircolors ]; then
eval `dircolors $DOTFILES/dircolors`
fi
bind 'set show-all-if-ambiguous on'
bind 'TAB:menu-complete'

12
zshrc
View file

@ -2,12 +2,10 @@
export DOTFILES=$HOME/.dotfiles
source $DOTFILES/env
source $DOTFILES/aliases
if [ -x /usr/bin/dircolors ]; then
eval `dircolors $DOTFILES/dircolors`
fi
[ -f $DOTFILES/env ] && source $DOTFILES/env
[ -f $DOTFILES/aliases ] && source $DOTFILES/aliases
[ -x /usr/bin/dircolors ] && eval `dircolors $DOTFILES/dircolors`
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
fpath=($DOTFILES/vendor/zsh-users/zsh-completions/src $fpath)
@ -122,5 +120,3 @@ bindkey '\eOA' history-substring-search-up
bindkey '\eOB' history-substring-search-down
bindkey -M vicmd 'k' history-substring-search-up
bindkey -M vicmd 'j' history-substring-search-down
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh