From 4b14ea5b4de1fef22873c44d456499c7d8809ed9 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sun, 23 Jan 2022 16:57:20 +0000
Subject: [PATCH] ops/nixos: remove rebuilder

It's in the common profile, we don't need it everywhere.
---
 ops/nixos/blade-chakotay/default.nix  | 2 +-
 ops/nixos/blade-janeway/default.nix   | 2 +-
 ops/nixos/blade-kim/default.nix       | 2 +-
 ops/nixos/blade-paris/default.nix     | 2 +-
 ops/nixos/blade-torres/default.nix    | 2 +-
 ops/nixos/blade-tuvok/default.nix     | 2 +-
 ops/nixos/clouvider-fra01/default.nix | 8 +-------
 ops/nixos/clouvider-lon01/default.nix | 2 +-
 ops/nixos/etheroute-lon01/default.nix | 2 +-
 ops/nixos/frantech-las01/default.nix  | 2 +-
 ops/nixos/frantech-lux01/default.nix  | 2 +-
 ops/nixos/frantech-nyc01/default.nix  | 2 +-
 ops/nixos/howl/default.nix            | 2 +-
 ops/nixos/installcd/default.nix       | 2 +-
 ops/nixos/netboot/default.nix         | 2 +-
 ops/nixos/porcorosso/default.nix      | 3 +--
 ops/nixos/swann/default.nix           | 2 +-
 ops/nixos/totoro/default.nix          | 2 +-
 18 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/ops/nixos/blade-chakotay/default.nix b/ops/nixos/blade-chakotay/default.nix
index 45e257eb97..4acb86c5cb 100644
--- a/ops/nixos/blade-chakotay/default.nix
+++ b/ops/nixos/blade-chakotay/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/blade-janeway/default.nix b/ops/nixos/blade-janeway/default.nix
index d4be9b6ef1..374cc1e38c 100644
--- a/ops/nixos/blade-janeway/default.nix
+++ b/ops/nixos/blade-janeway/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/blade-kim/default.nix b/ops/nixos/blade-kim/default.nix
index 4f82eeb66b..1abe214dfd 100644
--- a/ops/nixos/blade-kim/default.nix
+++ b/ops/nixos/blade-kim/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/blade-paris/default.nix b/ops/nixos/blade-paris/default.nix
index 32334a02f9..c2843ffdc7 100644
--- a/ops/nixos/blade-paris/default.nix
+++ b/ops/nixos/blade-paris/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/blade-torres/default.nix b/ops/nixos/blade-torres/default.nix
index 31a4fd22bb..94e59392f2 100644
--- a/ops/nixos/blade-torres/default.nix
+++ b/ops/nixos/blade-torres/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/blade-tuvok/default.nix b/ops/nixos/blade-tuvok/default.nix
index 7e6cecc1d1..29a2973f8c 100644
--- a/ops/nixos/blade-tuvok/default.nix
+++ b/ops/nixos/blade-tuvok/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/clouvider-fra01/default.nix b/ops/nixos/clouvider-fra01/default.nix
index a971e85f5b..8795ce3f74 100644
--- a/ops/nixos/clouvider-fra01/default.nix
+++ b/ops/nixos/clouvider-fra01/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
   machineSecrets = secrets.machineSpecific.clouvider-fra01;
@@ -126,12 +126,6 @@ in {
   my.ip.tailscale = "100.75.142.119";
   my.coredns.bind = [ "enp1s0" "tailscale0" "127.0.0.1" "::1" ];
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    rebuilder
-  ];
-
   # Define a user account.
   users.mutableUsers = false;
   users.users = {
diff --git a/ops/nixos/clouvider-lon01/default.nix b/ops/nixos/clouvider-lon01/default.nix
index 95dece0b0c..18bc88b657 100644
--- a/ops/nixos/clouvider-lon01/default.nix
+++ b/ops/nixos/clouvider-lon01/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
   machineSecrets = secrets.machineSpecific.clouvider-lon01;
diff --git a/ops/nixos/etheroute-lon01/default.nix b/ops/nixos/etheroute-lon01/default.nix
index a45c09c504..d5773daee5 100644
--- a/ops/nixos/etheroute-lon01/default.nix
+++ b/ops/nixos/etheroute-lon01/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
   machineSecrets = secrets.machineSpecific.etheroute-lon01;
diff --git a/ops/nixos/frantech-las01/default.nix b/ops/nixos/frantech-las01/default.nix
index ec46492968..18adfa3e7b 100644
--- a/ops/nixos/frantech-las01/default.nix
+++ b/ops/nixos/frantech-las01/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/frantech-lux01/default.nix b/ops/nixos/frantech-lux01/default.nix
index 99bcfe5e94..b92402d4d3 100644
--- a/ops/nixos/frantech-lux01/default.nix
+++ b/ops/nixos/frantech-lux01/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/frantech-nyc01/default.nix b/ops/nixos/frantech-nyc01/default.nix
index ab91db4ef9..7c4f285b60 100644
--- a/ops/nixos/frantech-nyc01/default.nix
+++ b/ops/nixos/frantech-nyc01/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
   machineSecrets = secrets.machineSpecific.frantech-nyc01;
diff --git a/ops/nixos/howl/default.nix b/ops/nixos/howl/default.nix
index c73a55810d..128b09a7cf 100644
--- a/ops/nixos/howl/default.nix
+++ b/ops/nixos/howl/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/installcd/default.nix b/ops/nixos/installcd/default.nix
index 6e630be537..43e915d29d 100644
--- a/ops/nixos/installcd/default.nix
+++ b/ops/nixos/installcd/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/netboot/default.nix b/ops/nixos/netboot/default.nix
index 5f995aa8e5..a9f918cd52 100644
--- a/ops/nixos/netboot/default.nix
+++ b/ops/nixos/netboot/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix
index dd21613e06..ad0e663473 100644
--- a/ops/nixos/porcorosso/default.nix
+++ b/ops/nixos/porcorosso/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
   nvidia-offload-profile = ''
@@ -127,7 +127,6 @@ in {
   environment.systemPackages = with pkgs; [
     pciutils
     nvidia-offload
-    rebuilder
     deluge
     (writeShellScriptBin "windows" ''
       set -ue
diff --git a/ops/nixos/swann/default.nix b/ops/nixos/swann/default.nix
index 3dc1e8442f..3a1217e976 100644
--- a/ops/nixos/swann/default.nix
+++ b/ops/nixos/swann/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {
diff --git a/ops/nixos/totoro/default.nix b/ops/nixos/totoro/default.nix
index e4f5dc3bdc..90dc6f66ea 100644
--- a/ops/nixos/totoro/default.nix
+++ b/ops/nixos/totoro/default.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ depot, lib, pkgs, rebuilder, config, ... }:
+{ depot, lib, pkgs, config, ... }:
 let
   inherit (depot.ops) secrets;
 in {