Преглед изворни кода

add vim plugins powerline and tagbar

Statusbar replacement and code heirarchy.
Weiyi Lou пре 13 година
родитељ
комит
a459b11b8e
6 измењених фајлова са 50 додато и 14 уклоњено
  1. 6 0
      .gitmodules
  2. BIN
      fonts/Inconsolata-dz-Powerline.otf
  3. 9 0
      ssh/config
  4. 1 0
      vim/bundle/powerline
  5. 1 0
      vim/bundle/tagbar
  6. 33 14
      vim/vimrc

+ 6 - 0
.gitmodules

@@ -49,3 +49,9 @@
 [submodule "vim/bundle/snipmate-snippets"]
 	path = vim/bundle/snipmate-snippets
 	url = https://github.com/honza/snipmate-snippets.git
+[submodule "vim/bundle/powerline"]
+	path = vim/bundle/powerline
+	url = https://github.com/Lokaltog/vim-powerline.git
+[submodule "vim/bundle/tagbar"]
+	path = vim/bundle/tagbar
+	url = https://github.com/majutsushi/tagbar.git

BIN
fonts/Inconsolata-dz-Powerline.otf


+ 9 - 0
ssh/config

@@ -8,9 +8,18 @@ User root
 Host feni
 User root
 
+Host dev4
+User root
+
 Host dev5
 User root
 
+Host dev6
+User root
+
+Host dev7
+User root
+
 Host pavo
 User cinaeco
 

+ 1 - 0
vim/bundle/powerline

@@ -0,0 +1 @@
+Subproject commit 7f53b5c3919bde9a4259d0c725d453ef2337a4ed

+ 1 - 0
vim/bundle/tagbar

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

+ 33 - 14
vim/vimrc

@@ -1,9 +1,11 @@
 set nocompatible "Don't have to try to be compatible with old vi
+set encoding=utf-8
 
 """"""""
 "" Plugin Loading with Pathogen
 """""""""""""""""""""""""""""""""""""""""""""""""""
 call pathogen#infect()
+call pathogen#helptags()
 
 
 """"""""
@@ -105,21 +107,13 @@ hi Folded term=none cterm=none ctermfg=darkred ctermbg=none "set colour for fold
 
 set number          " show line numbers
 "set relativenumber " current line always 0 (requires 7.3 and up)
+
+
+""""""""
+"" UI - Statusline (now using powerline)
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
 set laststatus=2    " status line is second last line (not hidden by commands)
-set statusline=%f\  " short filepath
-set statusline+=%h  " help flag
-set statusline+=%w  " preview flag
-set statusline+=%r  " read-only flag
-set statusline+=%m  " modified flag
-set statusline+=%=  " left-right aligned item separator
-"set statusline+=Chr:%B/%b " character value under cursor
-set statusline+=%{fugitive#statusline()}
-if exists("*strftime")
-  set statusline+=\ \ %{strftime('%a\ %d\ %b\ %H:%M')}
-endif
-set statusline+=\ \ %-14(Line:%l/%L%)
-set statusline+=%-11(Col:%c%V%)
-set statusline+=Scroll:%P
 
 
 """"""""
@@ -187,6 +181,8 @@ nnoremap <leader>u :GundoToggle<CR>
 " Git blame with Fugitive!
 nnoremap <leader>b :Gblame<CR>
 
+" Code heirarchy with Tagbar!
+nnoremap <leader>t :TagbarToggle<CR>
 
 """"""""
 "" Key Remaps - Movement and Windows
@@ -243,6 +239,9 @@ let g:mapped_auto_closetag = 1  " Disable html autoclose plugin
 let g:did_auto_closetag = 1  " Disable html autoclose plugin
 
 
+""""""""" Powerline
+let g:Powerline_symbols = 'compatible'
+
 """"""""
 "" Functions, the Givers of Power (in order of use)
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -275,6 +274,26 @@ function! ScreenMovement(movement)
 endfunction
 
 
+""""""""
+"" Graveyard
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+"Old statusline options
+"set statusline=%f\  " short filepath
+"set statusline+=%h  " help flag
+"set statusline+=%w  " preview flag
+"set statusline+=%r  " read-only flag
+"set statusline+=%m  " modified flag
+"set statusline+=%=  " left-right aligned item separator
+""set statusline+=Chr:%B/%b " character value under cursor
+"set statusline+=%{fugitive#statusline()}
+"if exists("*strftime")
+  "set statusline+=\ \ %{strftime('%a\ %d\ %b\ %H:%M')}
+"endif
+"set statusline+=\ \ %-14(Line:%l/%L%)
+"set statusline+=%-11(Col:%c%V%)
+"set statusline+=Scroll:%P
+
 " Colemak layout for INSERT mode only
 " Qwerty  - qwertyuiopasdfghjkl;'zxcvbnm,./
 " Colemak - qwfpgjluy;arstdhneio'zxcvbkm,./