From def1e23be848848400d1d097d4f044e3c401f9dd Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 14 Apr 2024 23:02:32 +0200
Subject: treewide: remove lib.mdDoc

---
 modules/programs/tmux.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/programs/tmux.nix')

diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix
index 7278479..ae6fcbf 100644
--- a/modules/programs/tmux.nix
+++ b/modules/programs/tmux.nix
@@ -46,47 +46,47 @@ in
     programs.tmux.enable = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc "Whether to configure tmux.";
+      description = "Whether to configure tmux.";
     };
 
     programs.tmux.enableSensible = mkOption {
       type = types.bool;
       default = false;
       example = true;
-      description = lib.mdDoc "Enable sensible configuration options for tmux.";
+      description = "Enable sensible configuration options for tmux.";
     };
 
     programs.tmux.enableMouse = mkOption {
       type = types.bool;
       default = false;
       example = true;
-      description = lib.mdDoc "Enable mouse support for tmux.";
+      description = "Enable mouse support for tmux.";
     };
 
     programs.tmux.enableFzf = mkOption {
       type = types.bool;
       default = false;
       example = true;
-      description = lib.mdDoc "Enable fzf keybindings for selecting tmux sessions and panes.";
+      description = "Enable fzf keybindings for selecting tmux sessions and panes.";
     };
 
     programs.tmux.enableVim = mkOption {
       type = types.bool;
       default = false;
       example = true;
-      description = lib.mdDoc "Enable vim style keybindings for copy mode, and navigation of tmux panes.";
+      description = "Enable vim style keybindings for copy mode, and navigation of tmux panes.";
     };
 
     programs.tmux.iTerm2 = mkOption {
       type = types.bool;
       default = false;
       example = true;
-      description = lib.mdDoc "Cater to iTerm2 and its tmux integration, as appropriate.";
+      description = "Cater to iTerm2 and its tmux integration, as appropriate.";
     };
 
     programs.tmux.defaultCommand = mkOption {
       type = types.either types.str types.package;
-      description = lib.mdDoc "The default command to use for tmux panes.";
+      description = "The default command to use for tmux panes.";
     };
 
     programs.tmux.tmuxOptions = mkOption {
@@ -98,7 +98,7 @@ in
     programs.tmux.extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc "Extra configuration to add to {file}`tmux.conf`.";
+      description = "Extra configuration to add to {file}`tmux.conf`.";
     };
   };
 
-- 
cgit v1.2.3


From 63f4d40e551e7b29fbe586967c03eea1e6a70ce4 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Thu, 31 Oct 2024 15:59:09 +1100
Subject: tmux: remove `programs.tmux.defaultCommand`

---
 modules/programs/tmux.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'modules/programs/tmux.nix')

diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix
index ae6fcbf..d70dab1 100644
--- a/modules/programs/tmux.nix
+++ b/modules/programs/tmux.nix
@@ -41,6 +41,7 @@ in
 {
   imports = [
     (mkRenamedOptionModule [ "programs" "tmux" "tmuxConfig" ] [ "programs" "tmux" "extraConfig" ])
+    (mkRemovedOptionModule [ "programs" "tmux" "defaultCommand" ] "Use `programs.tmux.extraConfig` to configure the default command instead. If unset, tmux will default to using your system configured login shell.")
   ];
   options = {
     programs.tmux.enable = mkOption {
@@ -84,11 +85,6 @@ in
       description = "Cater to iTerm2 and its tmux integration, as appropriate.";
     };
 
-    programs.tmux.defaultCommand = mkOption {
-      type = types.either types.str types.package;
-      description = "The default command to use for tmux panes.";
-    };
-
     programs.tmux.tmuxOptions = mkOption {
       internal = true;
       type = types.attrsOf (types.submodule text);
@@ -120,12 +116,6 @@ in
       source-file -q /etc/tmux.conf.local
     '';
 
-    programs.tmux.defaultCommand = mkDefault config.environment.loginShell;
-
-    programs.tmux.tmuxOptions.login-shell.text = ''
-      set -g default-command "${cfg.defaultCommand}"
-    '';
-
     programs.tmux.tmuxOptions.sensible.text = mkIf cfg.enableSensible ''
       set -g default-terminal "screen-256color"
       setw -g aggressive-resize on
-- 
cgit v1.2.3