WIP: Update to 21.05 #52

Closed
simon wants to merge 5 commits from 21.05 into master
Showing only changes of commit 847a820706 - Show all commits

View file

@ -64,17 +64,22 @@ in
envExtra = ''
export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
'';
initExtra = lib.mkAfter ''
eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolors-solarized}/dircolors.ansi-universal)
initExtra = lib.mkMerge [
(lib.mkBefore ''
prompt off # collides with starship
'')
(lib.mkAfter ''
eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolors-solarized}/dircolors.ansi-universal)
# no sad smiley (starship shows exit status)
zstyle ':prompt:grml:right:setup' items
# no sad smiley (starship shows exit status)
zstyle ':prompt:grml:right:setup' items
# do not glob # (conflicts with nix flakes)
disable -p '#'
# do not glob # (conflicts with nix flakes)
disable -p '#'
source ${../files/zsh/pass-wrappers.zsh}
'';
source ${../files/zsh/pass-wrappers.zsh}
'')
];
};
};
}