# HG changeset patch # User zegervdv # Date 1407663447 -7200 # Node ID a25bdb562e433aa8fd487fa9af09aacba9ac821c # Parent 368f742876cf14b27b183bb810283b1b267bda8e Fix zsh prompt diff -r 368f742876cf -r a25bdb562e43 oh-my-zsh/themes/custom.zsh-theme --- a/oh-my-zsh/themes/custom.zsh-theme Sun Aug 10 11:32:00 2014 +0200 +++ b/oh-my-zsh/themes/custom.zsh-theme Sun Aug 10 11:37:27 2014 +0200 @@ -13,7 +13,7 @@ git=0 fi -PROMPT='%{$fg[cyan]%}%n%{$reset_color%} in %{$fg[yellow]%}%~%b%{$reset_color%} +PROMPT='%{$fg[cyan]%}%n@%m%{$reset_color%} in %{$fg[yellow]%}%~%b%{$reset_color%} %{$reset_color%}%(?.%{$fg[white]%}.%{$fg[red]%})→ %{$reset_color%}' diff -r 368f742876cf -r a25bdb562e43 vim/spell/nl.utf-8.add --- a/vim/spell/nl.utf-8.add Sun Aug 10 11:32:00 2014 +0200 +++ b/vim/spell/nl.utf-8.add Sun Aug 10 11:37:27 2014 +0200 @@ -1,3 +1,4 @@ gealigneerd Zeger Vannet +Bluetooth diff -r 368f742876cf -r a25bdb562e43 vimrc --- a/vimrc Sun Aug 10 11:32:00 2014 +0200 +++ b/vimrc Sun Aug 10 11:37:27 2014 +0200 @@ -430,9 +430,11 @@ let g:unite_source_rec_max_cache_files=5000 let g:unite_prompt='» ' if executable('ag') - let g:unite_source_grep_command='ag' - let g:unite_source_grep_default_opts='--nocolor --line-numbers --nogroup -S -C4' - let g:unite_source_grep_recursive_opt='' + let g:unite_source_grep_command = 'ag' + let g:unite_source_grep_default_opts = + \ '-i --line-numbers --nocolor --nogroup --hidden --ignore ' . + \ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' + let g:unite_source_grep_recursive_opt = '' elseif executable('ack') let g:unite_source_grep_command='ack' let g:unite_source_grep_default_opts='--no-heading --no-color -C4' @@ -481,9 +483,8 @@ " Neo Complete {{{ let g:neocomplete#enable_at_startup = 1 let g:neocomplet#enable_smart_case = 1 -let g:jedi#auto_vim_configuration = 0 -let g:jedi#completions_enabled = 0 let g:marching_enable_neocomplete = 1 +let g:neocomplete#enable_fuzzy_completion = 1 inoremap pumvisible() ? neocomplete#smart_close_popup()"\" : "\" inoremap neocomplete#undo_completion() @@ -579,6 +580,7 @@ " }}} " Jedi {{{ let g:jedi#auto_vim_configuration=0 +let g:jedi#completions_enabled = 0 " }}} " Load local vimrc