summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
m---------vim/bundle/airline0
m---------vim/bundle/bufferline0
-rw-r--r--vimrc15
4 files changed, 16 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index 2530c00..110b0f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,9 @@
[submodule "vim/bundle/vimproc"]
path = vim/bundle/vimproc
url = git://github.com/Shougo/vimproc.vim
+[submodule "vim/bundle/bufferline"]
+ path = vim/bundle/bufferline
+ url = git://github.com/bling/vim-bufferline
+[submodule "vim/bundle/airline"]
+ path = vim/bundle/airline
+ url = git://github.com/bling/vim-airline
diff --git a/vim/bundle/airline b/vim/bundle/airline
new file mode 160000
+Subproject de1d1e365e8a1b5ac27adafeddc44cf22ea3606
diff --git a/vim/bundle/bufferline b/vim/bundle/bufferline
new file mode 160000
+Subproject 223baaae88e30908dadc8d7ec451092453fb20c
diff --git a/vimrc b/vimrc
index 306ca33..964c2fe 100644
--- a/vimrc
+++ b/vimrc
@@ -42,6 +42,9 @@ set rulerformat=%26(%y%r%m\ (%n)\ %.7l,%.7c\ %=\ %P%)
" display the number of (characters|lines) in visual mode, also cur command
set showcmd
+" don't display the current mode, since airline does that
+set noshowmode
+
" a - terse messages (like [+] instead of [Modified]
" o - don't show both reading and writing messages if both occur at once
" t - truncate file names
@@ -50,8 +53,8 @@ set showcmd
" I - no intro message when starting vim fileless
set shortmess=aotTWI
-" no extra status lines
-set laststatus=0
+" status line
+set laststatus=2
" display as much of the last line as possible if it's really long
" also display unprintable characters as hex
@@ -243,9 +246,7 @@ if has("gui_running")
colorscheme torte
else
set background=light
- if &t_Co > 16
- set t_Co=16
- endif
+ set t_Co=256
endif
" }}}
" word completion menu {{{
@@ -725,4 +726,8 @@ function! s:vimfiler_my_settings()
endfunction
nmap c :VimFilerSimple -quit -explorer<CR>
" }}}
+" bufferline {{{
+let g:bufferline_echo = 0
+let g:bufferline_modified = ''
+" }}}
" }}}