diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aliases.zsh | 6 | ||||
| -rw-r--r-- | lib/completion.zsh | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 9e2087728..c4428d405 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -42,7 +42,8 @@ alias gcp='git cherry-pick' alias history='fc -l 1' # List direcory contents -#alias ls='ls -F' # This messes up colors on my linux system +alias ls='ls -F' +alias lsa='ls -lahG' alias l='ls -la' alias ll='ls -alr' alias sl=ls # often screw this up @@ -61,6 +62,8 @@ alias et='mate . &' alias ett='mate app config lib db public spec test Rakefile Capfile Todo &' alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' +<<<<<<< HEAD:lib/aliases.zsh +======= ## Ruby related # Ruby scripts @@ -70,3 +73,4 @@ alias sd='ruby script/server --debugger' # Editor Ruby file in TextMate alias mr='mate CHANGELOG app config db lib public script spec test' +>>>>>>> 886d97f41e72b8662232a2c6b196fb60508e4f67:lib/aliases.zsh diff --git a/lib/completion.zsh b/lib/completion.zsh index 7a564d640..deeb52824 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -14,7 +14,12 @@ compinit zmodload -i zsh/complist ## case-insensitive (all),partial-word and then substring completion -#zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' +if [ "x$CASE_SENSITIVE" = "xtrue" ]; then + zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' + unset CASE_SENSITIVE +else + zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' +fi zstyle ':completion:*' list-colors '' zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts ) @@ -36,4 +41,4 @@ zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/ # zstyle ':completion:*:history-words' stop yes # zstyle ':completion:*:history-words' remove-all-dups yes # zstyle ':completion:*:history-words' list false -# zstyle ':completion:*:history-words' menu yes
\ No newline at end of file +# zstyle ':completion:*:history-words' menu yes |