From 1486aaefee80f742984800419823dcc3ee56d7e5 Mon Sep 17 00:00:00 2001
From: Niten <niten@fudo.org>
Date: Sat, 27 Feb 2021 00:03:49 -0600
Subject: [PATCH] Some corrections for clunk...

---
 config/hardware/clunk.nix |  2 +-
 config/hosts/clunk.nix    |  8 +++++++-
 fudo/sites/russell.nix    | 29 +++++++++++++++--------------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/config/hardware/clunk.nix b/config/hardware/clunk.nix
index 4559098..bf0ee32 100644
--- a/config/hardware/clunk.nix
+++ b/config/hardware/clunk.nix
@@ -30,7 +30,7 @@
 
     "/" = {
       device = "/dev/disk/by-label/root";
-      fsType = "ext4";
+      fsType = "btrfs";
     };
   };
 
diff --git a/config/hosts/clunk.nix b/config/hosts/clunk.nix
index 1bdcfb1..c68d5f9 100644
--- a/config/hosts/clunk.nix
+++ b/config/hosts/clunk.nix
@@ -9,8 +9,12 @@ let
 
 in {
   fudo.local-network = let
-    site-name = config.fudo.hosts.${config.instance.hostname}.site;
+    host-config = config.fudo.hosts.${config.instance.hostname};
+    site-name = host-config.site;
     site = config.fudo.sites.${site-name};
+    domain-name = host-config.domain;
+    domain = config.fudo.domains.${domain-name};
+
   in {
     # FIXME: think about this -- actual network config?
     enable = true;
@@ -27,6 +31,8 @@ in {
     domain = "rus.selby.ca";
     network = site.network;
     dhcp-dynamic-network = site.dynamic-network;
+    hosts = domain.hosts;
+
   };
 
   networking = {
diff --git a/fudo/sites/russell.nix b/fudo/sites/russell.nix
index 8321615..87ac9a1 100644
--- a/fudo/sites/russell.nix
+++ b/fudo/sites/russell.nix
@@ -16,23 +16,21 @@ in {
   config = mkIf (config.fudo.common.site == "russell") {
     time.timeZone = "America/Winnipeg";
 
-    services.cron = {
-      mailto = admin;
-    };
+    services.cron = { mailto = admin; };
 
     networking = {
       domain = "rus.selby.ca";
-      search = [local-domain "fudo.org" "selby.ca"];
+      search = [ local-domain "fudo.org" "selby.ca" ];
       nameservers = nameservers;
 
       # Don't set the gateway if we ARE the gateway.
       # This is the most generic way I can think of to do that. local-network is really
       # about running all the local servers (DNS, DHCP, and providing gateway).
-      defaultGateway = optionalString (config.fudo.local-network.enable != true) gateway;
+      defaultGateway =
+        optionalString (config.fudo.local-network.enable != true) gateway;
 
       enableIPv6 = true;
 
-
       # Necessary to make sure than Kerberos and Avahi both work (the former
       # needs the full reverse-lookup name of the server, the latter wants
       # `hostname` to return just the host itself.
@@ -51,27 +49,32 @@ in {
         isNormalUser = true;
         uid = 1000;
         description = "Guest User";
-        extraGroups = ["audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input"];
+        extraGroups =
+          [ "audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input" ];
       };
       ken = {
         isNormalUser = true;
         uid = 10035;
         createHome = true;
         description = "Ken Selby";
-        extraGroups = ["audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input"];
+        extraGroups =
+          [ "audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input" ];
         group = "users";
         home = "/home/selby/ken";
-        hashedPassword = "$6$EwK9fpbH8$gYVzYY1IYw2/G0wCeUxXrZZqvjWCkCZbBqCOhxowbMuYtC5G0vp.AoYhVKWOJcHJM2c7TdPmAdnhLIe2KYStf.";
+        hashedPassword =
+          "$6$EwK9fpbH8$gYVzYY1IYw2/G0wCeUxXrZZqvjWCkCZbBqCOhxowbMuYtC5G0vp.AoYhVKWOJcHJM2c7TdPmAdnhLIe2KYStf.";
       };
       xiaoxuan = {
         isNormalUser = true;
         uid = 10065;
         createHome = true;
         description = "Xiaoxuan Jin";
-        extraGroups = ["audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input"];
+        extraGroups =
+          [ "audio" "video" "disk" "floppy" "lp" "cdrom" "tape" "input" ];
         group = "users";
         home = "/home/xiaoxuan";
-        hashedPassword = "$6$C8lYHrK7KvdKm/RE$cHZ2hg5gEOEjTV8Zoayik8sz5h.Vh0.ClCgOlQn8l/2Qx/qdxqZ7xCsAZ1GZ.IEyESfhJeJbjLpykXDwPpfVF0";
+        hashedPassword =
+          "$6$C8lYHrK7KvdKm/RE$cHZ2hg5gEOEjTV8Zoayik8sz5h.Vh0.ClCgOlQn8l/2Qx/qdxqZ7xCsAZ1GZ.IEyESfhJeJbjLpykXDwPpfVF0";
       };
     };
 
@@ -126,9 +129,7 @@ in {
         };
       };
 
-      aliases = {
-        dns-hole = "clunk";
-      };
+      aliases = { dns-hole = "clunk"; };
 
       hosts = {
         clunk = {