From 890c33e31378f8dcc1f0b3ccc96d0d113996e590 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Wed, 16 Oct 2024 17:19:57 -0400
Subject: [PATCH] userModules: drop brawly and wallace

---
 userModules/aly/default.nix   |  1 -
 userModules/aly/syncthing.nix | 12 +++++-------
 userModules/default.nix       |  1 -
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/userModules/aly/default.nix b/userModules/aly/default.nix
index 8c305eae..71f6c21b 100644
--- a/userModules/aly/default.nix
+++ b/userModules/aly/default.nix
@@ -15,7 +15,6 @@
 
       openssh.authorizedKeys = {
         keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG0HAmaMTAvrFrinB+b83c8hq6PyjmxRHg1IxR2GH6RN u0_a344@localhost" # termux on wallace
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGcJBb7+ZxkDdk06A0csNsbgT9kARUN185M8k3Lq7E/d u0_a336@localhost" # termux on winona
         ];
 
diff --git a/userModules/aly/syncthing.nix b/userModules/aly/syncthing.nix
index 55449728..9f8e5fa4 100644
--- a/userModules/aly/syncthing.nix
+++ b/userModules/aly/syncthing.nix
@@ -24,7 +24,6 @@ in {
         };
 
         devices = {
-          "brawly" = {id = "BBIBWMR-CN4CFC4-2XMPLII-XFWXBT5-EPCZCAF-JOWAX5J-DHIGNM4-O3XQ4Q3";}; # Pixel 6a
           "fallarbor" = {id = "P4URLH4-YWLMO6J-W62ET7H-TQAO3Y6-T2FAYOY-C2VTI65-VQXHVGG-NQ76PAZ";}; # Framework 13 Intel 11th gen
           "gsgmba" = {id = "V2YCZSL-XY7H72L-FGJFWP2-JNYX72O-OJ5V2HY-V4SSSJM-77A7E3Z-7EJFAAV";}; # Work Macbook Air
           "iphone12" = {id = "SBQNUXS-H4XDJ3E-RBHJPT5-45WDJJA-2U43M4P-23XGUJ7-E3CNNKZ-BXSGIA3";}; # iPhone 12 Pro Max
@@ -33,8 +32,7 @@ in {
           "pacifidlog" = {id = "6EBVXYI-HZW4LQI-T6L3TTI-DZEBXJM-RP3DW7N-BCAG6FC-G2654DN-XJFSLQD";}; # Lenovo Legion Go
           "petalburg" = {id = "ECTD3LW-YZTJIXX-HLQYXT7-UGZSGST-3DDKF72-DJPMDHE-SUYDWIT-ASTKTAE";}; # Yoga 9i
           "rustboro" = {id = "7CXGPQN-7DYDYJN-DKELOR3-RD4HZUW-SSUDGLZ-WVXYFUT-DPT2MGD-6PO5BQF";}; # Thinkpad t440p
-          "slateport" = {id = "MDJFDUG-UJAXQXI-AMEF2AR-PBMD5QK-Z5ZG6AA-RCJCU3M-GZHQQEA-X2JGOAK";}; # homelab a
-          "wallace" = {id = "X55NQL2-H3TEJ5U-EXZPBKQ-LI6BMB4-W2ULDIJ-YNIHJHB-4ISCOJB-UHNLYAX";}; # Samsung a35
+          "slateport" = {id = "MDJFDUG-UJAXQXI-AMEF2AR-PBMD5QK-Z5ZG6AA-RCJCU3M-GZHQQEA-X2JGOAK";}; # homelab
           "winona" = {id = "IGAW5SS-WY2QN6J-5TF74YZ-6XPNPTC-RCH3HIT-ZZQKCAI-6L54IS2-SNRIMA2";}; # Pixel Tablet
         };
 
@@ -43,7 +41,7 @@ in {
             "sync" = {
               id = "default";
               path = "/home/aly/sync";
-              devices = ["brawly" "fallarbor" "gsgmba" "iphone12" "lavaridge" "mauville" "pacifidlog" "petalburg" "rustboro" "slateport" "wallace" "winona"];
+              devices = ["fallarbor" "gsgmba" "iphone12" "lavaridge" "mauville" "pacifidlog" "petalburg" "rustboro" "slateport" "winona"];
               versioning = {
                 type = "staggered";
                 params = {
@@ -56,7 +54,7 @@ in {
             "camera" = {
               id = "fcsgh-dlxys";
               path = "/home/aly/pics/camera";
-              devices = ["brawly" "fallarbor" "lavaridge" "mauville" "petalburg" "rustboro" "slateport" "wallace" "winona"];
+              devices = ["fallarbor" "lavaridge" "mauville" "petalburg" "rustboro" "slateport" "winona"];
               versioning = {
                 params.cleanoutDays = "5";
                 type = "trashcan";
@@ -66,7 +64,7 @@ in {
             "screenshots" = {
               id = "screenshots";
               path = "/home/aly/pics/screenshots";
-              devices = ["brawly" "fallarbor" "lavaridge" "mauville" "petalburg" "rustboro" "slateport" "wallace" "winona"];
+              devices = ["fallarbor" "lavaridge" "mauville" "petalburg" "rustboro" "slateport""winona"];
               versioning = {
                 params.cleanoutDays = "5";
                 type = "trashcan";
@@ -77,7 +75,7 @@ in {
             "music" = {
               id = "6nzmu-z9der";
               path = config.ar.users.aly.syncthing.musicPath;
-              devices = ["lavaridge" "mauville" "petalburg" "rustboro" "wallace"];
+              devices = ["lavaridge" "mauville" "petalburg" "rustboro"];
             };
           };
       };
diff --git a/userModules/default.nix b/userModules/default.nix
index 8cc90bc3..f355932c 100644
--- a/userModules/default.nix
+++ b/userModules/default.nix
@@ -11,7 +11,6 @@ self: {
     mutableUsers = false;
 
     users.root.openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG0HAmaMTAvrFrinB+b83c8hq6PyjmxRHg1IxR2GH6RN u0_a344@localhost" # termux on wallace
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGcJBb7+ZxkDdk06A0csNsbgT9kARUN185M8k3Lq7E/d u0_a336@localhost" # termux on winona
       (builtins.readFile ../secrets/publicKeys/aly_lavaridge.pub)
       (builtins.readFile ../secrets/publicKeys/aly_mauville.pub)