Merge remote-tracking branch 'cd/master'

1 files changed, 5 insertions, 9 deletions

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index b0c26e50e..6e2059484 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -13,21 +13,17 @@ let
     environment.variables.VIMINIT = ":so /etc/vimrc";
   };
 
-  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 {
+  extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
+    pkgs.vimPlugins.undotree
+    (pkgs.vimUtils.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";