diff --git a/.gitmodules b/.gitmodules index 3ab81ad..dc32563 100644 --- a/.gitmodules +++ b/.gitmodules @@ -69,3 +69,6 @@ [submodule "bundle/vim-jinja"] path = bundle/vim-jinja url = https://github.com/lepture/vim-jinja.git +[submodule "bundle/command-t"] + path = bundle/command-t + url = https://github.com/wincent/command-t.git diff --git a/.vimrc b/.vimrc index f168a69..523ea1c 100644 --- a/.vimrc +++ b/.vimrc @@ -44,8 +44,10 @@ set linebreak " search in sub folders set path+=** -" Display matching files when tab completing +" Display matching files when tab completing - ignoring files that I probably +" dont want to match set wildmenu +set wildignore+=*.min.js,*.min.css,*/node_modules/*,*/dist/* " Time vim waits to see if you are pushing another key set timeoutlen=500 @@ -82,8 +84,8 @@ set showcmd "Ps = 4 -> steady underline. "Ps = 5 -> blinking bar (xterm). "Ps = 6 -> steady bar (xterm). -" let &t_SI = "\e[5 q" -" let &t_EI = "\e[1 q" +let &t_SI = "\e[5 q" +let &t_EI = "\e[1 q" " optional reset cursor on start: " augroup myCmds @@ -407,6 +409,9 @@ inoremap :exe "norm Ypf lDB\"A nnoremap ev :vsplit $MYVIMRC nnoremap sv :source $MYVIMRC +" use command t to search help topics +nmap h (CommandTHelp) + " add new line without entering insert mode nnoremap o nnoremap O @@ -427,47 +432,6 @@ iabbrev @@@ jonathan@lunarweb.co.uk -" Start Screen Settings {{{1 -fun! Start() - " Don't run if: we have commandline arguments, we don't have an empty - " buffer, if we've not invoked as vim or gvim, or if we'e start in insert mode - if argc() || line2byte('$') != -1 || v:progname !~? '^[-gmnq]\=vim\=x\=\%[\.exe]$' || &insertmode - return - endif - - " Start a new buffer ... - enew - - " ... and set some options for it - setlocal - \ bufhidden=wipe - \ buftype=nofile - \ nobuflisted - \ nocursorcolumn - \ nocursorline - \ nolist - \ nonumber - \ noswapfile - \ norelativenumber - - " Now we can just write to the buffer, whatever you want. - call append('$', "") - for line in split(system('fortune -a | cowsay'), '\n') - call append('$', ' ' . l:line) - endfor - - " No modifications to this buffer - setlocal nomodifiable nomodified - - " When we go to insert mode start a new buffer, and start insert - nnoremap e :enew - nnoremap i :enew startinsert - nnoremap o :enew startinsert -endfun - -" Run after "doing all the startup stuff" -" autocmd VimEnter * call Start() - " File Type Specific {{{1 "Make web files fold on indent {{{2 augroup file_web diff --git a/bundle/command-t b/bundle/command-t new file mode 160000 index 0000000..57e112c --- /dev/null +++ b/bundle/command-t @@ -0,0 +1 @@ +Subproject commit 57e112c12c99185e062a4330896cfaf422d1ea64