Add a number of plugins and commit some outstanding crud

This commit is contained in:
R. Tyler Croy 2014-11-22 17:57:55 -08:00
parent c4ce71d57e
commit 0aa0bee0fe
10 changed files with 241 additions and 1189 deletions

18
.gitmodules vendored
View File

@ -22,3 +22,21 @@
[submodule "dotvim/bundle/vim-indent-guides"]
path = dotvim/bundle/vim-indent-guides
url = git://github.com/nathanaelkane/vim-indent-guides.git
[submodule "dotvim/bundle/ack.vim"]
path = dotvim/bundle/ack.vim
url = git://github.com/mileszs/ack.vim.git
[submodule "dotvim/bundle/vim-colors-solarized"]
path = dotvim/bundle/vim-colors-solarized
url = git://github.com/altercation/vim-colors-solarized.git
[submodule "dotvim/bundle/vim-puppet"]
path = dotvim/bundle/vim-puppet
url = git://github.com/rodjek/vim-puppet.git
[submodule "dotvim/bundle/vim-groovy"]
path = dotvim/bundle/vim-groovy
url = git://github.com/vim-scripts/groovy.vim.git
[submodule "dotvim/bundle/vim-fugitive"]
path = dotvim/bundle/vim-fugitive
url = git://github.com/tpope/vim-fugitive.git
[submodule "dotvim/bundle/vim-gradle"]
path = dotvim/bundle/vim-gradle
url = git://github.com/tfnico/vim-gradle.git

1
dotvim/bundle/ack.vim Submodule

@ -0,0 +1 @@
Subproject commit f8d518a8dfbf8915d060bc2de4fa648b16e00137

@ -0,0 +1 @@
Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21

@ -0,0 +1 @@
Subproject commit 0374322ba5d85ae44dd9dc44ef31ca015a59097e

@ -0,0 +1 @@
Subproject commit e77153d120d23e3dc659e4b2148e469696c11022

@ -0,0 +1 @@
Subproject commit f121908b6f159d4692517587bf165c5f065fd75f

@ -0,0 +1 @@
Subproject commit 27d2af11223349088f5c7fb3187bb3184364ea12

File diff suppressed because it is too large Load Diff

View File

@ -1,54 +1,148 @@
'Tlist_Auto_Highlight_Tag' taglist.txt /*'Tlist_Auto_Highlight_Tag'*
'Tlist_Auto_Open' taglist.txt /*'Tlist_Auto_Open'*
'Tlist_Auto_Update' taglist.txt /*'Tlist_Auto_Update'*
'Tlist_Close_On_Select' taglist.txt /*'Tlist_Close_On_Select'*
'Tlist_Compact_Format' taglist.txt /*'Tlist_Compact_Format'*
'Tlist_Ctags_Cmd' taglist.txt /*'Tlist_Ctags_Cmd'*
'Tlist_Display_Prototype' taglist.txt /*'Tlist_Display_Prototype'*
'Tlist_Display_Tag_Scope' taglist.txt /*'Tlist_Display_Tag_Scope'*
'Tlist_Enable_Fold_Column' taglist.txt /*'Tlist_Enable_Fold_Column'*
'Tlist_Exit_OnlyWindow' taglist.txt /*'Tlist_Exit_OnlyWindow'*
'Tlist_File_Fold_Auto_Close' taglist.txt /*'Tlist_File_Fold_Auto_Close'*
'Tlist_GainFocus_On_ToggleOpen' taglist.txt /*'Tlist_GainFocus_On_ToggleOpen'*
'Tlist_Highlight_Tag_On_BufEnter' taglist.txt /*'Tlist_Highlight_Tag_On_BufEnter'*
'Tlist_Inc_Winwidth' taglist.txt /*'Tlist_Inc_Winwidth'*
'Tlist_Max_Submenu_Items' taglist.txt /*'Tlist_Max_Submenu_Items'*
'Tlist_Max_Tag_Length' taglist.txt /*'Tlist_Max_Tag_Length'*
'Tlist_Process_File_Always' taglist.txt /*'Tlist_Process_File_Always'*
'Tlist_Show_Menu' taglist.txt /*'Tlist_Show_Menu'*
'Tlist_Show_One_File' taglist.txt /*'Tlist_Show_One_File'*
'Tlist_Sort_Type' taglist.txt /*'Tlist_Sort_Type'*
'Tlist_Use_Horiz_Window' taglist.txt /*'Tlist_Use_Horiz_Window'*
'Tlist_Use_Right_Window' taglist.txt /*'Tlist_Use_Right_Window'*
'Tlist_Use_SingleClick' taglist.txt /*'Tlist_Use_SingleClick'*
'Tlist_WinHeight' taglist.txt /*'Tlist_WinHeight'*
'Tlist_WinWidth' taglist.txt /*'Tlist_WinWidth'*
:AdaLines ft_ada.txt /*:AdaLines*
:AdaRainbow ft_ada.txt /*:AdaRainbow*
:AdaSpaces ft_ada.txt /*:AdaSpaces*
:AdaTagDir ft_ada.txt /*:AdaTagDir*
:AdaTagFile ft_ada.txt /*:AdaTagFile*
:AdaTypes ft_ada.txt /*:AdaTypes*
:GnatFind ft_ada.txt /*:GnatFind*
:GnatPretty ft_ada.txt /*:GnatPretty*
:GnatTags ft_ada.txt /*:GnatTags*
:MatchDebug matchit.txt /*:MatchDebug*
:Snippet snippets_emu.txt /*:Snippet*
:TlistAddFiles taglist.txt /*:TlistAddFiles*
:TlistAddFilesRecursive taglist.txt /*:TlistAddFilesRecursive*
:TlistClose taglist.txt /*:TlistClose*
:TlistDebug taglist.txt /*:TlistDebug*
:TlistHighlightTag taglist.txt /*:TlistHighlightTag*
:TlistLock taglist.txt /*:TlistLock*
:TlistMessages taglist.txt /*:TlistMessages*
:TlistOpen taglist.txt /*:TlistOpen*
:TlistSessionLoad taglist.txt /*:TlistSessionLoad*
:TlistSessionSave taglist.txt /*:TlistSessionSave*
:TlistShowPrototype taglist.txt /*:TlistShowPrototype*
:TlistShowTag taglist.txt /*:TlistShowTag*
:TlistToggle taglist.txt /*:TlistToggle*
:TlistUndebug taglist.txt /*:TlistUndebug*
:TlistUnlock taglist.txt /*:TlistUnlock*
:TlistUpdate taglist.txt /*:TlistUpdate*
CreateBundleSnippet snippets_emu.txt /*CreateBundleSnippet*
CreateSnippet snippets_emu.txt /*CreateSnippet*
Tlist_Get_Tag_Prototype_By_Line() taglist.txt /*Tlist_Get_Tag_Prototype_By_Line()*
Tlist_Get_Tagname_By_Line() taglist.txt /*Tlist_Get_Tagname_By_Line()*
Tlist_Set_App() taglist.txt /*Tlist_Set_App()*
Tlist_Update_File_Tags() taglist.txt /*Tlist_Update_File_Tags()*
MatchError matchit.txt /*MatchError*
[% matchit.txt /*[%*
]% matchit.txt /*]%*
ada#Create_Tags() ft_ada.txt /*ada#Create_Tags()*
ada#Jump_Tag() ft_ada.txt /*ada#Jump_Tag()*
ada#Listtags() ft_ada.txt /*ada#Listtags()*
ada#Switch_Syntax_Option() ft_ada.txt /*ada#Switch_Syntax_Option()*
ada#Word() ft_ada.txt /*ada#Word()*
ada-compiler ft_ada.txt /*ada-compiler*
ada-ctags ft_ada.txt /*ada-ctags*
ada-extra-plugins ft_ada.txt /*ada-extra-plugins*
ada-reference ft_ada.txt /*ada-reference*
ada.vim ft_ada.txt /*ada.vim*
b:match_col matchit.txt /*b:match_col*
b:match_debug matchit.txt /*b:match_debug*
b:match_ignorecase matchit.txt /*b:match_ignorecase*
b:match_ini matchit.txt /*b:match_ini*
b:match_iniBR matchit.txt /*b:match_iniBR*
b:match_match matchit.txt /*b:match_match*
b:match_pat matchit.txt /*b:match_pat*
b:match_skip matchit.txt /*b:match_skip*
b:match_table matchit.txt /*b:match_table*
b:match_tail matchit.txt /*b:match_tail*
b:match_wholeBR matchit.txt /*b:match_wholeBR*
b:match_word matchit.txt /*b:match_word*
b:match_words matchit.txt /*b:match_words*
basic-snippet snippets_emu.txt /*basic-snippet*
compiler-compaqada ft_ada.txt /*compiler-compaqada*
compiler-decada ft_ada.txt /*compiler-decada*
compiler-gnat ft_ada.txt /*compiler-gnat*
compiler-hpada ft_ada.txt /*compiler-hpada*
compiler-vaxada ft_ada.txt /*compiler-vaxada*
creating-snippets snippets_emu.txt /*creating-snippets*
cs surround.txt /*cs*
decada_members ft_ada.txt /*decada_members*
ds surround.txt /*ds*
ft-ada-commands ft_ada.txt /*ft-ada-commands*
ft-ada-constants ft_ada.txt /*ft-ada-constants*
ft-ada-functions ft_ada.txt /*ft-ada-functions*
ft-ada-indent ft_ada.txt /*ft-ada-indent*
ft-ada-omni ft_ada.txt /*ft-ada-omni*
ft-ada-options ft_ada.txt /*ft-ada-options*
ft-ada-plugin ft_ada.txt /*ft-ada-plugin*
ft-ada-syntax ft_ada.txt /*ft-ada-syntax*
ft-ada-variables ft_ada.txt /*ft-ada-variables*
ft_ada.txt ft_ada.txt /*ft_ada.txt*
g% matchit.txt /*g%*
g:ada#Comment ft_ada.txt /*g:ada#Comment*
g:ada#Ctags_Kinds ft_ada.txt /*g:ada#Ctags_Kinds*
g:ada#DotWordRegex ft_ada.txt /*g:ada#DotWordRegex*
g:ada#Keywords ft_ada.txt /*g:ada#Keywords*
g:ada#WordRegex ft_ada.txt /*g:ada#WordRegex*
g:ada_abbrev ft_ada.txt /*g:ada_abbrev*
g:ada_all_tab_usage ft_ada.txt /*g:ada_all_tab_usage*
g:ada_begin_preproc ft_ada.txt /*g:ada_begin_preproc*
g:ada_default_compiler ft_ada.txt /*g:ada_default_compiler*
g:ada_extended_completion ft_ada.txt /*g:ada_extended_completion*
g:ada_extended_tagging ft_ada.txt /*g:ada_extended_tagging*
g:ada_folding ft_ada.txt /*g:ada_folding*
g:ada_gnat_extensions ft_ada.txt /*g:ada_gnat_extensions*
g:ada_line_errors ft_ada.txt /*g:ada_line_errors*
g:ada_no_tab_space_error ft_ada.txt /*g:ada_no_tab_space_error*
g:ada_no_trail_space_error ft_ada.txt /*g:ada_no_trail_space_error*
g:ada_omni_with_keywords ft_ada.txt /*g:ada_omni_with_keywords*
g:ada_rainbow_color ft_ada.txt /*g:ada_rainbow_color*
g:ada_space_errors ft_ada.txt /*g:ada_space_errors*
g:ada_standard_types ft_ada.txt /*g:ada_standard_types*
g:ada_with_gnat_project_files ft_ada.txt /*g:ada_with_gnat_project_files*
g:ada_withuse_ordinary ft_ada.txt /*g:ada_withuse_ordinary*
g:decada ft_ada.txt /*g:decada*
g:decada.Error_Format ft_ada.txt /*g:decada.Error_Format*
g:decada.Make() ft_ada.txt /*g:decada.Make()*
g:decada.Make_Command ft_ada.txt /*g:decada.Make_Command*
g:decada.Unit_Name() ft_ada.txt /*g:decada.Unit_Name()*
g:gnat ft_ada.txt /*g:gnat*
g:gnat.Error_Format ft_ada.txt /*g:gnat.Error_Format*
g:gnat.Find() ft_ada.txt /*g:gnat.Find()*
g:gnat.Find_Program ft_ada.txt /*g:gnat.Find_Program*
g:gnat.Make() ft_ada.txt /*g:gnat.Make()*
g:gnat.Make_Command ft_ada.txt /*g:gnat.Make_Command*
g:gnat.Pretty() ft_ada.txt /*g:gnat.Pretty()*
g:gnat.Pretty_Program ft_ada.txt /*g:gnat.Pretty_Program*
g:gnat.Project_File ft_ada.txt /*g:gnat.Project_File*
g:gnat.Set_Project_File() ft_ada.txt /*g:gnat.Set_Project_File()*
g:gnat.Tags() ft_ada.txt /*g:gnat.Tags()*
g:gnat.Tags_Command ft_ada.txt /*g:gnat.Tags_Command*
g:tagbar_autoclose tagbar.txt /*g:tagbar_autoclose*
g:tagbar_autofocus tagbar.txt /*g:tagbar_autofocus*
g:tagbar_autoshowtag tagbar.txt /*g:tagbar_autoshowtag*
g:tagbar_compact tagbar.txt /*g:tagbar_compact*
g:tagbar_ctags_bin tagbar.txt /*g:tagbar_ctags_bin*
g:tagbar_expand tagbar.txt /*g:tagbar_expand*
g:tagbar_foldlevel tagbar.txt /*g:tagbar_foldlevel*
g:tagbar_left tagbar.txt /*g:tagbar_left*
g:tagbar_sort tagbar.txt /*g:tagbar_sort*
g:tagbar_usearrows tagbar.txt /*g:tagbar_usearrows*
g:tagbar_width tagbar.txt /*g:tagbar_width*
gnat#Insert_Tags_Header() ft_ada.txt /*gnat#Insert_Tags_Header()*
gnat#New() ft_ada.txt /*gnat#New()*
gnat-xref ft_ada.txt /*gnat-xref*
gnat_members ft_ada.txt /*gnat_members*
i_CTRL-G_S surround.txt /*i_CTRL-G_S*
i_CTRL-G_s surround.txt /*i_CTRL-G_s*
matchit matchit.txt /*matchit*
matchit-% matchit.txt /*matchit-%*
matchit-\1 matchit.txt /*matchit-\\1*
matchit-activate matchit.txt /*matchit-activate*
matchit-backref matchit.txt /*matchit-backref*
matchit-bugs matchit.txt /*matchit-bugs*
matchit-choose matchit.txt /*matchit-choose*
matchit-configure matchit.txt /*matchit-configure*
matchit-debug matchit.txt /*matchit-debug*
matchit-details matchit.txt /*matchit-details*
matchit-highlight matchit.txt /*matchit-highlight*
matchit-hl matchit.txt /*matchit-hl*
matchit-intro matchit.txt /*matchit-intro*
matchit-languages matchit.txt /*matchit-languages*
matchit-modes matchit.txt /*matchit-modes*
matchit-newlang matchit.txt /*matchit-newlang*
matchit-o_% matchit.txt /*matchit-o_%*
matchit-parse matchit.txt /*matchit-parse*
matchit-s:notend matchit.txt /*matchit-s:notend*
matchit-s:sol matchit.txt /*matchit-s:sol*
matchit-spaces matchit.txt /*matchit-spaces*
matchit-troubleshoot matchit.txt /*matchit-troubleshoot*
matchit-v_% matchit.txt /*matchit-v_%*
matchit.txt matchit.txt /*matchit.txt*
matchit.vim matchit.txt /*matchit.vim*
named-tags snippets_emu.txt /*named-tags*
o_[% matchit.txt /*o_[%*
o_]% matchit.txt /*o_]%*
o_g% matchit.txt /*o_g%*
snip-advanced-tag-commands snippets_emu.txt /*snip-advanced-tag-commands*
snip-buffer-specific snippets_emu.txt /*snip-buffer-specific*
snip-bundles snippets_emu.txt /*snip-bundles*
@ -70,20 +164,40 @@ snippets_emu-features snippets_emu.txt /*snippets_emu-features*
snippets_emu-options snippets_emu.txt /*snippets_emu-options*
snippets_emu-troubleshooting snippets_emu.txt /*snippets_emu-troubleshooting*
snippets_emu.txt snippets_emu.txt /*snippets_emu.txt*
taglist-commands taglist.txt /*taglist-commands*
taglist-debug taglist.txt /*taglist-debug*
taglist-extend taglist.txt /*taglist-extend*
taglist-faq taglist.txt /*taglist-faq*
taglist-functions taglist.txt /*taglist-functions*
taglist-install taglist.txt /*taglist-install*
taglist-internet taglist.txt /*taglist-internet*
taglist-intro taglist.txt /*taglist-intro*
taglist-keys taglist.txt /*taglist-keys*
taglist-license taglist.txt /*taglist-license*
taglist-menu taglist.txt /*taglist-menu*
taglist-options taglist.txt /*taglist-options*
taglist-requirements taglist.txt /*taglist-requirements*
taglist-session taglist.txt /*taglist-session*
taglist-todo taglist.txt /*taglist-todo*
taglist-using taglist.txt /*taglist-using*
taglist.txt taglist.txt /*taglist.txt*
surround surround.txt /*surround*
surround-author surround.txt /*surround-author*
surround-customizing surround.txt /*surround-customizing*
surround-issues surround.txt /*surround-issues*
surround-mappings surround.txt /*surround-mappings*
surround-replacements surround.txt /*surround-replacements*
surround-targets surround.txt /*surround-targets*
surround.txt surround.txt /*surround.txt*
tagbar tagbar.txt /*tagbar*
tagbar-autoopen tagbar.txt /*tagbar-autoopen*
tagbar-bugs tagbar.txt /*tagbar-bugs*
tagbar-commands tagbar.txt /*tagbar-commands*
tagbar-configuration tagbar.txt /*tagbar-configuration*
tagbar-contents tagbar.txt /*tagbar-contents*
tagbar-credits tagbar.txt /*tagbar-credits*
tagbar-extend tagbar.txt /*tagbar-extend*
tagbar-features tagbar.txt /*tagbar-features*
tagbar-highlight tagbar.txt /*tagbar-highlight*
tagbar-history tagbar.txt /*tagbar-history*
tagbar-installation tagbar.txt /*tagbar-installation*
tagbar-intro tagbar.txt /*tagbar-intro*
tagbar-keys tagbar.txt /*tagbar-keys*
tagbar-other tagbar.txt /*tagbar-other*
tagbar-pseudotags tagbar.txt /*tagbar-pseudotags*
tagbar-requirements tagbar.txt /*tagbar-requirements*
tagbar-todo tagbar.txt /*tagbar-todo*
tagbar-usage tagbar.txt /*tagbar-usage*
tagbar.txt tagbar.txt /*tagbar.txt*
v_[% matchit.txt /*v_[%*
v_]% matchit.txt /*v_]%*
v_a% matchit.txt /*v_a%*
v_g% matchit.txt /*v_g%*
vs surround.txt /*vs*
yS surround.txt /*yS*
ySS surround.txt /*ySS*
ys surround.txt /*ys*
yss surround.txt /*yss*

View File

@ -96,6 +96,13 @@ function! Tabstyle_spaces()
set expandtab
endfunction
function! Tabstyle_ada()
" Use 3 spaces and what not
set shiftwidth=3
set softtabstop=3
set expandtab
endfunction
" Tabs should be converted to a group of 4 spaces.
" indent length with < >
set shiftwidth=4
@ -160,9 +167,9 @@ set mousehide
" Colors **********************************************************************
syntax enable
set background=dark
set bg=dark
let g:solarized_termcolors=256
let g:solarized_contrast="high"
let g:solarized_contrast="normal"
let g:zenburn_force_dark_Background = 1
let g:zenburn_alternate_Visual = 1
@ -174,6 +181,7 @@ if has("gui_running")
set lines=73 columns=260
else
" colorscheme tango
" colorscheme darkblue
colorscheme jellybeans
" colorscheme Tomorrow-Night
" colorscheme zenburn
@ -196,6 +204,7 @@ autocmd FileType css set omnifunc=csscomplete#CompleteCSS
autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags
autocmd FileType php set omnifunc=phpcomplete#CompletePHP
autocmd FileType c set omnifunc=ccomplete#Complete
autocmd FileType groovy set autoindent
" bind ctrl+space for omnicompletion
inoremap <Nul> <C-x><C-o>
@ -249,12 +258,15 @@ au FileType c,cpp,slang set cindent
" characters, if starting a new line in the middle of a comment automatically
" insert the comment leader characters:
au FileType c set formatoptions+=ro
au FileType c call Tabstyle_tabs()
" for Perl programming, have things in braces indenting themselves:
au FileType perl set smartindent
au FileType python set formatoptions-=t
au FileType ruby call Tabstyle_spaces()
au FIleType ada call Tabstyle_ada()
au FileType python call Tabstyle_spaces()
" for CSS, also have things in braces indented:
au FileType css set smartindent
@ -494,7 +506,7 @@ imap <Leader>tt <Esc>:execute "normal i" . strftime("%a %d %b %Y")<Esc>i
" -----------------------------------------------------------------------------
"Taglist
map \a :TagbarToggle<CR>
let g:tagbar_left = 0
let g:tagbar_left = 1
"NERDTree
@ -518,6 +530,7 @@ let g:netrw_special_syntax = 1
highlight RedundantWhitespace ctermbg=red guibg=red
match RedundantWhitespace /\s\+$\| \+\ze\t/
set lcs=tab:»»,trail:·,eol:·
"set lcs=tab:\.\.,trail:-,eol:$
set list
" Find and remove all trailing whitespace
@ -543,13 +556,13 @@ highlight DiffDelete term=reverse cterm=bold ctermbg=red ctermfg=black
set colorcolumn=81
hi ColorColumn ctermbg=59 ctermfg=white
"function! SetupEnv()
" TagbarOpen
"endfunction
"
"if !&diff
" au FileType ada,c,cpp,ruby,python call SetupEnv()
"endif
function! SetupEnv()
"TagbarOpen
endfunction
if !&diff
au FileType ada,c,cpp,ruby,python call SetupEnv()
endif
if !&diff
set foldmethod=syntax
@ -559,3 +572,21 @@ if !&diff
set complete-=i
endif
function! PuppetConfiguration()
set tabstop=2
set shiftwidth=2
set autoindent
set expandtab
endfunction
au FileType puppet call PuppetConfiguration()
" Use the old regex engine which doesn't slow to a crawl on Ruby syntax
" highlighting
set re=1
set bg=dark
"colorscheme solarized
noremap <Leader>s :Ack <cword><cr>