From c534e786cc76cca53264f93b5b71064d70aa655a Mon Sep 17 00:00:00 2001
From: root <root@fudo.org>
Date: Thu, 25 Jun 2020 20:46:18 -0700
Subject: [PATCH] Local changes

---
 config/fudo/slynk.nix  | 6 +++++-
 defaults.nix           | 3 +++
 fudo/sites/seattle.nix | 7 +++++++
 hosts/zbox.nix         | 2 ++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/config/fudo/slynk.nix b/config/fudo/slynk.nix
index e2ad7b8..008e098 100644
--- a/config/fudo/slynk.nix
+++ b/config/fudo/slynk.nix
@@ -30,13 +30,17 @@ in {
       description = "Slynk Common Lisp server.";
 
       serviceConfig = {
-        # Type = "simple";
         ExecStartPre = "${pkgs.lispPackages.quicklisp}/bin/quicklisp init";
         ExecStart = "${pkgs.sbcl-with-libs}/bin/sbcl --load ${initScript cfg.port}";
         Restart = "on-failure";
         PIDFile = "/run/slynk.$USERNAME.pid";
       };
 
+      path = with pkgs; [
+        glibc # for getent
+        file
+      ];
+
       environment = {
         LD_LIBRARY_PATH = "${pkgs.openssl_1_1.out}/lib:${pkgs.libuv.out}/lib";
       };
diff --git a/defaults.nix b/defaults.nix
index 030d694..7d2acd1 100644
--- a/defaults.nix
+++ b/defaults.nix
@@ -32,6 +32,7 @@
     dpkg
     emacs
     fail2ban
+    file
     fortune
     gcc
     git
@@ -54,6 +55,7 @@
     lshw
     mkpasswd
     ncurses5
+    nix-index
     nmap
     oidentd
     openldap
@@ -65,6 +67,7 @@
     pwgen
     racket
     ruby
+    rubyPackages.nokogiri
     rustc
     sbcl
     sbclBootstrap
diff --git a/fudo/sites/seattle.nix b/fudo/sites/seattle.nix
index d284f29..9dfe9b8 100644
--- a/fudo/sites/seattle.nix
+++ b/fudo/sites/seattle.nix
@@ -32,6 +32,13 @@ in {
 
       # Until Comcast gets it's shit together... :(
       enableIPv6 = false;
+
+      # 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.
+      hosts = {
+        "127.0.0.1" = [ "${config.networking.hostName}.${local-domain}" config.networking.hostName];
+      };
     };
 
     users.extraUsers = {
diff --git a/hosts/zbox.nix b/hosts/zbox.nix
index 5c16ba2..a8d0790 100644
--- a/hosts/zbox.nix
+++ b/hosts/zbox.nix
@@ -17,10 +17,12 @@ in {
   environment.systemPackages = with pkgs; [
     androidenv.androidPkgs_9_0.platform-tools
     android-studio
+    dnsproxy
     glxinfo
     hll2380dw-cups
     nodejs
     signal-desktop
+    thunderbird
     usbutils
   ];