From f3ccae8c3e3d9143e5dbeac195396e31e5900b4e Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Wed, 6 Jun 2018 17:59:54 +0200
Subject: Update Vim config

---
 pkgs/vim/conf/rc.vim | 12 ++++--------
 pkgs/vim/custom.nix  |  4 ++--
 pkgs/vim/plugins.nix | 10 +++++-----
 pkgs/vim/vim.nix     |  3 ---
 4 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'pkgs/vim')

diff --git a/pkgs/vim/conf/rc.vim b/pkgs/vim/conf/rc.vim
index 551c9a9..1ad8398 100644
--- a/pkgs/vim/conf/rc.vim
+++ b/pkgs/vim/conf/rc.vim
@@ -84,27 +84,23 @@ nnoremap <A-down>  <C-W>j
 
 set laststatus=2
 let g:airline#extensions#tabline#enabled              = 1
-let g:airline#extensions#tabline#show_buffers         = 0
-let g:airline#extensions#tabline#show_tab_type        = 0
+let g:airline#extensions#tabline#show_buffers         = 1
+let g:airline#extensions#tabline#show_tab_type        = 1
+let g:airline#extensions#tabline#fnamemod             = ':t'
 let g:airline#extensions#tabline#formatter            = 'unique_tail_improved'
 let g:airline#extensions#tabline#buffer_idx_mode      = 0
-let g:airline#extensions#tabline#left_sep             = ''
-let g:airline#extensions#tabline#left_alt_sep         = ''
-let g:airline#extensions#tabline#right_sep            = ''
-let g:airline#extensions#tabline#right_alt_sep        = ''
 let g:airline#extensions#tabline#show_close_button    = 0
 let g:airline#extensions#tabline#show_splits          = 0
 let g:airline#extensions#tabline#show_tab_nr          = 0
 let g:airline#extensions#whitespace#mixed_indent_algo = 2
 
-
 let g:gitgutter_enabled         = 0
 let g:gitgutter_highlight_lines = 1
+
 let g:goyo_width                = 90
 let g:goyo_margin_top           = 1
 let g:goyo_margin_bottom        = 0
 
-nnoremap <F4> :call BufferList()<CR>
 nnoremap <F5> :MundoToggle<CR>
 nnoremap <F6> :GitGutterToggle<CR>
 nnoremap <F7> :TagbarToggle<CR>
diff --git a/pkgs/vim/custom.nix b/pkgs/vim/custom.nix
index 7497e32..c5898fc 100644
--- a/pkgs/vim/custom.nix
+++ b/pkgs/vim/custom.nix
@@ -22,11 +22,11 @@ in
         "vim-autoformat"
         "vim-polyglot"
         "vim-counterpoint"
-        "vim-bufferlist"
+        "vim-toggle-ui-elements"
         "vim-csexact"
         "vim-color-akr"
       ];}
-    ]; 
+    ];
   };
   customRC = vimrc;
 }
diff --git a/pkgs/vim/plugins.nix b/pkgs/vim/plugins.nix
index 552ebc1..48f31d1 100644
--- a/pkgs/vim/plugins.nix
+++ b/pkgs/vim/plugins.nix
@@ -35,12 +35,12 @@ in {
       sha256 = "052ywnd5r6ksiz1lsyqya9b94fdb0gr7krkdpc1gw1fx11qk5x2v";
     };
   };
-  "vim-bufferlist" = buildVimPlugin {
-    name = "vim-bufferlist";
+  "vim-toggle-ui-elements" = buildVimPlugin {
+    name = "vim-toggle-ui-elements";
     src  = fetchgit {
-      url    = "https://github.com/roblillack/vim-bufferlist";
-      rev    = "bb571a6dcbf19aa72d320545d376e1d13a8853a3";
-      sha256 = "0ddp9lzl5yv6xwqrqy0dzvd9b5igf6dm5pbyrl2bm0bg586zx3gr";
+      url    = "https://github.com/muellan/vim-toggle-ui-elements";
+      rev    = "325f60fe8030cc2a2312d67191f214c5c39ef283";
+      sha256 = "0fl9kvp799l3nzy8lnjcb0y1hr3g1ba8n9v2mx83yaqdma0rvhi1";
     };
   };
   "vim-color-akr" = buildVimPlugin {
diff --git a/pkgs/vim/vim.nix b/pkgs/vim/vim.nix
index 0af940e..da78a1a 100644
--- a/pkgs/vim/vim.nix
+++ b/pkgs/vim/vim.nix
@@ -7,8 +7,5 @@ let
   };
 in pkgs.lib.overrideDerivation custom_vim ( o: {
     gui              = true;
-    ftNixSupport     = true;
-    cscopeSupport    = true;
-    fontsetSupport   = true;
     multibyteSupport = true;
 } )
-- 
cgit v1.2.3