@@ -1,7 +1,6 @@
11{ lib
22, fetchFromGitHub
33, pkgs
4−, reattach-to-user-namespace
54, stdenv
65}:
76
@@ -10,10 +9,10 @@ let
109
1110 addRtp = path: rtpFilePath: attrs: derivation:
1211 derivation // { rtp = "${derivation}/${path}/${rtpFilePath}"; } // {
13− overrideAttrs = f: mkDerivation (attrs // f attrs);
12+ overrideAttrs = f: mkTmuxPlugin (attrs // f attrs);
1413 };
1514
16− mkDerivation = a@{
15+ mkTmuxPlugin = a@{
1716 pluginName,
1817 rtpFilePath ? (builtins.replaceStrings ["-"] ["_"] pluginName) + ".tmux",
1918 namePrefix ? "tmuxplugin-",
@@ -50,10 +49,7 @@ let
5049 }));
5150
5251in rec {
53−
54− inherit mkDerivation;
55−
56− battery = mkDerivation {
52+ battery = mkTmuxPlugin {
5753 pluginName = "battery";
5854 version = "unstable-2019-07-04";
5955 src = fetchFromGitHub {
@@ -64,7 +60,7 @@ in rec {
6460 };
6561 };
6662
67− continuum = mkDerivation {
63+ continuum = mkTmuxPlugin {
6864 pluginName = "continuum";
6965 version = "unstable-2020-10-16";
7066 src = fetchFromGitHub {
@@ -94,7 +90,7 @@ in rec {
9490 };
9591 };
9692
97− copycat = mkDerivation {
93+ copycat = mkTmuxPlugin {
9894 pluginName = "copycat";
9995 version = "unstable-2020-01-09";
10096 src = fetchFromGitHub {
@@ -105,7 +101,7 @@ in rec {
105101 };
106102 };
107103
108− cpu = mkDerivation {
104+ cpu = mkTmuxPlugin {
109105 pluginName = "cpu";
110106 version = "unstable-2020-07-25";
111107 src = fetchFromGitHub {
@@ -116,7 +112,7 @@ in rec {
116112 };
117113 };
118114
119− ctrlw = mkDerivation rec {
115+ ctrlw = mkTmuxPlugin rec {
120116 pluginName = "ctrlw";
121117 version = "0.1.1";
122118 src = fetchFromGitHub {
@@ -127,7 +123,7 @@ in rec {
127123 };
128124 };
129125
130− dracula = mkDerivation rec {
126+ dracula = mkTmuxPlugin rec {
131127 pluginName = "dracula";
132128 version = "unstable-2021-02-18";
133129 src = fetchFromGitHub {
@@ -145,7 +141,7 @@ in rec {
145141 };
146142 };
147143
148− fingers = mkDerivation rec {
144+ fingers = mkTmuxPlugin rec {
149145 pluginName = "fingers";
150146 rtpFilePath = "tmux-fingers.tmux";
151147 version = "1.0.1";
@@ -159,7 +155,7 @@ in rec {
159155 dependencies = [ pkgs.gawk ];
160156 };
161157
162− fpp = mkDerivation {
158+ fpp = mkTmuxPlugin {
163159 pluginName = "fpp";
164160 version = "unstable-2016-03-08";
165161 src = fetchFromGitHub {
@@ -174,7 +170,7 @@ in rec {
174170 dependencies = [ pkgs.fpp ];
175171 };
176172
177− fzf-tmux-url = mkDerivation {
173+ fzf-tmux-url = mkTmuxPlugin {
178174 pluginName = "fzf-tmux-url";
179175 rtpFilePath = "fzf-url.tmux";
180176 version = "unstable-2019-12-02";
@@ -186,7 +182,7 @@ in rec {
186182 };
187183 };
188184
189− gruvbox = mkDerivation {
185+ gruvbox = mkTmuxPlugin {
190186 pluginName = "gruvbox";
191187 rtpFilePath = "gruvbox-tpm.tmux";
192188 version = "unstable-2019-05-05";
@@ -198,7 +194,7 @@ in rec {
198194 };
199195 };
200196
201− jump = mkDerivation {
197+ jump = mkTmuxPlugin {
202198 pluginName = "jump";
203199 version = "2020-06-26";
204200 rtpFilePath = "tmux-jump.tmux";
@@ -222,7 +218,7 @@ in rec {
222218 };
223219 };
224220
225− logging = mkDerivation {
221+ logging = mkTmuxPlugin {
226222 pluginName = "logging";
227223 version = "unstable-2019-04-19";
228224 src = fetchFromGitHub {
@@ -233,7 +229,7 @@ in rec {
233229 };
234230 };
235231
236− net-speed = mkDerivation {
232+ net-speed = mkTmuxPlugin {
237233 pluginName = "net-speed";
238234 version = "unstable-2018-12-02";
239235 src = fetchFromGitHub {
@@ -244,7 +240,7 @@ in rec {
244240 };
245241 };
246242
247− nord = mkDerivation rec {
243+ nord = mkTmuxPlugin rec {
248244 pluginName = "nord";
249245 version = "0.3.0";
250246 src = pkgs.fetchFromGitHub {
@@ -255,7 +251,7 @@ in rec {
255251 };
256252 };
257253
258− maildir-counter = mkDerivation {
254+ maildir-counter = mkTmuxPlugin {
259255 pluginName = "maildir-counter";
260256 version = "unstable-2016-11-25";
261257 src = fetchFromGitHub {
@@ -266,7 +262,7 @@ in rec {
266262 };
267263 };
268264
269− online-status = mkDerivation {
265+ online-status = mkTmuxPlugin {
270266 pluginName = "online-status";
271267 version = "unstable-2018-11-30";
272268 src = fetchFromGitHub {
@@ -277,7 +273,7 @@ in rec {
277273 };
278274 };
279275
280− open = mkDerivation {
276+ open = mkTmuxPlugin {
281277 pluginName = "open";
282278 version = "unstable-2019-12-02";
283279 src = fetchFromGitHub {
@@ -288,7 +284,7 @@ in rec {
288284 };
289285 };
290286
291− onedark-theme = mkDerivation {
287+ onedark-theme = mkTmuxPlugin {
292288 pluginName = "onedark-theme";
293289 rtpFilePath = "tmux-onedark-theme.tmux";
294290 version = "unstable-2020-06-07";
@@ -300,7 +296,7 @@ in rec {
300296 };
301297 };
302298
303− pain-control = mkDerivation {
299+ pain-control = mkTmuxPlugin {
304300 pluginName = "pain-control";
305301 version = "unstable-2020-02-18";
306302 src = fetchFromGitHub {
@@ -311,7 +307,7 @@ in rec {
311307 };
312308 };
313309
314− plumb = mkDerivation rec {
310+ plumb = mkTmuxPlugin rec {
315311 pluginName = "plumb";
316312 version = "0.1.1";
317313 src = fetchFromGitHub {
@@ -325,7 +321,7 @@ in rec {
325321 '';
326322 };
327323
328− power-theme = mkDerivation {
324+ power-theme = mkTmuxPlugin {
329325 pluginName = "power";
330326 rtpFilePath = "tmux-power.tmux";
331327 version = "unstable-2020-11-18";
@@ -337,7 +333,7 @@ in rec {
337333 };
338334 };
339335
340− prefix-highlight = mkDerivation {
336+ prefix-highlight = mkTmuxPlugin {
341337 pluginName = "prefix-highlight";
342338 version = "unstable-2020-03-26";
343339 src = fetchFromGitHub {
@@ -348,7 +344,7 @@ in rec {
348344 };
349345 };
350346
351− resurrect = mkDerivation {
347+ resurrect = mkTmuxPlugin {
352348 pluginName = "resurrect";
353349 version = "unstable-2020-09-18";
354350 src = fetchFromGitHub {
@@ -385,7 +381,7 @@ in rec {
385381 };
386382 };
387383
388− sensible = mkDerivation {
384+ sensible = mkTmuxPlugin {
389385 pluginName = "sensible";
390386 version = "unstable-2017-09-05";
391387 src = fetchFromGitHub {
@@ -394,12 +390,12 @@ in rec {
394390 rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5";
395391 sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx";
396392 };
397− postInstall = lib.optionalString pkgs.stdenv.isDarwin ''
398− sed -e 's:reattach-to-user-namespace:${reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux
393+ postInstall = lib.optionalString stdenv.isDarwin ''
394+ sed -e 's:reattach-to-user-namespace:${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux
399395 '';
400396 };
401397
402− sessionist = mkDerivation {
398+ sessionist = mkTmuxPlugin {
403399 pluginName = "sessionist";
404400 version = "unstable-2017-12-03";
405401 src = fetchFromGitHub {
@@ -410,7 +406,7 @@ in rec {
410406 };
411407 };
412408
413− sidebar = mkDerivation {
409+ sidebar = mkTmuxPlugin {
414410 pluginName = "sidebar";
415411 version = "unstable-2018-11-30";
416412 src = fetchFromGitHub {
@@ -421,7 +417,7 @@ in rec {
421417 };
422418 };
423419
424− sysstat = mkDerivation {
420+ sysstat = mkTmuxPlugin {
425421 pluginName = "sysstat";
426422 version = "unstable-2017-12-12";
427423 src = fetchFromGitHub {
@@ -432,7 +428,7 @@ in rec {
432428 };
433429 };
434430
435− tilish = mkDerivation {
431+ tilish = mkTmuxPlugin {
436432 pluginName = "tilish";
437433 version = "2020-08-12";
438434 src = fetchFromGitHub {
@@ -451,7 +447,7 @@ in rec {
451447 };
452448 };
453449
454− tmux-colors-solarized = mkDerivation {
450+ tmux-colors-solarized = mkTmuxPlugin {
455451 pluginName = "tmuxcolors";
456452 version = "unstable-2019-07-14";
457453 src = fetchFromGitHub {
@@ -462,7 +458,7 @@ in rec {
462458 };
463459 };
464460
465− tmux-fzf = mkDerivation {
461+ tmux-fzf = mkTmuxPlugin {
466462 pluginName = "tmux-fzf";
467463 rtpFilePath = "main.tmux";
468464 version = "unstable-2020-12-07";
@@ -498,7 +494,7 @@ in rec {
498494 };
499495 };
500496
501− urlview = mkDerivation {
497+ urlview = mkTmuxPlugin {
502498 pluginName = "urlview";
503499 version = "unstable-2016-01-06";
504500 src = fetchFromGitHub {
@@ -513,7 +509,7 @@ in rec {
513509 dependencies = [ pkgs.urlview ];
514510 };
515511
516− vim-tmux-focus-events = mkDerivation {
512+ vim-tmux-focus-events = mkTmuxPlugin {
517513 pluginName = "vim-tmux-focus-events";
518514 version = "unstable-2020-10-05";
519515 src = fetchFromGitHub {
@@ -532,7 +528,7 @@ in rec {
532528 };
533529 };
534530
535− vim-tmux-navigator = mkDerivation {
531+ vim-tmux-navigator = mkTmuxPlugin {
536532 pluginName = "vim-tmux-navigator";
537533 rtpFilePath = "vim-tmux-navigator.tmux";
538534 version = "unstable-2019-12-10";
@@ -544,7 +540,7 @@ in rec {
544540 };
545541 };
546542
547− yank = mkDerivation {
543+ yank = mkTmuxPlugin {
548544 pluginName = "yank";
549545 version = "unstable-2019-12-02";
550546 src = fetchFromGitHub {
@@ -554,5 +550,4 @@ in rec {
554550 sha256 = "1zg9k8yk1iw01vl8m44w4sv20lln4l0lq9dafc09lxmgxm9dllj4";
555551 };
556552 };
557−
558553}