Commit c069f771 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch 'feature/vim-ide'

parents 35c4e632 cb7c27d4

.gitmodules

+6 −0
Original line number Diff line number Diff line
@@ -13,3 +13,9 @@ 
[submodule ".vim/bundle/vim-fugitive"]

	path = .vim/bundle/vim-fugitive

	url = git://github.com/tpope/vim-fugitive.git

[submodule ".vim/bundle/vim-dispatch"]

	path = .vim/bundle/vim-dispatch

	url = git://github.com/tpope/vim-dispatch.git

[submodule "/home/dom/.vim/bundle/vim-ctrlspace"]

	path = .vim/bundle/vim-ctrlspace

	url = https://github.com/vim-ctrlspace/vim-ctrlspace.git

vim-ctrlspace @ f7987e4e

Original line number Diff line number Diff line 
Subproject commit f7987e4e21b238732632be704d033a73aacbb65d

vim-dispatch @ 5f5c22c9

Original line number Diff line number Diff line 
Subproject commit 5f5c22c9ed48ee64fc5f02ac3acd543b97732fe8

.vimrc

+22 −0
Original line number Diff line number Diff line
@@ -13,14 +13,36 @@ set fo-=t 
" Exec project-local RC files

set exrc





" === COMPILING ===

nnoremap <F1> :Dispatch<CR>





" === WINDOWS & BUFFERS ===



" Split controls

set splitbelow

set splitright

set switchbuf=split

noremap <C-J> <C-W><C-J>

noremap <C-K> <C-W><C-K>

noremap <C-H> <C-W><C-H>

noremap <C-L> <C-W><C-L>



" Buffer management controls

noremap <C-^> :b! #<CR>



" vim-ctrlspace plugin settings

set nocompatible

set hidden

if executable("list-files")

	let g:CtrlSpaceGlobCommand = 'list-files'

elseif executable("ag")

	let g:CtrlSpaceGlobCommand = 'ag -Ul --nocolor -g "" --hidden --ignore .git --ignore .svn --ignore .hg'

endif

let g:CtrlSpaceSaveWorkspaceOnSwitch = 1

let g:CtrlSpaceSaveWorkspaceOnExit = 1



" Modeline

set modeline

set ls=2