diff options
author | nin <nineinchnade@gmail.com> | 2017-09-14 22:57:46 +0200 |
---|---|---|
committer | nin <nineinchnade@gmail.com> | 2017-09-14 22:57:46 +0200 |
commit | 56054fe431aca35119df307f2098f823fc03d1e9 (patch) | |
tree | 052c12e402d95ea2bf9b4a8c466480e7d59bf3ce /makefu/2configs/default.nix | |
parent | 036bd54f3142ba05409b742a809c3082176e4596 (diff) | |
parent | de16ae2a12145901c3d9e2efef062b161b9448e3 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs/default.nix')
-rw-r--r-- | makefu/2configs/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 547b73597..25f9f63bf 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -39,10 +39,10 @@ with import <stockholm/lib>; }; networking.hostName = config.krebs.build.host.name; - nix.maxJobs = config.krebs.build.host.cores; + nix.maxJobs = 2; + nix.buildCores = config.krebs.build.host.cores; time.timeZone = "Europe/Berlin"; - #nix.maxJobs = 1; programs.ssh = { startAgent = false; @@ -145,15 +145,6 @@ with import <stockholm/lib>; "net.ipv6.conf.default.use_tempaddr" = 2; }; - system.activationScripts.nix-defexpr = '' - (set -euf - for i in /home/makefu /root/;do - f="$i/.nix-defexpr" - rm -fr "$f" - ln -s /var/src/nixpkgs "$f" - done) - ''; - i18n = { consoleKeyMap = "us"; defaultLocale = "en_US.UTF-8"; |