From c747746eee499d79023e3e3a7e2aa742beef2271 Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Sat, 13 Nov 2021 11:13:38 -0800
Subject: [PATCH] fixes for nutboy

---
 config/hardware/nutboy3.nix     |  9 +++++++--
 config/host-config/socrates.nix | 12 ++++++------
 config/hosts/nutboy3.nix        | 20 ++++++++++----------
 config/networks/fudo.org.nix    |  1 +
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/config/hardware/nutboy3.nix b/config/hardware/nutboy3.nix
index f7e134e..7c83d65 100644
--- a/config/hardware/nutboy3.nix
+++ b/config/hardware/nutboy3.nix
@@ -4,11 +4,16 @@ with lib; {
   boot = {
     initrd = {
       availableKernelModules = [
-        FIXME
+        "ehci_pci"
+        "ahci"
+        "isci"
+        "usbhid"
+        "usb_storage"
+        "sd_mod"
       ];
       kernelModules = [ "dm-snapshot" ];
     };
-    kernelModules = [ FIXME ];
+    kernelModules = [ "kvm-intel" ];
     extraModulePackages = [ ];
     loader.grub = {
       enable = true;
diff --git a/config/host-config/socrates.nix b/config/host-config/socrates.nix
index d8a3428..bdb6037 100644
--- a/config/host-config/socrates.nix
+++ b/config/host-config/socrates.nix
@@ -28,12 +28,12 @@ in {
       secret-paths = [ "/state/secrets" ];
     };
 
-    systemd.tmpfiles.rules = [
-      "L /root/.gnupg - - - - /state/root/gnupg"
-      "L /root/.ssh/id_rsa - - - - /state/root/ssh/id_rsa"
-      "L /root/.ssh/id_rsa.pub - - - - /state/root/ssh/id_rsa.pub"
-      "L /root/.ssh/known_hosts - - - - /state/root/ssh/known_hosts"
-    ];
+    # systemd.tmpfiles.rules = [
+    #   "L /root/.gnupg - - - - /state/root/gnupg"
+    #   "L /root/.ssh/id_rsa - - - - /state/root/ssh/id_rsa"
+    #   "L /root/.ssh/id_rsa.pub - - - - /state/root/ssh/id_rsa.pub"
+    #   "L /root/.ssh/known_hosts - - - - /state/root/ssh/known_hosts"
+    # ];
 
     environment = {
       systemPackages = with pkgs; [
diff --git a/config/hosts/nutboy3.nix b/config/hosts/nutboy3.nix
index 3b88440..fe55cd8 100644
--- a/config/hosts/nutboy3.nix
+++ b/config/hosts/nutboy3.nix
@@ -3,22 +3,22 @@
   rp = "reaper";
   admin-email = "reaper@fudo.org";
   domain = "fudo.org";
-  site = "pioneer";
+  site = "nuttyclub";
   profile = "server";
   enable-gui = false;
   arch = "x86_64-linux";
   nixos-system = true;
   machine-id = "d608fb62dc1e493a9a0ebf173ab255b2";
   master-key = {
-    public-key = FIXME;
+    public-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP+ERn09oMqk3jpgXVFWMGv7uYz0fRLVtz5BHZtOXfA0";
     key-path = "/state/master-key/ed25519_key";
   };
-  # initrd-network = {
-  #   ip = "172.86.179.18";
-  #   interface = "enp0s25";
-  #   keypair = {
-  #     public-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIgvl/pxPGN5XuUFsEywHV/PJMI+wPHA6NKTtE8SZC04";
-  #     private-key-file = "/state/ssh/initrd/ssh_ed25519_key";
-  #   };
-  # };
+  initrd-network = {
+    ip = "199.87.154.175";
+    interface = "eno1";
+    keypair = {
+      public-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINPj/4DezCd6uA2IeSr4Y3hxy3gNhT/GJwA40LHlns5w";
+      private-key-file = "/state/ssh/initrd/ssh_ed25519_key";
+    };
+  };
 }
diff --git a/config/networks/fudo.org.nix b/config/networks/fudo.org.nix
index b6f537d..6373558 100644
--- a/config/networks/fudo.org.nix
+++ b/config/networks/fudo.org.nix
@@ -158,6 +158,7 @@
     lsbb-abg = { ipv4-address = "199.101.56.38"; };
     lsbb-hwd = { ipv4-address = "199.101.56.106"; };
     lsbb-hcl = { ipv4-address = "199.101.56.110"; };
+    nutboy3 = { ipv4-address = "199.87.154.175"; };
     procul = { ipv4-address = "172.86.179.18"; };
     prunel = { ipv4-address = "208.81.3.123"; };
     mbix = { ipv4-address = "208.81.7.146"; };