Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

zsh: move aliases definitions after initExtra

Browse source 
Same motivation as in https://github.com/NixOS/nixpkgs/pull/28378.
zsh.initExtra parameter can be used by external modules which can
redefine user aliases. This change will give user-defined aliases
the highest priority.
This commit is contained in:
Nikita Uvarov 2017-09-07 22:21:00 +02:00
parent 29d5f5d760
commit 379e2c694b
No known key found for this signature in database
GPG key ID: F7A5FB3A7C10EF96
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/misc/news.nix
View file

@ -107,6 +107,19 @@ in
config = { config = {
news.entries = [ news.entries = [
{
time = "2017-09-12T13:11:48+00:00";
condition = (
config.programs.zsh.enable &&
config.programs.zsh.shellAliases != {}
);
message = ''
Aliases defined in 'programs.zsh.shellAliases'
are now have the highest priority. Such aliases will
not be redefined by the code in 'programs.zsh.initExtra'
or any external plugins.
'';
}
{ {
time = "2017-09-10T22:15:19+00:00"; time = "2017-09-10T22:15:19+00:00";
condition = config.programs.zsh.enable; condition = config.programs.zsh.enable;

4
modules/programs/zsh.nix
View file

@ -241,9 +241,9 @@ in
source "$HOME/.zsh/plugins/${plugin.name}/${plugin.file}" source "$HOME/.zsh/plugins/${plugin.name}/${plugin.file}"
'') cfg.plugins)} '') cfg.plugins)}
${aliasesStr}
${cfg.initExtra} ${cfg.initExtra}
${aliasesStr}
''; '';
}) })
(mkIf cfg.oh-my-zsh.enable { (mkIf cfg.oh-my-zsh.enable {