summaryrefslogtreecommitdiff
path: root/modules/programs
diff options
context:
space:
mode:
authorEmily <vcs@emily.moe>2024-11-02 22:23:10 +0000
committerGitHub <noreply@github.com>2024-11-02 22:23:10 +0000
commitf203352cc035dad4a49242d9296ce4272badcefa (patch)
tree804f39c8cce8da0b38c2eb3528f4a9aad25d0179 /modules/programs
parente56d80b28314643da5a0a27c6371c0682ab8389f (diff)
parent63f4d40e551e7b29fbe586967c03eea1e6a70ce4 (diff)
Merge pull request #1135 from Enzime/push-lxwqqpssklyn
environment: remove misleading `environment.loginShell` option
Diffstat (limited to 'modules/programs')
-rw-r--r--modules/programs/tmux.nix12
1 files changed, 1 insertions, 11 deletions
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