Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
Showing only changes of commit 97abdf17e0 - Show all commits

View file

@ -4,6 +4,9 @@
}: }:
let let
channelSources = (import ../../default.nix {
versionsPath = ../../variables/versions.nix;
}).channelSources;
in { in {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
@ -34,6 +37,8 @@ in {
# don't cd into directories when executed # don't cd into directories when executed
unsetopt AUTO_CD unsetopt AUTO_CD
source ${channelSources}
''; '';
sessionVariables = { sessionVariables = {