From 41a179836fd540694b673381030a74945f17f4bb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 9 Oct 2021 11:34:55 +0200
Subject: ...

---
 accounts/gkleen@sif/ssh-hosts.nix              |  2 +-
 hosts/sif/default.nix                          | 19 ++++++++++---------
 hosts/surtr/default.nix                        |  4 ++--
 hosts/vidhar/default.nix                       |  4 ++--
 system-profiles/openssh/known-hosts/vidhar.nix |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 3cc9171b..aced0369 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -254,7 +254,7 @@
       ];
     };
   "vidhar" =
-    { hostname = "192.168.2.168";
+    { hostname = "vidhar.yggdrasil";
       identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil";
     };
   "math60" =
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 3b28d51f..8a36d68d 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -44,10 +44,11 @@
     };
 
     networking = {
-      domain = "midgard.yggdrasil";
+      domain = "yggdrasil";
+      search = [ "yggdrasil" ];
       hosts = {
-        "127.0.0.1" = [ "sif.midgard.yggdrasil" "sif" ];
-        "::1" = [ "sif.midgard.yggdrasil" "sif" ];
+        "127.0.0.1" = [ "sif.yggdrasil" "sif" ];
+        "::1" = [ "sif.yggdrasil" "sif" ];
       };
 
       firewall = {
@@ -273,12 +274,12 @@
       daemonNiceLevel = 10;
       daemonIONiceLevel = 3;
 
-      # buildServers.vidhar = {
-      #   address = "192.168.2.168";
-      #   system = "x86_64-linux";
-      #   speedFactor = 4;
-      #   supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
-      # };
+      buildServers.vidhar = {
+        address = "vidhar.yggdrasil";
+        system = "x86_64-linux";
+        speedFactor = 4;
+        supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
+      };
     };
 
     environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./wacom.conf;
diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix
index 0eef940f..300cb676 100644
--- a/hosts/surtr/default.nix
+++ b/hosts/surtr/default.nix
@@ -46,8 +46,8 @@
 
     networking = {
       hostName = "surtr";
-      domain = "muspelheim.yggdrasil";
-      search = [ "muspelheim.yggdrasil" "yggdrasil" ];
+      domain = "yggdrasil";
+      search = [ "yggdrasil" ];
 
       enableIPv6 = true;
       dhcpcd.enable = false;
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index ae0a8168..3c6aeb16 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -66,8 +66,8 @@
 
     networking = {
       hostName = "vidhar";
-      domain = "asgard.yggdrasil";
-      search = [ "asgard.yggdrasil" "yggdrasil" ];
+      domain = "yggdrasil";
+      search = [ "yggdrasil" ];
 
       useDHCP = false;
       useNetworkd = true;
diff --git a/system-profiles/openssh/known-hosts/vidhar.nix b/system-profiles/openssh/known-hosts/vidhar.nix
index 241b3b5d..4974ca45 100644
--- a/system-profiles/openssh/known-hosts/vidhar.nix
+++ b/system-profiles/openssh/known-hosts/vidhar.nix
@@ -1,5 +1,5 @@
 let
-  hostNames = ["192.168.2.168" "vidhar.asgard.yggdrasil"];
+  hostNames = ["192.168.2.168" "vidhar.yggdrasil"];
 in {
   rsa = {
     inherit hostNames;
-- 
cgit v1.2.3