Merge branch 'master' of v.licheni.net:stack/conf/vim

[stack/conf/vim.git] / vimrc

diff --git a/vimrc b/vimrc
index a49c5a1..562c097 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -25,13 +25,14 @@ syntax on " syntax highlighting on
 
 set background=dark
 set t_Co=256
 
 set background=dark
 set t_Co=256

-colorscheme desert 
+colorscheme morning 

 "colorscheme xoria256 
 "let g:solarized_termcolors=256
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim UI
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "colorscheme xoria256 
 "let g:solarized_termcolors=256
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim UI
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

+set nofoldenable    " disable folding

 set wildmenu " turn on wild menu
 set ruler " Always show current positions along the bottom 
 set number " turn on line numbers
 set wildmenu " turn on wild menu
 set ruler " Always show current positions along the bottom 
 set number " turn on line numbers


@@ -225,8 +226,8 @@ exec 'set runtimepath+='.vam_install_path.'/vim-addon-manager'
 let ft_addons = {
     \ 'always': ['desert', 'gnupg', 'surround', 'checksyntax', 'quickfixsigns', 'LargeFile', 'snipmate', 'snipmate-snippets', 'The_NERD_tree', 'SuperTab%1643', 'fugitive'],
     \ 'r': [ 'Screen_vim__gnu_screentmux', 'Vim-R-plugin' ],
 let ft_addons = {
     \ 'always': ['desert', 'gnupg', 'surround', 'checksyntax', 'quickfixsigns', 'LargeFile', 'snipmate', 'snipmate-snippets', 'The_NERD_tree', 'SuperTab%1643', 'fugitive'],
     \ 'r': [ 'Screen_vim__gnu_screentmux', 'Vim-R-plugin' ],

-    \ '^\%(c\|cpp\|javascript\|python\|php\|html\|xml\|r\|sh\|css\|java\|make\|xslt\|vim\)$': [ 'Tagbar', 'checksyntax', 'TagHighlight'],
-    \ '^\%(c\|cpp\|h\)$': [ 'clang_complete' ],
+    \ '^\%(c\|cpp\|cuda\|javascript\|python\|php\|html\|xml\|r\|sh\|css\|java\|make\|xslt\|vim\)$': [ 'Tagbar', 'checksyntax', 'TagHighlight', 'sleuth'],
+    \ '^\%(c\|cpp\|h\|cuda\)$': [ 'clang_complete' ],

     \ 'python': [ 'python_pydoc'],
     \ 'php': ['phpcomplete', 'PDV_-_phpDocumentor_for_Vim'],
     \ 'gpg': ['gnupg'],
     \ 'python': [ 'python_pydoc'],
     \ 'php': ['phpcomplete', 'PDV_-_phpDocumentor_for_Vim'],
     \ 'gpg': ['gnupg'],