From 82e70e0151c5ff5715f05236877237226356befb Mon Sep 17 00:00:00 2001
From: moira <moira@moira.is>
Date: Mon, 12 Sep 2022 19:05:32 +0200
Subject: [PATCH] change name

---
 common/users.nix                   |  4 ++--
 services/mail.nix                  | 14 +++++++-------
 services/syncthing.nix             |  8 ++------
 websites/muc.hacc.earth/index.html |  2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/common/users.nix b/common/users.nix
index 7c4cbb9..22002ca 100644
--- a/common/users.nix
+++ b/common/users.nix
@@ -48,13 +48,13 @@
       packages = with pkgs; [ ffmpeg ];
     };
 
-    schweby = {
+    moira = {
       uid = 1004;
       shell = pkgs.fish;
       isNormalUser = true;
       extraGroups = [ "wheel" "cdrom" ];
       openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqj9RRfthjBl4+y4YH7aWetx5qs2KOE2B0oOw3pjRrQ schweby 2022-05-22"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJrcJRF71+XM5YZj+SaSiGcdVZ0IDxGBXIWssDtHiTtr moira_2022_06"
       ];
       hashedPassword = "$6$zkAsaVdmIduqZxez$GY9aBlYeP41F0it/VbbZzLLLRQhHAbDdFsa3e/1GS9McTuSimMHODg6HqNVEH1zSqD3afhK/0UHfqbtF5qpi90";
     };
diff --git a/services/mail.nix b/services/mail.nix
index 518f973..211a2e1 100644
--- a/services/mail.nix
+++ b/services/mail.nix
@@ -42,7 +42,7 @@
       "raphael@hacc.space".hashedPassword =
         "$6$QveHpwMcp9mkFVAU$EFuahOrJIxPg.c.WGFHtrP3.onwJYwvP7fiBHHGb9jhosewZ2tEUP.2D3uyDLhd9Cfny6Yp4jDk/Hkjk7/ME1/";
 
-      "schweby@hacc.space".hashedPassword =
+      "moira@hacc.space".hashedPassword =
         "$6$BpYhwcZNrkLhVqK$6FMqA/vUkdV4GBlHLSqS5DRCb/CaLDNeIsBcZ8G30heytS/tJj2Ag7b1ovSltTA4PUfhee3pJrz1BkwkA93vN1";
 
       "zauberberg@hacc.space".hashedPassword =
@@ -81,7 +81,7 @@
         "hexchen@hacc.space"
         "octycs@hacc.space"
         "raphael@hacc.space"
-        "schweby@hacc.space"
+        "moira@hacc.space"
         "zauberberg@hacc.space"
         "stuebinm@hacc.space"
         "lenny@hacc.space"
@@ -89,12 +89,12 @@
 
       # admin: current people with access to the mail server and knowledge on how to use it™
       "admin@hacc.space" =
-        [ "hexchen@hacc.space" "schweby@hacc.space" "zauberberg@hacc.space" ];
+        [ "hexchen@hacc.space" "moira@hacc.space" "zauberberg@hacc.space" ];
 
       # voc: hacc video operation center, various streaming-related things
       "voc@hacc.space" = [
         "hexchen@hacc.space"
-        "schweby@hacc.space"
+        "moira@hacc.space"
         "octycs@hacc.space"
         "stuebinm@hacc.space"
         "zauberberg@hacc.space"
@@ -105,13 +105,13 @@
       # -- Regional: Germany --
       # board of hacc e.V.
       "vorstand@hacc.space" =
-        [ "raphael@hacc.space" "schweby@hacc.space" "zauberberg@hacc.space" ];
+        [ "raphael@hacc.space" "moira@hacc.space" "zauberberg@hacc.space" ];
 
       # members of hacc e.V.
       "mitglieder@hacc.space" = [
         "hexchen@hacc.space"
         "raphael@hacc.space"
-        "schweby@hacc.space"
+        "moira@hacc.space"
         "zauberberg@hacc.space"
         "lenny@hacc.space"
         "octycs@hacc.space"
@@ -123,7 +123,7 @@
         "hexchen@hacc.space"
         "octycs@hacc.space"
         "raphael@hacc.space"
-        "schweby@hacc.space"
+        "moira@hacc.space"
         "zauberberg@hacc.space"
         "stuebinm@hacc.space"
         "lenny@hacc.space"
diff --git a/services/syncthing.nix b/services/syncthing.nix
index 3eff7a7..40bab1c 100644
--- a/services/syncthing.nix
+++ b/services/syncthing.nix
@@ -7,10 +7,6 @@
     configDir = "/persist/var/lib/syncthing/";
     dataDir = "/persist/data/syncthing/";
     devices = {
-      schweby = {
-        addresses = []; # empty = dynamic
-        id = "YF7DNNS-B63GERK-YFQ7G7Q-2DG7557-VIWFOTK-R3JOS63-T76POBQ-F6MO6AH";
-      };
       raphael-laptop = {
         addresses = []; # empty = dynamic
         id = "72B3T74-NOMJV3X-EVJXTJF-5GGAEZB-ZDKBHXQ-VQNRYEU-YCPA2JP-L6NGAAG";
@@ -25,7 +21,7 @@
     folders = {
       "/persist/data/syncthing/hacc/" = {
         id = "qt2ly-xvvvs";
-        devices = [ "schweby" "conway" "raphael-laptop"];
+        devices = [ "conway" "raphael-laptop"];
         type = "receiveonly";
         versioning = {
           type = "simple";
@@ -34,7 +30,7 @@
       };
       "/persist/data/syncthing/hacc_eV_vorstand/" = {
         id = "twwt7-fxrsr";
-        devices = [ "schweby" "conway" "raphael-laptop"];
+        devices = [ "conway" "raphael-laptop"];
 #        type = "receiveencrypted"; # no yet implemented
       };
     };
diff --git a/websites/muc.hacc.earth/index.html b/websites/muc.hacc.earth/index.html
index fbc0bb4..e386de9 100644
--- a/websites/muc.hacc.earth/index.html
+++ b/websites/muc.hacc.earth/index.html
@@ -402,7 +402,7 @@ registered at the local court Munich VR 208921
                         <ul>
                             <li>raphael or rw</li>
                             <li>zauberberg</li>
-                            <li>schweby</li>
+                            <li>moira</li>
                         </ul
                     </li>
                     <li><a href="https://gitlab.infra4future.de/hacc/verein/satzung">Satzung</a> (statutes)</li>