From 9f2af93778e6d8e933f74cb85663c562a20da675 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 20 Jan 2020 15:01:49 +0100
Subject: [PATCH] Add glotzbert to host registry, add static IPv6 address

---
 host-registry.nix                 |  4 ++++
 hosts/glotzbert/configuration.nix | 38 ++++++++++++-------------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/host-registry.nix b/host-registry.nix
index 5bb3211c..66252ff7 100644
--- a/host-registry.nix
+++ b/host-registry.nix
@@ -5,6 +5,10 @@ rec {
     adc = { };
     grafana.publicKey =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPFB9fo01jzr2upEBEXiR7sSmeQoq9ll5Cf5/hjq5e4Y";
+
+    glotzbert.publicKey =
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHPrkD07abpTU/66fEjmiMYsUfJCSF62MVFe8BED7wu4";
+
     hydra.publicKey =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhurL/sxsXRglKdLfiWIcK+iqpyhGrGt/MoBODsgvig";
     pulsebert.publicKey =
diff --git a/hosts/glotzbert/configuration.nix b/hosts/glotzbert/configuration.nix
index 6cb02832..9f447c28 100644
--- a/hosts/glotzbert/configuration.nix
+++ b/hosts/glotzbert/configuration.nix
@@ -1,32 +1,24 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
 { config, pkgs, ... }:
 
-let
-  #x11vnc-service = with pkgs; import ./x11vnc-service.nix { inherit stdenv pkgs; };
-in {
+{
+  imports = [ ./hardware-configuration.nix ../../lib ../../lib/yggdrasil.nix ];
+
+  c3d2 = {
+    isInHq = true;
+    hq.interface = "enp0s10";
+    enableHail = true;
+  };
+
   nixpkgs.config.allowUnfree = true;
   nix = {
     useSandbox = true;
     buildCores = 2;
   };
-  imports = [ # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ../../lib
-    ../../lib/yggdrasil.nix
-  ];
-
-  c3d2 = {
-    isInHq = true;
-    mapHqHosts = true;
-    enableHail = true;
-  };
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.systemd-boot.memtest86.enable = true;
   boot.kernelPackages = pkgs.linuxPackages_4_19;
 
   networking.hostName = "glotzbert"; # Define your hostname.
@@ -48,9 +40,7 @@ in {
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    wget vim x11vnc
-  ];
+  environment.systemPackages = with pkgs; [ wget vim x11vnc ];
 
   systemd.user.services.x11vnc = {
     description = "X11 VNC server";
@@ -58,7 +48,7 @@ in {
     partOf = [ "graphical-session.target" ];
     serviceConfig = {
       ExecStart = ''
-          ${pkgs.x11vnc}/bin/x11vnc -shared -forever -passwd k-ot
+        ${pkgs.x11vnc}/bin/x11vnc -shared -forever -passwd k-ot
       '';
       RestartSec = 3;
       Restart = "always";
@@ -138,7 +128,9 @@ in {
     uid = 1000;
     group = "k-ot";
     extraGroups = [ "wheel" "networkmanager" "audio" "video" ];
-    openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGJJTSJdpDh82486uPiMhhyhnci4tScp5uUe7156MBC8 astro" ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGJJTSJdpDh82486uPiMhhyhnci4tScp5uUe7156MBC8 astro"
+    ];
   };
 
   # This value determines the NixOS release with which your system is to be