From 54f82ea7cbd2c1bb14761275d9310a0004c893fa Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 5 Dec 2022 15:10:15 +0100
Subject: tv vim: rtp -> outPath

---
 tv/2configs/vim.nix         | 2 +-
 tv/5pkgs/vim/default.nix    | 4 ++++
 tv/5pkgs/vim/hack.nix       | 2 +-
 tv/5pkgs/vim/nix.nix        | 2 +-
 tv/5pkgs/vim/showsyntax.nix | 2 +-
 tv/5pkgs/vim/tv.nix         | 2 +-
 tv/5pkgs/vim/vim.nix        | 2 +-
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index fed74c92..e296a0c8 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -13,7 +13,7 @@ let {
     environment.variables.VIMINIT = ":so /etc/vimrc";
   };
 
-  extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
+  extra-runtimepath = pkgs.tv.vim.makeRuntimePath [
     pkgs.tv.vimPlugins.elixir
     pkgs.tv.vimPlugins.file-line
     pkgs.tv.vimPlugins.fzf
diff --git a/tv/5pkgs/vim/default.nix b/tv/5pkgs/vim/default.nix
index 5582be3f..e0e2761d 100644
--- a/tv/5pkgs/vim/default.nix
+++ b/tv/5pkgs/vim/default.nix
@@ -2,6 +2,10 @@ with import <stockholm/lib>;
 
 self: super: {
   tv = super.tv // {
+    vim = {
+      makePlugin = outPath: outPath // { inherit outPath; };
+      makeRuntimePath = concatMapStringsSep "," (getAttr "outPath");
+    };
     vimPlugins = mapNixDir (path: self.callPackage path {}) ./.;
   };
 }
diff --git a/tv/5pkgs/vim/hack.nix b/tv/5pkgs/vim/hack.nix
index 2145cc16..0e949688 100644
--- a/tv/5pkgs/vim/hack.nix
+++ b/tv/5pkgs/vim/hack.nix
@@ -1,7 +1,7 @@
 with import <stockholm/lib>;
 { pkgs }:
 
-(rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
+pkgs.tv.vim.makePlugin (pkgs.writeTextFile (let
   name = "hack";
 in {
   name = "vim-color-${name}-1.0.2";
diff --git a/tv/5pkgs/vim/nix.nix b/tv/5pkgs/vim/nix.nix
index 6715af73..01f769f1 100644
--- a/tv/5pkgs/vim/nix.nix
+++ b/tv/5pkgs/vim/nix.nix
@@ -1,7 +1,7 @@
 with import <stockholm/lib>;
 { pkgs }:
 
-(rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
+pkgs.tv.vim.makePlugin (pkgs.write "vim-syntax-nix-nested" {
   "/syntax/haskell.vim".text = ''
     syn region String start=+\[[[:alnum:]]*|+ end=+|]+
 
diff --git a/tv/5pkgs/vim/showsyntax.nix b/tv/5pkgs/vim/showsyntax.nix
index a5547e46..c27dd044 100644
--- a/tv/5pkgs/vim/showsyntax.nix
+++ b/tv/5pkgs/vim/showsyntax.nix
@@ -1,6 +1,6 @@
 { pkgs }:
 
-(rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
+pkgs.tv.vim.makePlugin (pkgs.writeTextFile (let
   name = "showsyntax";
 in {
   name = "vim-plugin-${name}-1.0.0";
diff --git a/tv/5pkgs/vim/tv.nix b/tv/5pkgs/vim/tv.nix
index ae6245b8..dee6b2df 100644
--- a/tv/5pkgs/vim/tv.nix
+++ b/tv/5pkgs/vim/tv.nix
@@ -1,6 +1,6 @@
 { pkgs }:
 
-(rtp: rtp // { inherit rtp; }) (pkgs.write "vim-tv" {
+pkgs.tv.vim.makePlugin (pkgs.write "vim-tv" {
   #
   # Haskell
   #
diff --git a/tv/5pkgs/vim/vim.nix b/tv/5pkgs/vim/vim.nix
index 216ab6ab..6034dbda 100644
--- a/tv/5pkgs/vim/vim.nix
+++ b/tv/5pkgs/vim/vim.nix
@@ -1,7 +1,7 @@
 with import <stockholm/lib>;
 { pkgs }:
 
-(rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
+pkgs.tv.vim.makePlugin (pkgs.writeTextFile (let
   name = "vim";
 in {
   name = "vim-syntax-${name}-1.0.0";
-- 
cgit v1.2.3