From 23220d43f35a401dc2044e86d4d5ad147ff60007 Mon Sep 17 00:00:00 2001
From: Johannes Rosenberger <johannes@jorsn.eu>
Date: Sat, 25 Apr 2020 14:40:32 +0200
Subject: [PATCH] tmux: use stable plugin names (name -> pname)

PR #1195
---
 modules/programs/tmux.nix                           | 6 ++++--
 tests/modules/programs/tmux/emacs-with-plugins.conf | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix
index ba3982096..0841751a9 100644
--- a/modules/programs/tmux.nix
+++ b/modules/programs/tmux.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.programs.tmux;
 
-  pluginName = p: if types.package.check p then p.name else p.plugin.name;
+  pluginName = p: if types.package.check p then p.pname else p.plugin.pname;
 
   pluginModule = types.submodule {
     options = {
@@ -302,7 +302,9 @@ in
           # Load plugins with Home Manager                #
           # --------------------------------------------- #
 
-          ${(concatMapStringsSep "\n" (p: ''
+          ${(concatMapStringsSep "\n\n" (p: ''
+              # ${pluginName p}
+              # ---------------------
               ${p.extraConfig or ""}
               run-shell ${
                 if types.package.check p
diff --git a/tests/modules/programs/tmux/emacs-with-plugins.conf b/tests/modules/programs/tmux/emacs-with-plugins.conf
index 470771a2e..66b101837 100644
--- a/tests/modules/programs/tmux/emacs-with-plugins.conf
+++ b/tests/modules/programs/tmux/emacs-with-plugins.conf
@@ -34,13 +34,21 @@ set  -g history-limit     2000
 # Load plugins with Home Manager                #
 # --------------------------------------------- #
 
+# tmuxplugin-logging
+# ---------------------
 
 run-shell @tmuxplugin_logging_rtp@
 
 
+# tmuxplugin-prefix-highlight
+# ---------------------
+
 run-shell @tmuxplugin_prefix_highlight_rtp@
 
 
+# tmuxplugin-fzf-tmux-url
+# ---------------------
+
 run-shell @tmuxplugin_fzf_tmux_url_rtp@
 
 # ============================================= #