fix: re-mock secrets

configs/fu-berlin.nix

@@ -92,31 +92,24 @@ in {
       "x-systemd.device-timeout=1"
       "x-systemd.idle-timeout=1min"
     ];
+
+    firstCharacter = lib.strings.substring 0 1;
+
+    home-directory-mount = user: {
+      "${remoteDir}/fu/${user}/home" = {
+        device = "${user}@login.zedat.fu-berlin.de:/home/${firstCharacter user}/${user}";
+        fsType = "sshfs";
+        options = [
+          "allow_other"
+          "_netdev"
+          "x-systemd.automount"
+          "reconnect"
+          "ServerAliveInterval=15"
+          "IdentityFile=${config.age.secrets.fu-sftp-key.path}"
+        ];
+      };
+    };
   in {
-    "${remoteDir}/fu/meinhak99/home" = {
-      device = "meinhak99@login.zedat.fu-berlin.de:/home/m/meinhak99";
-      fsType = "sshfs";
-      options = [
-        "allow_other"
-        "_netdev"
-        "x-systemd.automount"
-        "reconnect"
-        "ServerAliveInterval=15"
-        "IdentityFile=${config.age.secrets.fu-sftp-key.path}"
-      ];
-    };
-    "${remoteDir}/fu/xm7234fu/home" = {
-      device = "xm7234fu@login.zedat.fu-berlin.de:/home/x/xm7234fu";
-      fsType = "sshfs";
-      options = [
-        "allow_other"
-        "_netdev"
-        "x-systemd.automount"
-        "reconnect"
-        "ServerAliveInterval=15"
-        "IdentityFile=${config.age.secrets.fu-sftp-key.path}"
-      ];
-    };
     "${remoteDir}/fu/zodiac" = {
       device = "//trove.storage.fu-berlin.de/GESCHKULT";
       fsType = "cifs";
@@ -126,7 +119,8 @@ in {
           "credentials=${config.age.secrets.cifs-credentials-zodiac.path}"
         ];
     };
-  };
+  } // home-directory-mount "meinhak99"
+    // home-directory-mount "xm7234fu";
 
   age.secrets = {
     cifs-credentials-zodiac.file = ../secrets/cifs-credentials-zodiac.age;

secrets.txt

@@ -1,5 +1,4 @@
 secrets/alertmanager-token-reporters.age
-secrets/blackboard-calendar-ics.age
 secrets/cifs-credentials-hu-berlin.age
 secrets/cifs-credentials-zodiac.age
 secrets/di-fm-key.age
@@ -17,6 +16,7 @@ secrets/fatteh-syncthing-key.age
 secrets/ful-retiolum-privateKey-ed25519.age
 secrets/ful-retiolum-privateKey-rsa.age
 secrets/ful-root.age
+secrets/fu-sftp-key.age
 secrets/github-token-i3status-rust.age
 secrets/grafana-password-admin.age
 secrets/hetzner-storagebox-credentials.age
@@ -64,6 +64,4 @@ secrets/zaatar-moodle-dl-basicAuth.age
 secrets/zaatar-moodle-dl-tokens.json.age
 secrets/zaatar-retiolum-privateKey-ed25519.age
 secrets/zaatar-retiolum-privateKey-rsa.age
-secrets/zaatar-syncthing-cert.age
-secrets/zaatar-syncthing-key.age
 secrets/zaatar-ympd-basicAuth.age

systems/zaatar/configuration.nix

@@ -18,7 +18,6 @@ in {
     ./spotifyd.nix
     # ../../configs/keyboard.nix
     ../../configs/sound.nix
-    ../../configs/fritzbox.nix
     ../../configs/monitoring.nix
     ../../configs/retiolum.nix
     ../../configs/printing.nix