Commits

Tanel Liiv committed c31d37a

Changed a few plugins, tweaks

Comments (0)

Files changed (1)

 " TaskList for finding NOTE, FIXME, etc
 Bundle 'TaskList.vim'
 " Python support
-Bundle 'python.vim'
+Bundle 'hdima/vim-scripts', {'rtp': 'tree/master/syntax/python/'}
 " Matches html tags with %
 Bundle 'MatchTag'
 " Epic looking statusbar
 " Bundle 'ZenCoding.vim'
 " Cool fuzzy finder, <c-p> is epic
 Bundle 'ctrlp.vim'
+" Good commenter
+Bundle 'tComment'
 
 " Colorscheme
 Bundle 'xterm16.vim'
 " Nice colorscheme
 Bundle 'darkspectrum'
 
+
 " }}}
 
-
+"
 " ~/.vimrc
 "
 
   "colorscheme mustang
   "colorscheme badwolf
   "colorscheme BusyBee
-  "colorscheme hemisu
+  colorscheme hemisu
   "colorscheme vibrantink
   "colorscheme desert256
-  colorscheme 256-grayvim
+  "colorscheme 256-grayvim
   "colorscheme solarized
   "colorscheme blackboard
   "colorscheme darkspectrum
   else
     hi Folded          ctermfg=245  ctermbg=249
   endif
+  " Make the line numbers always readable
+  hi LineNr            ctermfg=67  ctermbg=0
 
 else
   set t_Co=16
 nnoremap <Leader>p :diffput<cr>
 
 " comment/uncomment a visual block
-vmap <Leader>c :call CommentLines()<CR>
+vmap <Leader>c gc<CR>
 
 " macro key
 :nnoremap <F2> @q
   au FileType rst                              set nolist
 
   " file type specific commands
-  au FileType c      set formatoptions+=ro
-  au FileType make   set noexpandtab shiftwidth=8
-  au FileType python set expandtab shiftwidth=4 tabstop=4
-  au FileType c      syn match matchName /\(#define\)\@<= .*/
-  au FileType cpp    syn match matchName /\(#define\)\@<= .*/
-  au FileType text   setlocal textwidth=72
-  au FileType vim    set foldmethod=marker  " Fold .vimrc on markers
+  au FileType c                            set formatoptions+=ro
+  au FileType make                         set noexpandtab shiftwidth=8
+  au FileType python,javascript,htmldjango set expandtab shiftwidth=4 tabstop=4
+  au FileType c                            syn match matchName /\(#define\)\@<= .*/
+  au FileType cpp                          syn match matchName /\(#define\)\@<= .*/
+  au FileType text                         setlocal textwidth=72
+  au FileType vim                          set foldmethod=marker  " Fold .vimrc on markers
 
   " Show Tagbar for Python, Javascript
-  au FileType python,javascript  TagbarToggle
+  au FileType python,javascript  TagbarOpen
 endif
  " }}}
 " Functions {{{