diff options
author | lassulus <lassulus@lassul.us> | 2017-09-06 11:07:59 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-09-06 11:07:59 +0200 |
commit | 428a5f037ef8a5d6b0ef5bc0ea74dcd458fd5b16 (patch) | |
tree | 0bcc67e7d0f4ff22ca7e4840608f72015a49fbdd /makefu/2configs/default.nix | |
parent | 6218a259a9880368c71ecacddcf1e7c641bd5278 (diff) | |
parent | a46564bf986829cd7372020ed4962af15a5c5983 (diff) |
Merge remote-tracking branch 'gum/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"; |