From c954d0ed264ca93d576c7b68547d6d187443659f Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.be>
Date: Wed, 26 Jun 2024 16:24:47 +0200
Subject: [PATCH] Remove some more references to old work laptop

---
 .gitlab-ci/build.yml               | 1 -
 .gitlab-ci/update.yml              | 1 -
 modules/base/network/wireguard.nix | 9 ++-------
 secrets.nix                        | 4 ----
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml
index bb49805c..050e827b 100644
--- a/.gitlab-ci/build.yml
+++ b/.gitlab-ci/build.yml
@@ -9,7 +9,6 @@ build-nixos-configurations:
   parallel:
     matrix:
       - HOST_TO_BUILD:
-          - kharbranth
           - kholinar
           - lasting-integrity
           - urithiru
diff --git a/.gitlab-ci/update.yml b/.gitlab-ci/update.yml
index 068d5d1d..5e460fb1 100644
--- a/.gitlab-ci/update.yml
+++ b/.gitlab-ci/update.yml
@@ -19,7 +19,6 @@ build-nixos-configurations:
   parallel:
     matrix:
       - HOST_TO_BUILD:
-          - kharbranth
           - kholinar
           - lasting-integrity
           - urithiru
diff --git a/modules/base/network/wireguard.nix b/modules/base/network/wireguard.nix
index 7220783a..704166f5 100644
--- a/modules/base/network/wireguard.nix
+++ b/modules/base/network/wireguard.nix
@@ -4,17 +4,12 @@ let
   data = {
     fairphone = {
       pubkey = "mHAq+2AP1EZdlSZIxA8UCret8EStrR3nEIU2x6NVETE=";
-      ip = "10.240.0.5";
-    };
-    kharbranth = {
-      pubkey = "Zc45PJl+kaa/2GnIs1ObfAmbe640uJ4h1oRn6+qOQHU=";
-      privkeyFile = config.age.secrets."files/wireguard/kharbranth.privkey".path;
-      ip = "10.240.0.3";
+      ip = "10.240.0.4";
     };
     kholinar = {
       pubkey = "oRA22ymFeNQBeRx6Jyd6Gd8EOUpAv9QSFkGs+Br7yEk=";
       privkeyFile = config.age.secrets."files/wireguard/kholinar.privkey".path;
-      ip = "10.240.0.4";
+      ip = "10.240.0.3";
     };
     lasting-integrity = {
       pubkey = "mid3XfCY2jaNK0J6C9ltFLAbxL0IApwMw9K1Z+PU8C0=";
diff --git a/secrets.nix b/secrets.nix
index e2a114cf..8a3e4015 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -1,16 +1,13 @@
 let
-  kharbranth = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWu55zjDTl0qr5+kWNzuxGe5qem40ML8ELohapW/xug";
   kholinar = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOL8MzChayhcVTfZvE3/ExwXpq2+LbihjzUVlKeIGoOL";
   lasting-integrity = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMKJmeY7j5LxWVv3fKzqG4Bvg/ZhOp8iwk0utpyMWMSk";
   urithiru = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOrzOpyzDc5BVtAeb5//PnMRcp+9B+DjfU7p2YpaH6a2";
   hosts = [
-    kharbranth
     kholinar
     lasting-integrity
     urithiru
   ];
   laptops = [
-    kharbranth
     kholinar
   ];
   servers = [
@@ -94,7 +91,6 @@ in
   "secrets/files/services/mautrix-whatsapp/registration.yml.age".publicKeys = [ lasting-integrity ] ++ users;
   "secrets/files/services/matrix-sliding-sync/env.age".publicKeys = [ lasting-integrity ] ++ users;
 
-  "secrets/files/wireguard/kharbranth.privkey.age".publicKeys = [ kharbranth ] ++ users;
   "secrets/files/wireguard/kholinar.privkey.age".publicKeys = [ kholinar ] ++ users;
   "secrets/files/wireguard/lasting-integrity.privkey.age".publicKeys = [ lasting-integrity ] ++ users;
   "secrets/files/wireguard/urithiru.privkey.age".publicKeys = [ urithiru ] ++ users;