nix/8.nix-darwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add variables option to programs.zsh module

Browse source
This commit is contained in:
Daiderd Jordan 2016-12-17 23:11:35 +01:00
parent 2ad1229c71
commit 0c4fbaf0d9
No known key found for this signature in database
GPG key ID: D02435D05B810C96
3 changed files with 27 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/programs/bash.nix
View file

@ -6,7 +6,7 @@ let
cfg = config.programs.bash;
bash = pkgs.runCommand pkgs.zsh.name
shell = pkgs.runCommand pkgs.zsh.name
{ buildInputs = [ pkgs.makeWrapper ]; }
''
source $stdenv/setup
@ -39,14 +39,6 @@ in
'';
};
programs.bash.shell = mkOption {
type = types.path;
default = "${bash}/bin/bash";
description = ''
Zsh shell to use.
'';
};
programs.bash.interactiveShellInit = mkOption {
default = "";
description = ''
@ -64,7 +56,7 @@ in
pkgs.bash
];
environment.variables.SHELL = mkDefault "${cfg.shell}";
environment.variables.SHELL = mkDefault "${shell}/bin/bash";
environment.etc."bashrc".text = ''
# /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.

22
modules/programs/zsh.nix
View file

@ -6,7 +6,10 @@ let
cfg = config.programs.zsh;
zsh = pkgs.runCommand pkgs.zsh.name
zshVariables =
mapAttrsToList (n: v: ''${n}="${v}"'') cfg.variables;
shell = pkgs.runCommand pkgs.zsh.name
{ buildInputs = [ pkgs.makeWrapper ]; }
''
source $stdenv/setup
@ -55,12 +58,17 @@ in
'';
};
programs.zsh.shell = mkOption {
type = types.path;
default = "${zsh}/bin/zsh";
programs.zsh.variables = mkOption {
type = types.attrsOf (types.either types.str (types.listOf types.str));
default = {};
description = ''
Zsh shell to use.
A set of environment variables used in the global environment.
These variables will be set on shell initialisation.
The value of each variable can be either a string or a list of
strings. The latter is concatenated, interspersed with colon
characters.
'';
apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
};
programs.zsh.shellInit = mkOption {
@ -120,7 +128,7 @@ in
pkgs.zsh
];
environment.variables.SHELL = mkDefault "${cfg.shell}";
environment.variables.SHELL = mkDefault "${shell}/bin/zsh";
environment.etc."zshenv".text = ''
# /etc/zshenv: DO NOT EDIT -- this file has been generated automatically.
@ -147,6 +155,8 @@ in
if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
__ETC_ZPROFILE_SOURCED=1
${concatStringsSep "\n" zshVariables}
${cfg.loginShellInit}
# Read system-wide modifications.