mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-15 17:51:01 +00:00
Code Activity

tmux: remove programs.tmux.defaultCommand

Browse source
This commit is contained in:
Michael Hoang 2024-10-31 15:59:09 +11:00
parent 1588cb2e99
commit 63f4d40e55
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/examples/lnl.nix
View file

@ -277,7 +277,6 @@
zle -N up-line-or-beginning-search zle -N up-line-or-beginning-search
''; '';
environment.loginShell = "${pkgs.zsh}/bin/zsh -l";
environment.variables.SHELL = "${pkgs.zsh}/bin/zsh"; environment.variables.SHELL = "${pkgs.zsh}/bin/zsh";
environment.variables.LANG = "en_US.UTF-8"; environment.variables.LANG = "en_US.UTF-8";

12
modules/programs/tmux.nix
View file

@ -41,6 +41,7 @@ in
{ {
imports = [ imports = [
(mkRenamedOptionModule [ "programs" "tmux" "tmuxConfig" ] [ "programs" "tmux" "extraConfig" ]) (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 = { options = {
programs.tmux.enable = mkOption { programs.tmux.enable = mkOption {
@ -84,11 +85,6 @@ in
description = "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 = "The default command to use for tmux panes.";
};
programs.tmux.tmuxOptions = mkOption { programs.tmux.tmuxOptions = mkOption {
internal = true; internal = true;
type = types.attrsOf (types.submodule text); type = types.attrsOf (types.submodule text);
@ -120,12 +116,6 @@ in
source-file -q /etc/tmux.conf.local 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 '' programs.tmux.tmuxOptions.sensible.text = mkIf cfg.enableSensible ''
set -g default-terminal "screen-256color" set -g default-terminal "screen-256color"
setw -g aggressive-resize on setw -g aggressive-resize on