Mercurial > dotfiles.old
changeset 80:16edf05ad21a
Fix errors with prompt
author | zegervdv <zegervdv@me.com> |
---|---|
date | Mon, 21 Jul 2014 09:58:05 +0200 |
parents | 7d3ded16eaa2 |
children | 044395254e27 |
files | oh-my-zsh/themes/custom.zsh-theme vimrc zshrc |
diffstat | 3 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/oh-my-zsh/themes/custom.zsh-theme Sun Jul 20 23:54:26 2014 +0200 +++ b/oh-my-zsh/themes/custom.zsh-theme Mon Jul 21 09:58:05 2014 +0200 @@ -6,7 +6,6 @@ eval my_orange='$FG[214]' - local git=$(git_prompt_info) if [ ${#git} != 0 ]; then ((git=${#git} - 10)) @@ -15,7 +14,7 @@ fi PROMPT='%{$fg[cyan]%}%n%{$reset_color%} in %{$fg[yellow]%}%~%b%{$reset_color%} -%{$reset_color%}%(?.%{$fg[white]%}.%{$fg[red]%})→ ' +%{$reset_color%}%(?.%{$fg[white]%}.%{$fg[red]%})→ %{$reset_color%}' RPROMPT='$my_gray$(git_prompt_info) $(git_prompt_status)%{$reset_color%}%'
--- a/vimrc Sun Jul 20 23:54:26 2014 +0200 +++ b/vimrc Mon Jul 21 09:58:05 2014 +0200 @@ -82,6 +82,8 @@ set undofile set viminfo='10,\"100,:20,%,n~/.viminfo +set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.o,*.bin,*.elf,*.hex + " set list " set listchars=tab:▸\ ,eol:¬ " }}} @@ -211,7 +213,7 @@ let g:airline_theme = 'tomorrow' -let g:airline#extensions#syntastic#enabled = 0 +let g:airline#extensions#syntastic#enabled = 1 " }}} " YankRing {{{ let g:yankring_replace_n_pkey = 'cp' @@ -232,7 +234,7 @@ map <leader>f :call RunAllFeatures()<CR> map <leader>k :call RunCurrentFeature()<CR> " }}} -" ctrl p - Fuzzy file finder {{{ +" Ctrl P - Fuzzy file finder {{{ noremap <C-p> :CtrlP<CR> let g:ctrl_map = '<c-p>' let g:ctrl_cmd = 'CtrlP' @@ -246,6 +248,11 @@ let g:ctrlp_use_caching = 0 endif +let g:ctrlp_custom_ignore = { + \ 'dir': '\v[\/]\.(git|hg|svn)$', + \ 'file': '\v\.(exe|so|dll)$', + \ } + " ctrl p - Commands map <leader>p :CtrlPCmdPalette<CR> " }}}
--- a/zshrc Sun Jul 20 23:54:26 2014 +0200 +++ b/zshrc Mon Jul 21 09:58:05 2014 +0200 @@ -33,7 +33,7 @@ # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(git z textmate sublime ruby history-substring-search brew gitfast osx terminalapp vagrant web-search gitignore brew-cask rake-fast) +plugins=(git z textmate sublime ruby history-substring-search brew gitfast osx terminalapp vagrant web-search gitignore brew-cask rake-fast colorize colored-man extract) source $ZSH/oh-my-zsh.sh @@ -66,8 +66,8 @@ # Commands alias grep="grep --color=auto" alias beer="bundle exec rake" -alias ll="ls -altr" -alias l="ls -ltr" +alias ll="ls -altrh" +alias l="ls -lthr" alias gsl="git sl" # Functions