From 6f512840395fa404385aadacf560f52ef152479a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 15 Nov 2018 10:43:28 +0100
Subject: tv vim: add fzf

---
 tv/2configs/vim.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'tv/2configs/vim.nix')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 2ac7f751..544fe94a 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -14,6 +14,16 @@ let {
   };
 
   extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
+    # cannot use pkgs.vimPlugins.fzf-vim as it's missing :Rg
+    (pkgs.vimUtils.buildVimPlugin {
+      name = "junegunn";
+      src = pkgs.fetchgit {
+        url = git://github.com/junegunn/fzf.vim;
+        rev = "ad1833ecbc9153b6e34a4292dc089a58c4bcb8dc";
+        sha256 = "1z2q71q6l9hq9fqfqpj1svhyk4yk1bzw1ljhksx4bnpz8gkfbx2m";
+      };
+    })
+    pkgs.vimPlugins.fzfWrapper
     pkgs.vimPlugins.undotree
     pkgs.vimPlugins.vim-elixir
     (pkgs.vimUtils.buildVimPlugin {
@@ -309,6 +319,11 @@ let {
     paths = [
       (pkgs.writeDashBin "vim" ''
         set -efu
+        export FZF_DEFAULT_COMMAND='${pkgs.ripgrep}/bin/rg --files'
+        export PATH=$PATH:${makeBinPath [
+          pkgs.fzf
+          pkgs.ripgrep
+        ]}
         (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString need-dirs})
         exec ${pkgs.vim}/bin/vim "$@"
       '')
@@ -385,5 +400,9 @@ let {
     noremap <esc>[c <nop> | noremap! <esc>[c <nop>
     noremap <esc>[d <nop> | noremap! <esc>[d <nop>
     vnoremap u <nop>
+
+    " fzf
+    nnoremap <esc>q :Files<cr>
+    nnoremap <esc>w :Rg<cr>
   '';
 }
-- 
cgit v1.2.3


From 66204349496ede2f451ba14471efb2c23f74f76e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 15 Nov 2018 10:45:22 +0100
Subject: tv vim: M-a edits alternate buffer

---
 tv/2configs/vim.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tv/2configs/vim.nix')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 544fe94a..469ae3e2 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -404,5 +404,9 @@ let {
     " fzf
     nnoremap <esc>q :Files<cr>
     nnoremap <esc>w :Rg<cr>
+
+    " edit alternate buffer
+    " For some reason neither putting <ctrl>6 nor <ctrl>^ works here...
+    nnoremap <esc>a 
   '';
 }
-- 
cgit v1.2.3


From 1fc9124e81dd1d25bd5c05f30db68e0bd43f1ff8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 16 Nov 2018 17:06:20 +0100
Subject: tv vim: set timeoutlen=0

---
 tv/2configs/vim.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv/2configs/vim.nix')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 469ae3e2..a63d8022 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -348,6 +348,7 @@ let {
     set shortmess+=I
     set showcmd
     set showmatch
+    set timeoutlen=0
     set ttimeoutlen=0
     set undodir=${dirs.undodir}
     set undofile
-- 
cgit v1.2.3


From cc053bd01d79ac2b41a56ca7c0f04179547a2514 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 16 Nov 2018 17:18:07 +0100
Subject: tv vim: neaten fzf plugin

---
 tv/2configs/vim.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tv/2configs/vim.nix')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index a63d8022..e51f0777 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -16,9 +16,9 @@ let {
   extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
     # cannot use pkgs.vimPlugins.fzf-vim as it's missing :Rg
     (pkgs.vimUtils.buildVimPlugin {
-      name = "junegunn";
+      name = "fzf-2018-11-14";
       src = pkgs.fetchgit {
-        url = git://github.com/junegunn/fzf.vim;
+        url = https://github.com/junegunn/fzf.vim;
         rev = "ad1833ecbc9153b6e34a4292dc089a58c4bcb8dc";
         sha256 = "1z2q71q6l9hq9fqfqpj1svhyk4yk1bzw1ljhksx4bnpz8gkfbx2m";
       };
-- 
cgit v1.2.3


From 083a8ca2aed285e94383b216347ee4e6ef44c6a6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 16 Nov 2018 17:19:13 +0100
Subject: tv vim elixir: b916c00 -> 0a847f0

---
 tv/2configs/vim.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'tv/2configs/vim.nix')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index e51f0777..a5641f09 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -25,7 +25,14 @@ let {
     })
     pkgs.vimPlugins.fzfWrapper
     pkgs.vimPlugins.undotree
-    pkgs.vimPlugins.vim-elixir
+    (pkgs.vimUtils.buildVimPlugin {
+      name = "vim-elixir-2018-08-17";
+      src = pkgs.fetchgit {
+        url = https://github.com/elixir-editors/vim-elixir;
+        rev = "0a847f0faed5ba2d94bb3d51f355c50f37ba025b";
+        sha256 = "1jl85wpgywhcvhgw02y8zpvqf0glr4i8522kxpvhsiacb1v1xh04";
+      };
+    })
     (pkgs.vimUtils.buildVimPlugin {
       name = "vim-syntax-jq";
       src = pkgs.fetchgit {
-- 
cgit v1.2.3