From 22c9669328725c84085bb47ba3f6435753153de2 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 16 Jun 2018 16:55:31 +0200
Subject: Update Vim config

---
 pkgs/vim/conf/rc.vim | 7 +------
 pkgs/vim/custom.nix  | 6 ++++--
 pkgs/vim/plugins.nix | 8 ++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/vim/conf/rc.vim b/pkgs/vim/conf/rc.vim
index e7e3259..4aee84e 100644
--- a/pkgs/vim/conf/rc.vim
+++ b/pkgs/vim/conf/rc.vim
@@ -104,7 +104,7 @@ let g:goyo_margin_bottom        = 0
 
 nnoremap <F5> :MundoToggle<CR>
 nnoremap <F6> :GitGutterToggle<CR>
-nnoremap <F7> :TagbarToggle<CR>
+nnoremap <F7> :SignatureToggleSigns<CR>
 nnoremap <F8> :Goyo<CR>
 
 nnoremap <c-b> :CtrlPBuffer<CR>
@@ -121,10 +121,5 @@ let g:ackprg = 'ag --vimgrep'
 
 let g:undotree_SetFocusWhenToggle = 1
 
-let g:tagbar_autoclose      = 1
-let g:tagbar_autopreview    = 1
-let g:tagbar_compact        = 1
-let g:tagbar_width          = 70
-
 let g:localvimrc_sandbox    = 0
 let g:localvimrc_persistent = 2
diff --git a/pkgs/vim/custom.nix b/pkgs/vim/custom.nix
index 304a63c..d554443 100644
--- a/pkgs/vim/custom.nix
+++ b/pkgs/vim/custom.nix
@@ -12,12 +12,14 @@ in
         "ctrlp"
         "goyo"
         "ack-vim"
-        "tagbar"
         "fugitive"
-        "vim-mundo"
+        "surround"
         "vim-unimpaired"
+        "vim-mundo"
         "vim-airline"
         "vim-gitgutter"
+        "vim-git-commit-viewer"
+        "vim-signature"
         "vim-localvimrc"
         "vim-addon-nix"
         "vim-autoformat"
diff --git a/pkgs/vim/plugins.nix b/pkgs/vim/plugins.nix
index e410df5..654f63a 100644
--- a/pkgs/vim/plugins.nix
+++ b/pkgs/vim/plugins.nix
@@ -35,6 +35,14 @@ in {
       sha256 = "0fl9kvp799l3nzy8lnjcb0y1hr3g1ba8n9v2mx83yaqdma0rvhi1";
     };
   };
+  "vim-git-commit-viewer" = buildVimPlugin {
+    name = "vim-git-commit-viewer";
+    src  = fetchgit {
+      url    = "https://github.com/junegunn/gv.vim";
+      rev    = "7ee1ca8201a0e9f95ba5dd3ec344e3ce71d61d8e";
+      sha256 = "0r0j8l0sm3xgb3hgmf0zm48mgj97nlkspg3jgv817nhwsl8pyc44";
+    };
+  };
   "vim-color-akr" = buildVimPlugin {
     name = "vim-color-akr";
     src  = ./conf/vim-color-akr;
-- 
cgit v1.2.3