From d16d72592137bd9df18c00f34e59a9cd753cb97a Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Thu, 27 Nov 2025 11:08:09 -0800
Subject: rename synology-vm to bree

---
 machines/nixos/x86_64-linux/bree.nix        | 61 ++++++++++++++++++++
 machines/nixos/x86_64-linux/rivendell.nix   |  7 ---
 machines/nixos/x86_64-linux/synology-vm.nix | 87 -----------------------------
 3 files changed, 61 insertions(+), 94 deletions(-)
 create mode 100644 machines/nixos/x86_64-linux/bree.nix
 delete mode 100644 machines/nixos/x86_64-linux/synology-vm.nix

(limited to 'machines')

diff --git a/machines/nixos/x86_64-linux/bree.nix b/machines/nixos/x86_64-linux/bree.nix
new file mode 100644
index 0000000..7c8a661
--- /dev/null
+++ b/machines/nixos/x86_64-linux/bree.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  adminUser,
+  config,
+  ...
+}:
+{
+  imports = [
+    ../../../profiles/cgroups.nix
+    ../../../profiles/defaults.nix
+    ../../../profiles/disk/basic-vm.nix
+    ../../../profiles/home-manager.nix
+    ../../../profiles/server.nix
+  ];
+
+  age.secrets.wireguard.file = ../../../secrets/bree/wireguard.age;
+
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.systemd-boot.enable = true;
+
+  networking.hostName = "bree";
+  networking.useDHCP = lib.mkDefault true;
+  systemd.network.wait-online.anyInterface = lib.mkDefault config.networking.useDHCP;
+
+  networking.wireguard = {
+    enable = true;
+    interfaces.wg0 = {
+      ips = [ "10.100.0.40/32" ];
+      listenPort = 51871;
+      privateKeyFile = config.age.secrets.wireguard.path;
+      peers = [
+        {
+          # argonath
+          publicKey = "vTItDh9YPnA+8hL1kIK+7EHv0ol3qvhfAfz790miw1w=";
+          allowedIPs = [ "10.100.0.51/32" ];
+          endpoint = "157.230.146.234:51871";
+          persistentKeepalive = 25;
+        }
+        {
+          # rivendell
+          publicKey = "jf7T7TMKQWSgSXhUplldZDV9G2y2BjMmHIAhg5d26ng=";
+          allowedIPs = [ "10.100.0.60/32" ];
+          persistentKeepalive = 25;
+        }
+      ];
+    };
+  };
+
+  networking.firewall.trustedInterfaces = [ "wg0" ];
+  networking.firewall.allowedUDPPorts = [ 51871 ];
+
+  home-manager = {
+    users.${adminUser.name} = {
+      imports = [
+        ../../../home/profiles/minimal.nix
+      ];
+    };
+  };
+
+  system.stateVersion = "23.11"; # Did you read the comment?
+}
diff --git a/machines/nixos/x86_64-linux/rivendell.nix b/machines/nixos/x86_64-linux/rivendell.nix
index e07e876..1e7abcf 100644
--- a/machines/nixos/x86_64-linux/rivendell.nix
+++ b/machines/nixos/x86_64-linux/rivendell.nix
@@ -53,13 +53,6 @@
       listenPort = 51871;
       privateKeyFile = config.age.secrets.wireguard.path;
       peers = [
-        {
-          # digital ocean droplet
-          publicKey = "I+l/sWtfXcdunz2nZ05rlDexGew30ZuDxL0DVTTK318=";
-          allowedIPs = [ "10.100.0.50/32" ];
-          endpoint = "165.232.158.110:51871";
-          persistentKeepalive = 25;
-        }
         {
           # argonath
           publicKey = "vTItDh9YPnA+8hL1kIK+7EHv0ol3qvhfAfz790miw1w=";
diff --git a/machines/nixos/x86_64-linux/synology-vm.nix b/machines/nixos/x86_64-linux/synology-vm.nix
deleted file mode 100644
index 600312d..0000000
--- a/machines/nixos/x86_64-linux/synology-vm.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  lib,
-  adminUser,
-  config,
-  ...
-}:
-{
-  imports = [
-    ../../../profiles/cgroups.nix
-    ../../../profiles/defaults.nix
-    ../../../profiles/disk/basic-vm.nix
-    ../../../profiles/home-manager.nix
-    ../../../profiles/server.nix
-  ];
-
-  age = {
-    secrets = {
-      restic_gcs_credentials = {
-        file = ../../../secrets/restic_gcs_credentials.age;
-      };
-      restic_password = {
-        file = ../../../secrets/restic_password.age;
-      };
-      nas_client_credentials = {
-        file = ../../../secrets/nas_client.age;
-      };
-      wireguard = {
-        file = ../../../secrets/vm-synology/wireguard.age;
-      };
-    };
-  };
-
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.systemd-boot.enable = true;
-
-  networking.hostName = "synology-vm";
-  networking.useDHCP = lib.mkDefault true;
-  systemd.network.wait-online.anyInterface = lib.mkDefault config.networking.useDHCP;
-
-  users.users.builder = {
-    openssh.authorizedKeys.keys = [
-      # my personal key
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBkozy+X96u5ciX766bJ/AyQ3xm1tXZTIr5+4PVFZFi"
-      # remote builder ssh key
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGFGxdplt9WwGjdhoYkmPe2opZMJShtpqnGCI+swrgvw"
-    ];
-    isNormalUser = true;
-    group = "nogroup";
-  };
-
-  nix.settings.trusted-users = [ "builder" ];
-
-  networking.wireguard = {
-    enable = true;
-    interfaces.wg0 = {
-      ips = [ "10.100.0.40/32" ];
-      listenPort = 51871;
-      privateKeyFile = config.age.secrets.wireguard.path;
-      peers = [
-        {
-          publicKey = "I+l/sWtfXcdunz2nZ05rlDexGew30ZuDxL0DVTTK318=";
-          allowedIPs = [ "10.100.0.0/24" ];
-          endpoint = "165.232.158.110:51871";
-          persistentKeepalive = 25;
-        }
-        {
-          # rivendell
-          publicKey = "jf7T7TMKQWSgSXhUplldZDV9G2y2BjMmHIAhg5d26ng=";
-          allowedIPs = [ "10.100.0.0/24" ];
-          persistentKeepalive = 25;
-        }
-      ];
-    };
-  };
-
-  networking.firewall.allowedUDPPorts = [ 51871 ];
-
-  home-manager = {
-    users.${adminUser.name} = {
-      imports = [
-        ../../../home/profiles/minimal.nix
-      ];
-    };
-  };
-
-  system.stateVersion = "23.11"; # Did you read the comment?
-}
-- 
cgit v1.2.3