mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

Merge pull request #1135 from Enzime/push-lxwqqpssklyn

Browse source 
environment: remove misleading `environment.loginShell` option
This commit is contained in:
Emily 2024-11-02 22:23:10 +00:00 committed by GitHub
commit f203352cc0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/environment/default.nix
View file

@ -18,6 +18,11 @@ in
{ {
imports = [ imports = [
(mkRenamedOptionModule ["environment" "postBuild"] ["environment" "extraSetup"]) (mkRenamedOptionModule ["environment" "postBuild"] ["environment" "extraSetup"])
(mkRemovedOptionModule [ "environment" "loginShell" ] ''
This option was only used to change the default command in tmux.
This has been removed in favour of changing the default command or default shell in tmux directly.
'')
]; ];
options = { options = {
@ -74,12 +79,6 @@ in
''; '';
}; };
environment.loginShell = mkOption {
type = types.str;
default = "$SHELL -l";
description = "Configure default login shell.";
};
environment.variables = mkOption { environment.variables = mkOption {
type = types.attrsOf (types.either types.str (types.listOf types.str)); type = types.attrsOf (types.either types.str (types.listOf types.str));
default = {}; default = {};

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