From b819d6c452605af66282c14e25907793a4b77c65 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 7 Feb 2016 07:47:29 +0100
Subject: tv vim: add file-line plugin

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

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 23f90af05..9f702cd4d 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -13,9 +13,21 @@ let
     environment.variables.VIMINIT = ":so /etc/vimrc";
   };
 
-  extra-runtimepath = concatStringsSep "," [
-    "${pkgs.vimPlugins.undotree}/share/vim-plugins/undotree"
-  ];
+  extra-runtimepath = let
+    inherit (pkgs.vimUtils) buildVimPlugin rtpPath;
+    fromVimPlugins = pkgs: concatStringsSep ","
+      (mapAttrsToList (name: pkg: "${pkg}/${rtpPath}/${name}") pkgs);
+  in fromVimPlugins {
+    inherit (pkgs.vimPlugins) undotree;
+    file-line = buildVimPlugin {
+      name = "file-line-1.0";
+      src = pkgs.fetchgit {
+        url = git://github.com/bogado/file-line;
+        rev = "refs/tags/1.0";
+        sha256 = "0z47zq9rqh06ny0q8lpcdsraf3lyzn9xvb59nywnarf3nxrk6hx0";
+      };
+    };
+  };
 
   dirs = {
     backupdir = "$HOME/.cache/vim/backup";
-- 
cgit v1.2.3


From 698296eb8c986127e0fb195a51b3adf3f31eeedf Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 7 Feb 2016 07:50:17 +0100
Subject: tv vim: restore original umask

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

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 9f702cd4d..8a6299a39 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -47,9 +47,10 @@ let
   vim = pkgs.writeScriptBin "vim" ''
     #! ${pkgs.dash}/bin/dash
     set -f
+    umask=$(umask)
     umask 0077
     ${concatStringsSep "\n" (map (x: "mkdir -p ${x}") mkdirs)}
-    umask 0022
+    umask "$umask"
     exec ${pkgs.vim}/bin/vim "$@"
   '';
 
-- 
cgit v1.2.3


From ee5a1ddffe51117862f7e2669f3939dd165d5686 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 7 Feb 2016 08:09:07 +0100
Subject: tv vim: simplify wrapper

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

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

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 8a6299a39..69a880dab 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -44,13 +44,9 @@ let
     alldirs = attrValues dirs ++ map dirOf (attrValues files);
   in unique (sort lessThan alldirs);
 
-  vim = pkgs.writeScriptBin "vim" ''
-    #! ${pkgs.dash}/bin/dash
-    set -f
-    umask=$(umask)
-    umask 0077
-    ${concatStringsSep "\n" (map (x: "mkdir -p ${x}") mkdirs)}
-    umask "$umask"
+  vim = pkgs.writeDashBin "vim" ''
+    set -efu
+    (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
     exec ${pkgs.vim}/bin/vim "$@"
   '';
 
-- 
cgit v1.2.3