From 672535fc61bd17be0a75a75fff5ed2f6245ab983 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 19 May 2018 21:13:01 +0200
Subject: Replace undotree with mundo

Side note: vim configuration is now used to build neovim-qt in my user
environment managed by home-manager.
---
 conf/fish.nix        | 4 ++--
 configuration.nix    | 2 +-
 pkgs/vim/conf/rc.vim | 5 ++++-
 pkgs/vim/custom.nix  | 2 +-
 pkgs/vim/plugins.nix | 8 ++++++++
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/conf/fish.nix b/conf/fish.nix
index c79e654..0ea7348 100644
--- a/conf/fish.nix
+++ b/conf/fish.nix
@@ -3,7 +3,7 @@
     enable = true;
     shellInit = ''
       set fish_greeting ""
-    '';  
+    '';
     interactiveShellInit = ''
       eval (dircolors -c ${./dir_colors})
 
@@ -17,7 +17,7 @@
       set fish_color_quote          brown
       set fish_color_autosuggestion 555
       set fish_color_redirection    white
-    '';  
+    '';
     promptInit = ''
       function fish_prompt
         set last_status $status
diff --git a/configuration.nix b/configuration.nix
index f6aef5c..6c293fe 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -110,7 +110,7 @@
 
   environment = {
     systemPackages = let
-      custom_vim = import ./pkgs/vim/vim.nix pkgs;
+      custom_vim  = import ./pkgs/vim/vim.nix pkgs;
     in with pkgs; [
       hdparm ntfs3g psmisc htop fish git silver-searcher custom_vim
     ];
diff --git a/pkgs/vim/conf/rc.vim b/pkgs/vim/conf/rc.vim
index fcd49b3..551c9a9 100644
--- a/pkgs/vim/conf/rc.vim
+++ b/pkgs/vim/conf/rc.vim
@@ -17,6 +17,9 @@ set sessionoptions-=options
 
 set directory=~/.vim/swap//,.
 
+set undofile
+set undodir=~/.vim/undo
+
 set wrap
 set tabstop=4 shiftwidth=4
 set backspace=indent,eol,start
@@ -102,7 +105,7 @@ let g:goyo_margin_top           = 1
 let g:goyo_margin_bottom        = 0
 
 nnoremap <F4> :call BufferList()<CR>
-nnoremap <F6> :UndotreeToggle<CR>
+nnoremap <F5> :MundoToggle<CR>
 nnoremap <F6> :GitGutterToggle<CR>
 nnoremap <F7> :TagbarToggle<CR>
 nnoremap <F8> :Goyo<CR>
diff --git a/pkgs/vim/custom.nix b/pkgs/vim/custom.nix
index 25eea09..7497e32 100644
--- a/pkgs/vim/custom.nix
+++ b/pkgs/vim/custom.nix
@@ -10,10 +10,10 @@ in
     pluginDictionaries = [
       { names = [
         "ctrlp"
-        "undotree"
         "goyo"
         "ack-vim"
         "tagbar"
+        "vim-mundo"
         "vim-unimpaired"
         "vim-airline"
         "vim-gitgutter"
diff --git a/pkgs/vim/plugins.nix b/pkgs/vim/plugins.nix
index 71314b8..552ebc1 100644
--- a/pkgs/vim/plugins.nix
+++ b/pkgs/vim/plugins.nix
@@ -27,6 +27,14 @@ in {
       sha256 = "02spr4mhj2035q45j8bf502jgpq76a518nv913zx46byfbl69lps";
     };
   };
+  "vim-mundo" = buildVimPlugin {
+    name = "vim-mundo";
+    src  = fetchgit {
+      url    = "https://github.com/simnalamburt/vim-mundo";
+      rev    = "v3.0.1";
+      sha256 = "052ywnd5r6ksiz1lsyqya9b94fdb0gr7krkdpc1gw1fx11qk5x2v";
+    };
+  };
   "vim-bufferlist" = buildVimPlugin {
     name = "vim-bufferlist";
     src  = fetchgit {
-- 
cgit v1.2.3