Merge branch 'LnL7:master' into masterHEADmaster

1 files changed, 8 insertions, 18 deletions

diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix
index 7278479..d70dab1 100644
--- a/modules/programs/tmux.nix
+++ b/modules/programs/tmux.nix
@@ -41,52 +41,48 @@ 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 {
       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.";
-    };
-
-    programs.tmux.defaultCommand = mkOption {
-      type = types.either types.str types.package;
-      description = lib.mdDoc "The default command to use for tmux panes.";
+      description = "Cater to iTerm2 and its tmux integration, as appropriate.";
     };
 
     programs.tmux.tmuxOptions = mkOption {
@@ -98,7 +94,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`.";
     };
   };
 
@@ -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