summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-12-13 01:33:15 +0100
committermakefu <github@syntax-fehler.de>2018-12-13 01:33:15 +0100
commiteb2bd24bbf540cbc8b668272b3f0c9bd0bbc73b5 (patch)
tree736c32387efe02f5437a1bdcb51889d97a4685af
parentab2554004be7680f880675dfdc992c85cad05bc3 (diff)
ma minimal: set hostname if configured, disable ncsd
-rw-r--r--makefu/2configs/minimal.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/makefu/2configs/minimal.nix b/makefu/2configs/minimal.nix
index d764e5624..cb2ef09e3 100644
--- a/makefu/2configs/minimal.nix
+++ b/makefu/2configs/minimal.nix
@@ -7,8 +7,8 @@
# the only true timezone (even after the the removal of DST)
time.timeZone = "Europe/Berlin";
- networking.hostName = config.krebs.build.host.name;
- nix.buildCores = config.krebs.build.host.cores;
+ networking.hostName = lib.mkIf (lib.hasAttr "host" config.krebs.build) config.krebs.build.host.name;
+ nix.buildCores = 0; # until https://github.com/NixOS/nixpkgs/pull/50440 is in stable
# we use gpg if necessary (or nothing at all)
programs.ssh.startAgent = false;
@@ -85,4 +85,6 @@
"net.ipv6.conf.all.use_tempaddr" = 2;
"net.ipv6.conf.default.use_tempaddr" = 2;
};
+
+ services.nscd.enable = false;
}