Skip to content

Commit

Permalink
updating powerline
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Breed committed Apr 6, 2013
1 parent a91fcca commit 686304a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 21 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Expand Up @@ -91,9 +91,6 @@
[submodule "bundle/delimitMate"]
path = bundle/delimitMate
url = git://github.com/Raimondi/delimitMate.git
[submodule "bundle/vim-powerline"]
path = bundle/vim-powerline
url = git://github.com/Lokaltog/vim-powerline.git
[submodule "bundle/vim-less"]
path = bundle/vim-less
url = git://github.com/groenewege/vim-less.git
Expand All @@ -112,3 +109,6 @@
[submodule "bundle/jst.vim"]
path = bundle/jst.vim
url = git://github.com/briancollins/vim-jst.git
[submodule "bundle/powerline.vim"]
path = bundle/powerline.vim
url = git://github.com/Lokaltog/powerline.git
1 change: 1 addition & 0 deletions bundle/powerline.vim
Submodule powerline.vim added at 2685f6
1 change: 0 additions & 1 deletion bundle/vim-powerline
Submodule vim-powerline deleted from 7f53b5
8 changes: 4 additions & 4 deletions gvimrc
Expand Up @@ -4,11 +4,11 @@ set guioptions-=T
set guioptions-=L
set guioptions-=r

set transparency=10
set transparency=5

" color molokai
color monokaidark
" color tomorrow_night
" color monokaidark
color tomorrow_night
" color darkburn
" color badwolf
" color solarized
Expand Down Expand Up @@ -41,7 +41,7 @@ if has("gui_macvim")
let g:gist_open_browser_after_post = 1
let g:gist_detect_filetype = 1

" set guifont=Ubuntu\ Mono\ for\ Powerline:h13
" set guifont=Ubuntu\ Mono\ for\ Powerline

" Set font preference
set guifont=Source\ Code\ Pro\ for\ Powerline:h13
Expand Down
17 changes: 4 additions & 13 deletions vimrc
Expand Up @@ -89,21 +89,15 @@ set wildmode=list:longest,list:full
set winminheight=0 "Allow splits to be reduced to a single line.
set wrapscan " Searches wrap around end of file

" Status Line
" set laststatus=2
" set statusline=[%n]\ %<%.99f\ %h%w%m%r%{exists('*CapsLockStatusline')?CapsLockStatusline():''}%y%=%-16(\ %l,%c-%v\ %)%P

" hi User1 guibg=#455354 guifg=fg ctermbg=238 ctermfg=fg gui=bold,underline cterm=bold,underline term=bold,underline
" hi User2 guibg=#455354 guifg=#CC4329 ctermbg=238 ctermfg=196 gui=bold cterm=bold term=bold
" set statusline=[%n]\ %1*%<%.99t%*\ %2*%h%w%m%r%*%y[%{&ff}→%{strlen(&fenc)?&fenc:'No\ Encoding'}]%=%-16(\ L%l,C%c\ %)%P
" Powerline
set rtp+=~/.vim/bundle/powerline.vim/powerline/bindings/vim
set noshowmode
let g:Powerline_symbols = 'fancy'


" Use modeline overrides
set modeline
set modelines=10


" Speed up viewport scrolling
nnoremap <C-e> 3<C-e>
nnoremap <C-y> 3<C-y>
Expand Down Expand Up @@ -174,7 +168,7 @@ let g:SuperTabDefaultCompletionType = "<C-X><C-O>"
let g:SuperTabCrMapping = 0
let g:SuperTabCompletionType = "context"
au BufEnter,BufRead,BufNewFile *.html,*.md,*.erb,*.jst,*.mustache,*.hbs,*.ejs let g:SuperTabMappingForward = '<s-tab>'
au BufLeave *.html,*.erb let g:SuperTabMappingForward = '<tab>'
au BufLeave *.html,*.md,*.erb,*.jst,*.mustache,*.hbs,*.ejs let g:SuperTabMappingForward = '<tab>'

" Sparkup
"let g:sparkupNextMapping=''
Expand Down Expand Up @@ -221,9 +215,6 @@ au BufRead,BufNewFile *.jade set ft=jade syntax=jade
" JST
au BufRead,BufNewFile *.jst,*.hbs,*.mustache,*.ejs set syntax=jst

" Less
" au BufNewFile,BufRead *.less set filetype=less

" Common Ruby files
au BufRead,BufNewFile Rakefile,Capfile,Gemfile,Thorfile,config.ru,.autotest,.irbrc,*.treetop,*.tt,*.rabl set ft=ruby syntax=ruby

Expand Down

0 comments on commit 686304a

Please sign in to comment.