diff options
| author | Michael Hoang <enzime@users.noreply.github.com> | 2024-10-31 15:59:09 +1100 |
|---|---|---|
| committer | Michael Hoang <enzime@users.noreply.github.com> | 2024-10-31 16:00:03 +1100 |
| commit | 63f4d40e551e7b29fbe586967c03eea1e6a70ce4 (patch) | |
| tree | a694c4bedad371ffe9e8c7db46517c592ef7e47a /modules | |
| parent | 1588cb2e997fb37a4eab78da13808faf49df903f (diff) | |
tmux: remove `programs.tmux.defaultCommand`
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/examples/lnl.nix | 1 | ||||
| -rw-r--r-- | modules/programs/tmux.nix | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index 010dff5..d944158 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -277,7 +277,6 @@ zle -N up-line-or-beginning-search ''; - environment.loginShell = "${pkgs.zsh}/bin/zsh -l"; environment.variables.SHELL = "${pkgs.zsh}/bin/zsh"; environment.variables.LANG = "en_US.UTF-8"; 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 |