From c132a55fe3aeb01a20c8be4e14244ae9e83c62a2 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Thu, 11 Jul 2024 15:36:51 -0500
Subject: [PATCH] Move backups around, enable whitestorm1

---
 flake.nix | 100 ++++++------------------------------------------------
 1 file changed, 10 insertions(+), 90 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7e0f694..a61bce3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1003,14 +1003,14 @@
               inherit name;
               primaryIp = ip;
               mountDir = "/btrfs/nvme2";
-              subvolumes = [ "@garage" ];
+              subvolumes = [ "@exports" "@garage" ];
             };
 
             k3s = { ip, name }: {
               inherit name;
               primaryIp = ip;
               mountDir = "/btrfs/nvme";
-              subvolumes = [ "@garage" ];
+              subvolumes = [ "@exports" "@garage" ];
             };
 
             db = { ip, name }: {
@@ -1109,20 +1109,6 @@
 
         backup2 =
           let
-            k3sOld = { ip, name }: {
-              inherit name;
-              primaryIp = ip;
-              mountDir = "/btrfs/nvme2";
-              subvolumes = [ "@exports" ];
-            };
-
-            k3s = { ip, name }: {
-              inherit name;
-              primaryIp = ip;
-              mountDir = "/btrfs/nvme";
-              subvolumes = [ "@exports" ];
-            };
-
             db = { ip, name }: {
               inherit name;
               primaryIp = ip;
@@ -1139,7 +1125,7 @@
 
             graystripe = {
               name = "graystripe";
-              primaryIp = "192.168.5.9";
+              primaryIp = "192.168.5.11";
               mountDir = "/btrfs/nvme";
               subvolumes = [ "@" "@root" "@home" ];
             };
@@ -1150,80 +1136,10 @@
             selfIp6 = "2001:db8:20::191";
             backupHosts = (builtins.map firestar [
               {
-                name = "hdd";
-                subvolumes = [ "@diskimages" "@documents" "@downloads" "@music" "@pictures" "@videos" ];
+                name = "nvme1";
+                subvolumes = [ "@development" "@documents" "@downloads" "@music" "@notes" "@photos" "@videos" ];
               }
-              {
-                name = "nvme";
-                subvolumes = [ "@development" ];
-              }
-            ]) ++ [ graystripe ] ++ (builtins.map k3sOld [
-              {
-                ip = "192.168.20.120";
-                name = "k3s1";
-              }
-              {
-                ip = "192.168.20.121";
-                name = "k3s2";
-              }
-              {
-                ip = "192.168.20.122";
-                name = "k3s3";
-              }
-              {
-                ip = "192.168.20.123";
-                name = "k3s4";
-              }
-              {
-                ip = "192.168.20.124";
-                name = "k3s5";
-              }
-            ]) ++ (builtins.map k3s [
-              {
-                ip = "192.168.20.125";
-                name = "k3s6";
-              }
-              {
-                ip = "192.168.20.126";
-                name = "k3s7";
-              }
-              {
-                ip = "192.168.20.127";
-                name = "k3s8";
-              }
-              {
-                ip = "192.168.20.128";
-                name = "k3s9";
-              }
-              {
-                ip = "192.168.20.129";
-                name = "k3s10";
-              }
-              {
-                ip = "192.168.20.130";
-                name = "k3s11";
-              }
-              {
-                ip = "192.168.20.131";
-                name = "k3s12";
-              }
-              {
-                ip = "192.168.20.132";
-                name = "k3s13";
-              }
-              {
-                ip = "192.168.20.133";
-                name = "k3s14";
-              }
-              {
-                ip = "192.168.20.134";
-                name = "k3s15";
-              }
-              {
-                ip = "192.168.20.135";
-                name = "k3s16";
-              }
-            ]) ++ (builtins.map db [
+            ]) ++ [ graystripe ] ++ (builtins.map db [
               {
                 ip = "192.168.20.27";
                 name = "whitestorm2";
@@ -1252,6 +1168,10 @@
               name = "redtail2";
               ip = "192.168.20.24";
             }
+            {
+              name = "whitestorm1";
+              ip = "192.168.20.80";
+            }
             {
               name = "whitestorm2";
               ip = "192.168.20.27";