From d810df6854147e5faea84f7d94015a53c2677695 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 30 Nov 2024 21:58:58 +0100
Subject: [PATCH] bingus

---
 machines/bingus/configuration.nix       | 28 ++++++++++++++++++++
 machines/jon/configuration.nix          | 35 -------------------------
 machines/jon/hardware-configuration.nix | 14 ----------
 3 files changed, 28 insertions(+), 49 deletions(-)
 create mode 100644 machines/bingus/configuration.nix
 delete mode 100644 machines/jon/configuration.nix
 delete mode 100644 machines/jon/hardware-configuration.nix

diff --git a/machines/bingus/configuration.nix b/machines/bingus/configuration.nix
new file mode 100644
index 0000000..42c5c3c
--- /dev/null
+++ b/machines/bingus/configuration.nix
@@ -0,0 +1,28 @@
+{
+  imports = [
+    # contains your disk format and partitioning configuration.
+    ../../modules/disko.nix
+    # this file is shared among all machines
+    ../../modules/shared.nix
+    # enables GNOME desktop (optional)
+    ../../modules/gnome.nix
+  ];
+
+  # This is your user login name.
+  users.users.user.name = "pbsds";
+
+  # Set this for clan commands use ssh i.e. `clan machines update`
+  clan.core.networking.targetHost = "root@129.241.210.143";
+  # ssh root@<IP> lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT
+  disko.devices.disk.main.device = "/dev/disk/by-id/wwn-0x50026b7785c5ed67";
+
+  users.users.root.openssh.authorizedKeys.keys = [
+    ''
+    ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC+qv5MogWwOgctQfQeHxUHF2ij6UA8BR4DLXtZClnw6A1CtOjAtZeAW62C8q9OKaIKDO0hqd2vLBkgEno4smqBDJ2ThwKuXrhiHqJzCkXZqIKKx79mpTo7aRpFgkJ7328Ee+tbqa65coL98WRhLnDg69NDaOfSCmH85/D0kuyTG7mYIMdBtFXB/IU0QC9USCSGcUGSnQAEx8S0vaXL7JP043kfEfeqwsea598qX+LFa2UfGwgLBpiWi4QEfYy6fviz2TFkbRYKQImybidzUHZkljjPupqu8U4dIx/jsJM/vew717xZPCU0ZCho77TIU+bYSitD5mjnzuD7LrAdbFgnhkD2sQlD/hUW40kPVT/Tq3DrpDRKC9tniiTaIQV1Pe0k82XwYrvV/hTl8T1ed6TuzhmUggqowAbJRbaBIa1zI672AFFQM8OBIN59ZlLy3V2RZW4fvQk2/xMRdVBT0W5Upx+9rCbH9LCGWL8gNNA/PRJ0L9Ts6cq8kf4tFhFQQrk= pbsds@bjarte
+    ''
+  ];
+
+  # Zerotier needs one controller to accept new nodes. Once accepted
+  # the controller can be offline and routing still works.
+  clan.core.networking.zerotier.controller.enable = true;
+}
diff --git a/machines/jon/configuration.nix b/machines/jon/configuration.nix
deleted file mode 100644
index a675ce8..0000000
--- a/machines/jon/configuration.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  imports = [
-    # contains your disk format and partitioning configuration.
-    ../../modules/disko.nix
-    # this file is shared among all machines
-    ../../modules/shared.nix
-    # enables GNOME desktop (optional)
-    ../../modules/gnome.nix
-  ];
-
-  # This is your user login name.
-  users.users.user.name = "<your-username>";
-
-  # Set this for clan commands use ssh i.e. `clan machines update`
-  # If you change the hostname, you need to update this line to root@<new-hostname>
-  # This only works however if you have avahi running on your admin machine else use IP
-  clan.core.networking.targetHost = "root@<IP>";
-
-  # You can get your disk id by running the following command on the installer:
-  # Replace <IP> with the IP of the installer printed on the screen or by running the `ip addr` command.
-  # ssh root@<IP> lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT
-  disko.devices.disk.main.device = "/dev/disk/by-id/__CHANGE_ME__";
-
-  # IMPORTANT! Add your SSH key here
-  # e.g. > cat ~/.ssh/id_ed25519.pub
-  users.users.root.openssh.authorizedKeys.keys = [
-    ''
-      __YOUR_SSH_KEY__
-    ''
-  ];
-
-  # Zerotier needs one controller to accept new nodes. Once accepted
-  # the controller can be offline and routing still works.
-  clan.core.networking.zerotier.controller.enable = true;
-}
diff --git a/machines/jon/hardware-configuration.nix b/machines/jon/hardware-configuration.nix
deleted file mode 100644
index d284606..0000000
--- a/machines/jon/hardware-configuration.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# Replace this file with an actual hardware-configuration.nix!
-throw ''
-  Did you forget to generate your hardware config?
-
-  Run the following command:
-
-  'clan machines update-hardware-config <machine_name> <hostname>'
-
-  OR:
-
-  'ssh root@<hostname> nixos-generate-config --no-filesystems --show-hardware-config > hardware-configuration.nix'
-
-  And manually replace this file with the generated "hardware-configuration.nix".
-''