From 38dbad4488aeed6052eff4010c03df46eb870e5e Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 16 Feb 2024 18:10:05 +0800
Subject: [PATCH] nixops: remove old rpi

---
 nixops/experimental-users.nix | 4 ----
 nixops/nixops.nix             | 2 --
 nixops/rpi.nix                | 5 +----
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 nixops/experimental-users.nix

diff --git a/nixops/experimental-users.nix b/nixops/experimental-users.nix
deleted file mode 100644
index a67ca908..00000000
--- a/nixops/experimental-users.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-
-{
-}
diff --git a/nixops/nixops.nix b/nixops/nixops.nix
index 35ddc9f7..01604edb 100644
--- a/nixops/nixops.nix
+++ b/nixops/nixops.nix
@@ -6,8 +6,6 @@
   network.enableRollback = true;
 
   rpi-1 = import ./rpi.nix { host = "rpi-1"; rpi4 = true; };
-  rpi-2 = import ./rpi.nix { host = "rpi-2"; rpi4 = false; experimental-users = true; };
-  rpi-3 = import ./rpi.nix { host = "rpi-3"; rpi4 = true; };
   rpi-4 = import ./rpi.nix { host = "rpi-4"; rpi4 = true; };
   zeus = import ./desktop.nix { host = "zeus"; };
   hera = import ./desktop.nix { host = "hera"; };
diff --git a/nixops/rpi.nix b/nixops/rpi.nix
index 0e11559b..b7a5eecd 100644
--- a/nixops/rpi.nix
+++ b/nixops/rpi.nix
@@ -34,15 +34,12 @@ in
 
   networking.hostName = host;
 
-  networking.firewall.allowedTCPPorts = if host == "rpi-2" then [ 6000 ] else [];
-
   time.timeZone = "Asia/Hong_Kong";
 
   users.extraGroups.plugdev = { };
   users.mutableUsers = false;
   users.defaultUserShell = pkgs.fish;
-  users.extraUsers = (import ./common-users.nix { inherit pkgs; }) //
-    (pkgs.lib.optionalAttrs experimental-users (import ./experimental-users.nix { inherit pkgs; })) // {
+  users.extraUsers = (import ./common-users.nix { inherit pkgs; }) // {
     nixbld = {
       isNormalUser = true;
       extraGroups = ["plugdev" "dialout"];