From 1128150cc3e801fa68fc4ff8be4b2d617f57efbb Mon Sep 17 00:00:00 2001
From: Astrid Yu <astrid@astrid.tech>
Date: Sun, 3 Sep 2023 15:37:06 -0700
Subject: [PATCH] Reimage bonney, again (#261)

---
 machines/bonney/configuration.nix          |  5 +++--
 machines/bonney/hardware-configuration.nix | 11 +++--------
 machines/bonney/steam-link.nix             |  7 +++++++
 3 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 machines/bonney/steam-link.nix

diff --git a/machines/bonney/configuration.nix b/machines/bonney/configuration.nix
index 71b2d53f..06234752 100644
--- a/machines/bonney/configuration.nix
+++ b/machines/bonney/configuration.nix
@@ -8,6 +8,8 @@ with lib; {
     inputs.self.nixosModules.server
 
     inputs.self.nixosModules.media-server
+
+    ./steam-link.nix
   ];
 
   boot.loader = {
@@ -18,7 +20,7 @@ with lib; {
   astral = {
     monitoring-node.scrapeTransport = "tailscale";
     tailscale.oneOffKey =
-      "tskey-auth-ka8GwW6CNTRL-buTFdt8S7P7Cmpwb1uQiM797EGYiPfc3";
+      "tskey-auth-kkLCKn6CNTRL-tv1Pmix6CKCfrj9bX1U1JCFRJn7uFRgYd";
   };
 
   networking = {
@@ -33,7 +35,6 @@ with lib; {
 
   time.timeZone = "US/Pacific";
 
-  virtualisation.podman.enable = true;
   virtualisation.vmVariant = {
     # Autologin as root because we testin here
     services.getty.autologinUser = "root";
diff --git a/machines/bonney/hardware-configuration.nix b/machines/bonney/hardware-configuration.nix
index dd135dfd..61daceae 100644
--- a/machines/bonney/hardware-configuration.nix
+++ b/machines/bonney/hardware-configuration.nix
@@ -17,19 +17,14 @@
     fsType = "zfs";
   };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/582B-D4F7";
-    fsType = "vfat";
-  };
-
   fileSystems."/nix" = {
     device = "tank/nix";
     fsType = "zfs";
   };
 
-  fileSystems."/var" = {
-    device = "tank/var";
-    fsType = "zfs";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/8615-D349";
+    fsType = "vfat";
   };
 
   swapDevices = [ ];
diff --git a/machines/bonney/steam-link.nix b/machines/bonney/steam-link.nix
new file mode 100644
index 00000000..540c0e18
--- /dev/null
+++ b/machines/bonney/steam-link.nix
@@ -0,0 +1,7 @@
+{
+  # packaged via flatpak
+  services.flatpak.enable = true;
+  
+  # Fails to run without this
+  boot.kernel.sysctl."kernel.unprivileged_userns_clone" = 1; 
+}
\ No newline at end of file