Permalink
Browse files

Trying out some new plugins thanks to @rkneufeld

  • Loading branch information...
1 parent 181353d commit 3784ffb741178e0cf2676041459b34b85ee2b011 @spicycode committed Apr 15, 2012
Showing with 28 additions and 88 deletions.
  1. +1 −1 gvimrc
  2. +9 −10 plugin_config.vim
  3. +14 −73 statusbar.vim
  4. +4 −4 vundle.vim
View
2 gvimrc
@@ -21,7 +21,7 @@ set guioptions+=e
" Don't flick cursor.
set guicursor=a:blinkon0
-colorscheme ir_black
+colorscheme molokai
if filereadable(expand("~/.vim/custom_gvimrc"))
source ~/.vim/custom_gvimrc
View
@@ -1,3 +1,6 @@
+" Powerline:
+let g:Powerline_symbols = 'fancy'
+
" RubyAndRails:
" Highlight ruby operators
let ruby_operators = 1
@@ -10,15 +13,13 @@ let vimclojure#HighlightBuiltins = 1
let vimclojure#ParenRainbow = 1
let vimclojure#DynamicHighlighting = 1
-" NERDCommenter:
-let NERDDefaultNesting = 0
-let NERDRemoveExtraSpaces = 1
-let NERDSpaceDelims = 1
+" CtrlP
+set wildignore+=*/.git/*,*/.hg/*,*/.svn/* " Linux/MacOSX
-" FuzzyFinder:
-let g:fuf_splitPathMatching = 1 " Enable fuzzy finder path splitting
-let g:fuf_autoPreview = 0 " Disable preview window
-let g:fuf_buffertag_ctagsPath='/usr/local/bin/ctags'
+let g:ctrlp_custom_ignore = {
+\ 'dir': '\.git$\|\.hg$\|\.svn$',
+\ 'file': '\.exe$\|\.so$\|\.dll$'
+\ }
" EasyMotion:
let g:EasyMotion_do_mapping=0
@@ -28,7 +29,5 @@ vnoremap <silent> <Leader>w :<C-U>call EasyMotionWB(1, 0)<CR>
" BClose
nmap <Leader>x <Plug>Kwbd
-
" Screen IMPL
let g:ScreenImpl = 'Tmux'
-
View
@@ -1,80 +1,21 @@
" StatusBar:
-" Always show status bar
-set laststatus=2
-
-" Inspired by StatusLineHighlight by Ingo Karkat
-function! s:StatusLine(new_stl, type, current)
- let current = (a:current ? "" : "NC")
- let type = a:type
- let new_stl = a:new_stl
-
- " Prepare current buffer specific text
- " Syntax: <CUR> ... </CUR>
- let new_stl = substitute(new_stl, '<CUR>\(.\{-,}\)</CUR>', (a:current ? '\1' : ''), 'g')
-
- " Prepare statusline colors
- " Syntax: #[ ... ]
- let new_stl = substitute(new_stl, '#\[\(\w\+\)\]', '%#StatusLine'.type.'\1'.current.'#', 'g')
-
- " Prepare statusline arrows
- " Syntax: [>] [>>] [<] [<<]
- let new_stl = substitute(new_stl, '\[>\]', '/', 'g')
- let new_stl = substitute(new_stl, '\[>>\]', '/ ', 'g')
- let new_stl = substitute(new_stl, '\[<\]', '\', 'g')
- let new_stl = substitute(new_stl, '\[<<\]', '\', 'g')
+if has("statusline") && !&cp
+ set laststatus=2 " always show the status bar
- if &l:statusline ==# new_stl
- " Statusline already set, nothing to do
- return
- endif
+ " Start the status line
+ set statusline=%f\ %m\ %r
- if empty(&l:statusline)
- " No statusline is set, use my_stl
- let &l:statusline = new_stl
- else
- " Check if a custom statusline is set
- let plain_stl = substitute(&l:statusline, '%#StatusLine\w\+#', '', 'g')
+ " Add fugitive
+ set statusline+=%{fugitive#statusline()}\
- if &l:statusline ==# plain_stl
- " A custom statusline is set, don't modify
- return
- endif
+ " Finish the statusline
+ set statusline+=Line:%l/%L\ [%p%%]
+ set statusline+=\ Col:%v
+ set statusline+=\ Buf:#%n
+ set statusline+=\ [%b][0x%B]
+endif
- " No custom statusline is set, use my_stl
- let &l:statusline = new_stl
- endif
-endfunction
-
-" Default statusline
-let g:default_stl = ""
-let g:default_stl .= "<CUR>#[Mode] %{&paste ? 'PASTE [>] ' : ''}%{mode()} #[ModeS][>>]</CUR>"
-let g:default_stl .= "#[Branch] %(%{substitute(fugitive#statusline(), 'GIT(\\([a-z0-9\\-_\\./:]\\+\\))', '\\1', 'gi')}#[BranchS] [>] %)" " Git branch
-let g:default_stl .= "#[FileName]%t " " File name
-let g:default_stl .= "<CUR>#[Error]%(%{substitute(SyntasticStatuslineFlag(), '\\[Syntax: line:\\(\\d\\+\\) \\((\\(\\d\\+\\))\\)\\?\\]', '[>][>][>] SYNTAX đ \\1 \\2 [>][>][>]', 'i')} %)</CUR>" " Syntastic error flag
-let g:default_stl .= "#[ModFlag]%(%M %)" " Modified flag
-let g:default_stl .= "#[BufFlag]%(%H%W %)" " HLP,PRV flags
-let g:default_stl .= "#[FileNameS][>>]" " Separator
-let g:default_stl .= "#[FunctionName] " " Padding/HL group
-let g:default_stl .= "%<" " Truncate right
-let g:default_stl .= "<CUR>%(%{cfi#format('%s', '')} %)</CUR>" " Function name
-let g:default_stl .= "%= " " Right align
-let g:default_stl .= "<CUR>#[FileFormat]%{&fileformat} </CUR>" " File format
-let g:default_stl .= "<CUR>#[FileEncoding]%{(&fenc == '' ? &enc : &fenc)} </CUR>" " File encoding
-let g:default_stl .= "<CUR>#[Separator][<] #[FileType]%{strlen(&ft) ? &ft : 'n/a'} </CUR>" " File type
-let g:default_stl .= "#[LinePercentS][<<]#[LinePercent] %p%% " " Line/column/virtual column, Line percentage
-let g:default_stl .= "#[LineNumberS][<<]#[LineNumber] %l#[LineColumn]:%c%V " " Line/column/virtual column, Line percentage
-let g:default_stl .= "%{exists('g:synid') && g:synid ? '[<] '.synIDattr(synID(line('.'), col('.'), 1), 'name').' ' : ''}" " Current syntax group
-
-" Statusline highlighting
-augroup StatusLineHighlight
- autocmd!
- au BufEnter,BufWinEnter,WinEnter,CmdwinEnter,CursorHold,BufWritePost,InsertLeave * call <SID>StatusLine((exists('b:stl') ? b:stl : g:default_stl), 'Normal', 1)
- au BufLeave,BufWinLeave,WinLeave,CmdwinLeave * call <SID>StatusLine((exists('b:stl') ? b:stl : g:default_stl), 'Normal', 0)
- au InsertEnter,CursorHoldI * call <SID>StatusLine((exists('b:stl') ? b:stl : g:default_stl), 'Insert', 1)
-augroup END
-
-"let &t_SI="]12;\#89b6e2\x7"
-"et &t_EI="]12;\#dd4010\x7"
+" Always show status bar
+set laststatus=2
-"u VimLeave * silent !echo -ne "]12;\#dd4010\x7"
View
@@ -11,7 +11,7 @@ Bundle "tpope/vim-rails"
Bundle "tpope/vim-surround"
Bundle "tpope/vim-haml"
Bundle "tpope/vim-markdown"
-Bundle "tpope/vim-vividchalk"
+Bundle "tpope/vim-commentary"
Bundle "scrooloose/nerdcommenter"
Bundle "scrooloose/syntastic"
Bundle "kchmck/vim-coffee-script"
@@ -21,15 +21,15 @@ Bundle "Lokaltog/vim-distinguished"
Bundle "tyru/current-func-info.vim"
Bundle "cespare/vim-bclose"
Bundle "vim-scripts/L9"
-Bundle "vim-scripts/FuzzyFinder"
-Bundle "jayferd/eco.vim"
Bundle "vim-scripts/VimClojure"
Bundle "ack.vim"
Bundle "jade.vim"
Bundle "kien/ctrlp.vim"
Bundle "wookiehangover/jshint.vim"
Bundle "noahfrederick/Hemisu"
+Bundle 'cakebaker/scss-syntax.vim'
+Bundle 'mrtazz/molokai.vim'
+Bundle 'Lokaltog/vim-powerline'
" MatchTag
Bundle 'gregsexton/MatchTag'
-

0 comments on commit 3784ffb

Please sign in to comment.