diff --git a/bash/completion b/bash/completion index 932bc1d..d1e6b56 100644 --- a/bash/completion +++ b/bash/completion @@ -1,10 +1,9 @@ # default bash autocompletion -bash_completion_file="/etc/bash_completion" -if which brew 2>/dev/null >/dev/null; then - bash_completion_file="`brew --prefix`$bash_completion_file" +#/etc/bash_completion +#/usr/local/share/bash-completion/bash_completion +bash_completion_file="/usr/local/etc/bash_completion" +if [[ -f "$bash_completion_file" ]]; then + source "$bash_completion_file" fi -[[ -f $bash_completion_file ]] || unset bash_completion_file -[[ -n "$bash_completion_file" ]] && source "$bash_completion_file" -unset bash_completion_file # vim: ft=sh diff --git a/home/inputrc b/home/inputrc index 480bcd3..20aeb56 100644 --- a/home/inputrc +++ b/home/inputrc @@ -6,7 +6,10 @@ set convert-meta off # useful with XDG/MacOSX folders set completion-ignore-case on -#set show-all-if-ambiguous +set show-all-if-ambiguous on +set show-all-if-unmodified on +#set visible-stats on +#set page-completions off # home/end, pageup/dn, ins/del "\e[1~": beginning-of-line diff --git a/shell/homebrew b/shell/homebrew index bdbae83..cb65395 100755 --- a/shell/homebrew +++ b/shell/homebrew @@ -1,11 +1,3 @@ -# local path -PATH=/usr/local/bin:/usr/local/sbin:$PATH - -# node.js path -NODE_PATH=/usr/local/lib/node -export NODE_PATH -PATH=$PATH:/usr/local/share/npm/bin - # go PATH=$PATH:/usr/local/opt/go/libexec/bin diff --git a/shell/osx b/shell/osx deleted file mode 100755 index 40104f8..0000000 --- a/shell/osx +++ /dev/null @@ -1,3 +0,0 @@ -# OS X python user path -PATH=~/Library/Python/2.7/bin:$PATH -export PATH diff --git a/zsh/rc b/zsh/rc index 2b320cf..aa38622 100644 --- a/zsh/rc +++ b/zsh/rc @@ -14,6 +14,8 @@ source $DOTFILES_ZSH_DIR/prompt source $DOTFILES_SHELL_DIR/bundler source $DOTFILES_SHELL_DIR/go +set -o ignoreeof + source $DOTFILES_SHELL_DIR/git_prompt_info GIT_PS1_SHOWDIRTYSTATE=1 GIT_PS1_SHOWSTASHSTATE=1