Merge branch 'master' into flip-map-foreach

2019-08-18 18:00:25 +03:00
parent 29ba0a0adf 2ca09a94be
commit d80cd26ff9
1062 changed files with 25722 additions and 18335 deletions
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -67,7 +67,7 @@ rec {
            in
            { key = "ip-address";
              config =
-                { networking.hostName = m.fst;
+                { networking.hostName = mkDefault m.fst;

                  networking.interfaces = listToAttrs interfaces;