Switch from vim-airline to powerline

diff --git a/.gitmodules b/.gitmodules
index 38605b96f01769878633dbb89a59e0b3fe5cf5ce..8c5dbc49f04aa77da78153bcc7a95d056f65c6c3 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,9 +40,6 @@
 [submodule "vim.dot.link/bundle/colorschemes"]
        path = vim.dot.link/bundle/colorschemes
        url = https://github.com/flazz/vim-colorschemes
-[submodule "vim.dot.link/bundle/vim-airline"]
-       path = vim.dot.link/bundle/vim-airline
-       url = https://github.com/bling/vim-airline
 [submodule "vim.dot.link/bundle/vim-fugitive"]
        path = vim.dot.link/bundle/vim-fugitive
        url = https://github.com/tpope/vim-fugitive.git

diff --git a/gvimrc.dot.link b/gvimrc.dot.link
index 3870a2db05c5d8b1f1f181ec23bd6d0dd527686d..6608dfcc4092182bdde9ce3be4db92f277267d37 100644 (file)
--- a/gvimrc.dot.link
+++ b/gvimrc.dot.link
@@ -28,3 +28,10 @@ set t_Co=256
 " Color scheme
 "colorscheme solarized
 colorscheme xoria256
+
+" Powerline
+set showtabline=1 " Do not display the tabline if there's just one tab
+let g:Powerline_symbols='fancy'
+python from powerline.vim import setup as powerline_setup
+python powerline_setup()
+python del powerline_setup

diff --git a/vim.dot.link/bundle/vim-airline b/vim.dot.link/bundle/vim-airline
deleted file mode 160000 (submodule)
index 5a2daf6..0000000
--- a/vim.dot.link/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5a2daf6dfbd6e0df21612a20f95b4285ae8a2603

diff --git a/vimrc.dot.link b/vimrc.dot.link
index 45f183722f866aca593c48ea6e181234f4499649..66c9602967d7ee837b92739f3bdd296b61f1b290 100644 (file)
--- a/vimrc.dot.link
+++ b/vimrc.dot.link
@@ -161,6 +161,10 @@ noremap ,dd zi:.;/^-- $/d<CR>O-- <UP><End><CR><CR><UP><CR><C-O>zi
 colorscheme xoria256
 
 " Powerline
-"python from powerline.vim import setup as powerline_setup
-"python powerline_setup()
-"python del powerline_setup
+python from powerline.vim import setup as powerline_setup
+python powerline_setup()
+python del powerline_setup
+
+set laststatus=2 " Always display the statusline in all windows
+set showtabline=2 " Always display the tabline, even if there is only one tab
+set noshowmode " Hide the default mode text (e.g. -- INSERT -- below the statusline)