From 1723e8a25ddace99dd1e73b30efef2f22a3fc2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20H=C3=B6xtermann?= Date: Thu, 1 Aug 2024 13:30:31 +0200 Subject: [PATCH 1/3] maintainers: add hxtmdev --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 73e45ec4cf31..7bde8b255e05 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8435,6 +8435,12 @@ githubId = 19296926; keys = [ { fingerprint = "DF12 23B1 A9FD C5BE 3DA5 B6F7 904A F1C7 CDF6 95C3"; } ]; }; + hxtmdev = { + email = "daniel@hxtm.dev"; + name = "Daniel Höxtermann"; + github = "hxtmdev"; + githubId = 7771007; + }; hypersw = { email = "baltic@hypersw.net"; github = "hypersw"; From da6200c3b64e8972b98b57ee6e4f77e9c79bd304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20H=C3=B6xtermann?= Date: Thu, 1 Aug 2024 13:35:37 +0200 Subject: [PATCH 2/3] nixos/tmux: add hxtmdev as maintainer --- nixos/modules/programs/tmux.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index b4b476a801dd..247b1c7f62df 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -230,4 +230,6 @@ in { imports = [ (lib.mkRenamedOptionModule [ "programs" "tmux" "extraTmuxConf" ] [ "programs" "tmux" "extraConfig" ]) ]; + + meta.maintainers = with lib.maintainers; [ hxtmdev ]; } From 12e6440b465941363375a1a7c166cecc59533cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20H=C3=B6xtermann?= Date: Sun, 28 Jul 2024 21:15:53 +0200 Subject: [PATCH 3/3] nixos/tmux: fix historyLimit when used with newSession When `history-limit` appears after `new-session` it does not have any effect. --- nixos/modules/programs/tmux.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index 247b1c7f62df..a157bedc8aae 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -16,6 +16,7 @@ let set -g default-terminal "${cfg.terminal}" set -g base-index ${toString cfg.baseIndex} setw -g pane-base-index ${toString cfg.baseIndex} + set -g history-limit ${toString cfg.historyLimit} ${optionalString cfg.newSession "new-session"} @@ -50,7 +51,6 @@ let setw -g aggressive-resize ${boolToStr cfg.aggressiveResize} setw -g clock-mode-style ${if cfg.clock24 then "24" else "12"} set -s escape-time ${toString cfg.escapeTime} - set -g history-limit ${toString cfg.historyLimit} ${cfg.extraConfigBeforePlugins}