chore: secrets rekey

home-manager-modules/mails/default.nix

@@ -32,7 +32,7 @@ with lib;
     };
 
     programs.mbsync = {
-      enable = true;
+      enable = lib.mkDefault true;
       package = pkgs.unstable.isync;
     };
 
@@ -128,16 +128,17 @@ with lib;
     };
 
     services.mbsync = {
-      enable = true;
+      enable = lib.mkDefault true;
       frequency = "minutely";
       package = pkgs.unstable.isync;
     };
 
-    services.mbsync.postExec = "${pkgs.notmuch}/bin/notmuch new";
+    services.mbsync.postExec = lib.mkDefault "${pkgs.notmuch}/bin/notmuch new";
+
     programs.notmuch = {
-      enable = true;
+      enable = lib.mkDefault true;
       new.tags = [ "new" ];
-      hooks.postNew = ''
+      hooks.postNew = lib.mkDefault ''
         ${pkgs.afew}/bin/afew --tag --new
       '';
     };

machines/arcadia/default.nix

@@ -0,0 +1,90 @@
+{
+  pkgs,
+  inputs,
+  ...
+}:
+
+{
+  imports = [
+    ./hardware.nix
+    ./home-julien.nix
+  ];
+
+  machine.meta = {
+    arch = "x86_64-linux";
+    nixpkgs_version = inputs.unstable;
+    hm_version = inputs.home-manager-unstable;
+    # TODO: Fix colmena deployment
+    ips.public.ipv4 = "127.0.0.1";
+
+  };
+
+  environment.persistence."/persistent" = {
+    hideMounts = true;
+    directories = [
+      "/var/lib"
+      "/var/log"
+      "/etc/NetworkManager/system-connections"
+    ];
+    files = [
+      "/etc/machine-id"
+      "/etc/ssh/ssh_host_ed25519_key"
+      "/etc/ssh/ssh_host_ed25519_key.pub"
+    ];
+  };
+  programs.fuse.userAllowOther = true;
+
+  fileSystems."/persistent".neededForBoot = true;
+
+  disko = import ./disko.nix;
+
+  boot.loader.systemd-boot.enable = true;
+
+  networking.wireless.enable = false;
+
+  services.tailscale.enable = true;
+
+  networking.networkmanager.enable = true;
+
+  networking.networkmanager.dns = "systemd-resolved";
+  services.resolved.enable = true;
+
+  services.dbus.enable = true;
+
+  programs.dconf.enable = true;
+
+  security.polkit.enable = true;
+
+  nix = {
+    distributedBuilds = true;
+    buildMachines = [
+      {
+        hostName = "epyc.infra.newtype.fr";
+        maxJobs = 100;
+        systems = [ "x86_64-linux" ];
+        sshUser = "root";
+        supportedFeatures = [
+          "kvm"
+          "nixos-test"
+        ];
+        sshKey = "/home/julien/.ssh/id_ed25519";
+        speedFactor = 2;
+      }
+    ];
+  };
+
+  environment.systemPackages = with pkgs; [
+    tailscale
+    brightnessctl
+    sbctl
+  ];
+
+  security.pam.services.swaylock = { };
+
+  programs.ssh.startAgent = true;
+
+  services.xserver.desktopManager.gnome.enable = true;
+
+  services.gnome.gnome-keyring.enable = true;
+  system.stateVersion = "25.05";
+}

machines/arcadia/disko.nix

@@ -0,0 +1,90 @@
+{
+  devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/disk/by-id/nvme-PNY_CS2241_4TB_SSD_PNY23362309060100017";
+        content = {
+          type = "gpt";
+          partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02";
+            };
+            ESP = {
+              size = "10G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            swap = {
+              size = "16G";
+              content = {
+                type = "swap";
+                discardPolicy = "both";
+              };
+            };
+            luks = {
+              size = "100%";
+              content = {
+                type = "luks";
+                name = "crypted";
+                extraOpenArgs = [ ];
+                passwordFile = "/tmp/secret.key";
+                settings = {
+                  # if you want to use the key for interactive login be sure there is no trailing newline
+                  # for example use `echo -n "password" > /tmp/secret.key`
+                  allowDiscards = true;
+                };
+                content = {
+                  type = "lvm_pv";
+                  vg = "mainpool";
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+    lvm_vg = {
+      mainpool = {
+        type = "lvm_vg";
+        lvs = {
+          root = {
+            size = "500G";
+            pool = "mainpool";
+            content = {
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/";
+              mountOptions = [ "defaults" ];
+            };
+          };
+          persistent = {
+            size = "1T";
+            pool = "mainpool";
+            content = {
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/persistent";
+              mountOptions = [ "defaults" ];
+            };
+          };
+
+          store = {
+            size = "2T";
+            pool = "mainpool";
+            content = {
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/nix";
+            };
+          };
+        };
+      };
+    };
+  };
+}

machines/arcadia/hardware.nix

@@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

machines/arcadia/home-julien.nix

@@ -0,0 +1,69 @@
+{ pkgs, ... }:
+{
+
+  luj.hmgr.julien = {
+    home.stateVersion = "25.05";
+    luj.programs.neovim.enable = true;
+    luj.programs.ssh-client.enable = true;
+    luj.programs.git.enable = true;
+    luj.programs.gtk.enable = true;
+    luj.programs.kitty.enable = true;
+    luj.programs.dunst.enable = true;
+    luj.programs.fish.enable = true;
+    luj.programs.firefox.enable = true;
+    luj.programs.pass.enable = true;
+
+    programs.direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+
+    home.pointerCursor = {
+      name = "Adwaita";
+      package = pkgs.adwaita-icon-theme;
+      size = 15;
+      x11 = {
+        enable = true;
+        defaultCursor = "Adwaita";
+      };
+    };
+
+    home.packages =
+      with pkgs;
+      [
+        du-dust
+        kitty
+        jq
+        lazygit
+        fira-code
+        feh
+        meld
+        emacs
+        vlc
+        jftui
+        libreoffice
+        font-awesome
+        cantarell-fonts
+        roboto
+        htop
+        evince
+        mosh
+        zotero
+        flameshot
+        kitty
+        networkmanagerapplet
+        xdg-utils
+        step-cli
+        gh
+        signal-desktop
+        scli
+        texlive.combined.scheme-full
+      ]
+      ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
+    fonts.fontconfig.enable = true;
+
+    home.keyboard = {
+      layout = "fr";
+    };
+  };
+}

machines/gallifrey/home-julien.nix

@@ -10,6 +10,19 @@
     luj.programs.fish.enable = true;
     luj.emails.enable = true;
 
+    services.mbsync.postExec = lib.mkForce null;
+
+    services.mbsync.enable = lib.mkForce false;
+    programs.mbsync.enable = lib.mkForce false;
+    programs.notmuch.hooks.postNew = lib.mkForce "";
+
+    services.muchsync.remotes."gustave" = {
+      frequency = "minutely";
+      local.checkForModifiedFiles = true;
+      remote.checkForModifiedFiles = true;
+      remote.host = "gustave";
+    };
+
     programs.rofi = {
       enable = true;
       package = pkgs.rofi-wayland;
@@ -116,6 +129,9 @@
         nixfmt-rfc-style
         slack
         haskell-language-server
+        aporetic
+        notmuch
+        muchsync
       ]
       ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
 

secrets/arkheon-env.age

@@ -1,7 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 xaddyw nLJD9UuTqXMDL5FlK+khJzXUJPfOKM+vCcz5UcIOvTE
+-> ssh-ed25519 xaddyw xPC11NjM0JMjUp2wqaegFCqhfMNJyP5EV5WDT+8hV10
-dQXhwQXlEvOPvGVVia+cZz0QsFW71mXZ+T/Y6KbGJ54
+Bu1ibnG9qvlfsDcMoop/6RP0mOjrn0WUtd4ygyymoj8
--> ssh-ed25519 AqX2tg QKqZXeQN6kTw/Zn6gfhcSXauCZ/f6AlR2LJOtsPGvUw
+-> ssh-ed25519 AqX2tg kCeG95SRkyesW5BTZaxyn08d6V6+EOoBVc0urNfJqB8
-st/grftYWuM1t+/rSklW6NOUmQzdpULFkipP0CahNFQ
+LjfH/R8ban7oolaB+U0RVxMhE11PUsPdzXiK7BIMhAg
---- Wwtoau+JPtzsTPPjQtySDZ4to1vqy5qSqkwSwb4U6LM
+--- NzbJ41HV75iz0cT9hkmx40VBc9gx6+gLK1cjIMvKl6s
-4÷…óX)a‡éüén#<23>±ób¸EÉ\‚<>—\<†”›dt×E_ÚÊ>ðgy²š½4H¥ö<1D>J¯IÎfÆ¿m«4m)Uõ…
+¡Èžbuáp‹ýù#`’,º$(ä$·9n‘‡Ä}u4–çîþ<>tCÙïªS0¯<><C2AF>
h‡‰T…
+B¢2¢TÅ)'uõaýFÂ

secrets/arkheon-token.age

@@ -1,21 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 IRHAkA nJ40SZ/rTJSVpyPPXH7/OCp0URJUIji844nKEhUMDko
+-> ssh-ed25519 IRHAkA 7B09NkP0G9zRgXApuuZcQZm5/ixUkln5MeAo1VlEIQI
-k51cPR2FePDLt3rNrHja2fh9w6OPS3ZE+eTM0dIj7SI
+5cd/W1crpfDaeesK5Dww056FHHr7+lWj5l2Ge3EDJ4o
--> ssh-ed25519 AqX2tg YeRfXa+5kK2FN1cEmq3kJt1C8wjCYDmdb1nl0ReQtDo
+-> ssh-ed25519 AqX2tg FBvOpTQQba/IfnXnoheaHoTsRA3yya6ZiGHcGhS9nn4
-UvyjaSkr/ELkKvAjYBNoF/PicSMq0lNFvzuNH3OjKWI
+9sSBjJhHHB7WJWSOXkuOj+byCGt28W4TSuXXxXivtPM
--> ssh-ed25519 bD9h7A e7rauq5h4SCgahs8vcH1TkOcgYoN/DQL0U3hcgr9Y0w
+-> ssh-ed25519 bD9h7A RROmyZx6l3VN7EAbqX9mj/x+sYlMLW3jIN8SMWg79RI
-SQC6kvoCWS5tPjrw/6FTg5KgMtU8VLTOOSRsJqeNAbs
+jr0+OxjVtZ0pfayj3+yoV/PFvtN6yI/bn4UfpNJT7Ik
--> ssh-ed25519 2Wt2Kw x/2OIbTFH0BmMKLT1ON0tnaVPc8V+j4uJi/Fp8pK9zQ
+-> ssh-ed25519 2Wt2Kw I0HVtsjSO+kCo5XuAAzw3+z1fVkdxVzBsOcwYBO8rQc
-E67Af9r4gXMkTjT6n9IzSiiggDJWCH9qANOukjDZjaA
+4fAnpgrBZALYzZu6VSuZwPJn7b/070OkMBk/lBNnNfw
--> ssh-ed25519 xaddyw nDOMnYv6qWrwnbOQyb7+S39DdgBQv3KXjJtZy71jGhQ
+-> ssh-ed25519 xaddyw EVDv5SU0eXloBYt+hlNPqk7bwnqB154xLaez/0mkcjo
-qx7RlwTtTXLuF/4MbY/sy3pM4sz+uVORVAN8iY7fPKo
+8IGxSRFReERhkIOp4H61LiH8oYohI/59V954fb27SZw
--> ssh-ed25519 6rkyTg 0wzSVkw4EutasfBnEMw99W2/0U8p3kJlg+OIZF7CoTQ
+-> ssh-ed25519 6rkyTg EHs4Yc4qXoc5SYA/18HJ1XIR4sipsGod41AnM9hCyQo
-Y1dxX4iBBXMjQ23mvxrwXqejitvAe5jtgwilIUSMlks
+ntnTTs8ZR44uH4aFb+xAebaBl0NEtv5GGTx1s3lyKGY
--> ssh-ed25519 d3M2Dw zi5iQyuuMUYSv0md6iCAb1T9d4uCqIyxZ3/lybmdfSM
+-> ssh-ed25519 d3M2Dw /kklvYT/KuYzy4/eUNHXGF4gKiprouRxeAKQjzVIbm4
-D1g+lF7CehSdnxdmFXlk9txr0hMzy+dCABoh45p2AAI
+30pK2ecTc89Z8PRf3AVmuqwBCrXcgc51vALs+dNpqaI
--> ssh-ed25519 81O5Zw 6WUbrnqsFCVhz9QRF66usDt9Tk49oKfnF+mTYfOXSwU
+-> ssh-ed25519 81O5Zw 7LYqit3QcgDP1FH1xzQ7NFmM3VWiC55w16BK9sB1SSc
-ffGpq6bdA2fmSnYjieijLrHYJqA8bFbH70Y5vlAZ99c
+CS3OusGbCRsHPFZEatklVPQIbtTofcltBwmFdO8RBzw
--> ssh-ed25519 Ye6ufg 1vHqTSFY9ieAZsSpT9D6ngXPKJlm5B620S9YE0K57Qw
+-> ssh-ed25519 Ye6ufg NOz7c2HaFikdoxDU1nnYM09ZPLy53rEcJZBjVYXGcW0
-jWBF/DfxAMZ52ANhwKGXy/IUdxaJ4J+Ni8HqVgHASQ4
+Mh/0mTWVPOjQO2c0BpVr54k6hEJJnokJwq8sBMgeW2k
---- tO1m2k3EHXh072ECJ4cfk3P1MutN3fgFAj6JJmPQl2E
+--- jnx+SbA973glT6RtjWYdLIhYyJwJhqgL02RZI7IuO4I
-Á•Ú­½U½€/)H(ô…XeâÊÁHù„="Ú·Ô2TØ‚µ!/í­;Œj
ÉÖ¶5v­†O¾äó
+oðkA±ùØ‚îXÆ,&íHEH	e‰W6Pu@DGð“áøÖjj½–l
Ëv¬Dö4Lu

secrets/borg-encryption-secret.age

@@ -1,7 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 81O5Zw L8hKKTVpjfluC3Y+wx5OGX2T2p5xk+5P1k+H1/NR22c
+-> ssh-ed25519 IRHAkA pnjm/AXCefpvtLl8TKXNoO4s56410pQjcTMyTejLLEc
-U6dm2kMetw6mFqpgRXpRwmwK/ZidrGfNTyj14LUGBEU
+ns5NyC0RQ7Rh/dJwFI62hUji1vtHpBe6xdSOP+IVf8w
--> ssh-ed25519 AqX2tg oukcpTdnL9FRo3AXNWYJFHQT6N06j9e1KKI7xN2Tzkk
+-> ssh-ed25519 81O5Zw wx9i53c7hZLf0AqQuhkWUJq6F/bOYWQWSoj8d6PZMTs
-D8KlG5Yt2VI4Zc0O78po1jZP4jwGSa5auV+UdqpDG54
+BdeUfw+7onWbTvEL0NezMCzUlghirR9sPJgc2gc7RHo
---- r0ZwkERWSheT7nvljjHKxuBeD72pQqKXWDnb5d35VKk
+-> ssh-ed25519 AqX2tg +LEbuZ1T8l46pTry68soTtB/6GUCA0E063M05p3cuno
-†¨`ʳ[ßÚËCêóhÄ?<3F>üÝ¢”²<E2809D><C2B2>'ªI5 Ðàƒgh.ËÄLkØ÷Ø»<C398>„ç^p`ýýÈ”dÅ%£"TiÔFÐõ
+yEpVMkmRztTeX43TUWYdwFbHaxlE2VFqg1hFFpNeUWc
+--- 4avj5LVXj9XlEqC0BIB0DaO6fg0AxXaMrAiY1Qg83DM
+‡#Öí°Ý<C2B0>c{驉<C2A9>­a–diw—†¬‰F²‹=Æ=>bТ
COÚ¬yE»	¨^ß™¢uß,åâY;zIf/¹gì6f±E

secrets/buildbot-nix-worker-password.age

@@ -1,5 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 AqX2tg ZyqbCoNZCVgRCqE804PLsK3dHZbpO+4YBwNRagpX+QQ
+-> ssh-ed25519 AqX2tg YpgL8L7jJ/l0aK8BGxjnHB8K9f/uAFles+oFn4vWxRI
-ZRkF784+CsmF1MegVhxKHXtsH8w7wfrCF6pFplc+HjA
+ETn3HoyhsxZ4McS85S/1ywccezYIjmoPoaO5gZDLkos
---- xEK8ewAii9OpyAldpG9KJ3rQPpNDx/XSuMw6IkfWjB4
+--- MLrEcvDA9c9awGQBwFMj6zpuIg/WRpKlpBj564GCf38
-ú˝É˝=˛¸őŰ<C591>D7<44>۲黅˙;ŐĘ­~ßj§Ťy´Ů4H3Ţןt,Í<>Ž®ÉÁXëNŠŚîRýůÄş}‰,
+¬ƒAƒóXÅ”.zç5Þ¡á±­óª?ÿ%Ï©÷˜(K‰iõ"?mì„KÏùi 	¾.¦]†¿­<mV’1

secrets/buildbot-nix-workers.age

@@ -1,5 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 AqX2tg SvuyiytGGiXIpwwzBsVNf1wHgFElEqLlEPF2kbomA3c
+-> ssh-ed25519 AqX2tg 3GHPU2rjpiCbP4lawFvHZGsEg5rq4PsD8Ut513aMsH4
-T72s7TL3Jirxe8bIYmpSDBHeIccfTcG1vfuz8GhN8rg
+LCPrEvWLTLRhD4eBiAz5p+rxKFxctfjvjP71YWbDkqg
---- 9Ijr1nDDUzI5WXAStQrHW2V3E4m16sYXB302Zaacz0s
+--- Ml7PhLCSg9vWXGKtcj+TdTjdNp3xdl2y6WRV0sXGJAY
-ÛÃ5ôï§Ä“	Ì<*Û*à!Çä13¦PêŽd„Ê“©²¬ÎBM没²;³Õå\.Š>+,‘Øv<C398>ÇK?
RÅÿ£±'¦<>V›´D<C2B4>û˼U |¡P÷(LÛj«2³œ‰žÖ9®ì+*¬¢
+€²…¶…Møhw´^Ò8.	®ÞðxÄ¢5ŸdÕìFëDû¥éµÓ<>Ò'ú¼úp³Ç~kç:“øül—ô°UP•5ƒ[JvkÔ~ÞŠœ*<2A>'H9whDL<44>]㟉_–vºbe2Ç

secrets/deluge-webui-password.age

@@ -1,7 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 IRHAkA h3qJVjYnOlwJsPUsdex0psyIJtSUcJ39hgu4CrF653k
+-> ssh-ed25519 IRHAkA kFtqhGTsDclHobdf6FtKOmHGSt+jJoywJ+oMNjk1cSE
-52gtw9mPcZ7sWIW+mQ5nrSAy7repzRdKTBT/dptvvq8
+/JvhIEh99jIxDbfeLcSzihJun1IBaUkxVlck+I3k1g0
--> ssh-ed25519 AqX2tg f86wFLvsqyESNBGY0RQoioWbzH8dQuhO55RnqauLugQ
+-> ssh-ed25519 AqX2tg k6gFw86Db9GFZ5EGETsLwbpDFLG6P/XjAazPjE9Rpnw
-V6exV7SeHWXUSVxIN9snQk9YNBQVP16+rk7pKjOC8bc
+YZ2CuOxvo8kIhxjyNr0Lf0ynK11BsNayFdANh55I32w
---- Jss8Kt1FujbD/QHuM8tdAC32CKJMQaLI2WnbdWC2qkY
+--- YEbgQ/HcYQ4orQInclwDULPG4pun0vD82Ab5Y+R38Ms
-(æÊR<C38A>'ܼu¶\Æ4!àáÞ,QpUuIõÞ\klù=/ñR^è÷ÿ~<7E>×4ê£gÚ«/¼C$¶½6·†—CÆO`ÅÏ
+¼§–·gë,‘Ù<E28098>»¸Ý™<C39D>ÅÅ°/ˆIª
³’õ‡{¸‰Ýµ¢'fúÞÔ„ËÔj]<5D>wR/—ßÿ늹u<C2B9>| ½Qº¨þ	¢4

secrets/dgnum-mail-pw.age

@@ -1,17 +1,15 @@
 age-encryption.org/v1
--> ssh-ed25519 u3yXZQ Gt/kW8A8YCCHO4vTt8/Xkv5IGy44L5GRlQRJV7uJtB0
+-> ssh-ed25519 u3yXZQ PCx9pIG730EKnUZs8WUCkqj3PHAB3mNJR/bzDEebcVY
-l5Ye+QDXuZpcRUew+reVUsHobGt7mvg14TBu7EHBlJ0
+9akeIv6CjdHBpyQ0L+bZf/qSo5AEBUUoxqDDJHcetIQ
--> ssh-ed25519 AqX2tg QD2dh3NlI+nUr2npI66C9tJDzWMmDZkpG6rI9VlYKRg
+-> ssh-ed25519 AqX2tg nPQbi67EwlsQ7zZHVEXeZnGQxktpCZtSjPp8PWA4eU4
-Q0lXt1h5p4Eje0ijnuezd/F+wp/c56V+msH43efTyeg
+WmWxyEOv498fzsj152UyBQcpFeiBY7bofc/BmUiVXQI
--> ssh-ed25519 eySVIw 6zJHde0VXY5sBQF26uVMWJoY8Jj0ma3uzjiS1LoomwE
+-> ssh-ed25519 eySVIw MQaFDt15ZY2xaUJ7pWnVLULMJC68tmvGYdqOS7NnaXg
-yK2D7riNgNibxlPkO37lt2TLtXCHdhgwvIB9yCapRZg
+ypBpP3Ibj78G+7C4yKuy+OPLcui08Y5QB5q3/GbuncM
--> ssh-ed25519 7MARBg 99SLMboCZggSZFHGMjE/WDSomfQ3QSJqGlmQwP1RWTg
+-> ssh-ed25519 7MARBg yw0N37/sK+GMDSY7RZy3zYErxMNXErKDx26/BrKKzi0
-/XGOwuNHlYForjnnOV/FsbxG5ZPK3yXn9yhmrJ7/csE
+iPA8dyHUdGfKErp7JiLe5ezDnAK+nA+dyXIqPsj5xOY
--> ssh-ed25519 e1FG/w leJf2nnlvoUqyuYQOrMHM02wWdt74Eshx34zap1TWEI
+-> ssh-ed25519 e1FG/w WBvvUffLsPenv26kUU4084Y0EqdjGMj3rVoSdg1paDo
-R45gUXUSw0tFJrEnRkOkwFmC6sDxPDNmTqebR3ZLPow
+XznkJaWTYoW7AdOboj3KAYR44eTYDTCpv/EGVthZCPs
--> ssh-ed25519 LFAtBQ r6Yt4hzE2rR4j99SoawIMsmdUVtV2n8rpuoluYzOfiI
+-> ssh-ed25519 LFAtBQ XD+lUVUtieuxwmIHwmplsWYABVzwrmYTRg/rRsiBoFA
-n2orEp1GUligR9GtRtB0ZYUeEBCuVAtLEoiHQNzB8Vs
+lHrjSbb5wdMndYyFW8BS5lJuyMrtKttzwyLMMMjSiRg
---- OIYQySq3jnuUxV7++q7MtErineiqETpMkD4DXRhhsAQ
+--- +nPWNMQD2Sn3aaNiHCgeZzcLrWQL4PXDG9Odu+8hRnA
-DBÑ|ÁæÕó¿Ê»TÛcü
+Ñ„^V&8‘Á‹í…AWk:µ?Œû̇NÌÑÉÔô¯öCO˜¬Ä˜Ü˶qjK­™ÈGß0VFfaûÍ;Þ51ÚkÍiïõ/ÒÇOè\_âì^ efב7Ì#)
-²<EFBFBD>BÂ6¬9¿Iþ[”°›@UTŒ™tÝIÖ%€Ý

-aŸ_³ë<C2B3>Ç—´7Ä ‘êx ø&èzpø¤¬rAÚ~ÅØ€¤E†#Š4êF§

secrets/ens-mail-password.age

@@ -1,25 +1,23 @@
 age-encryption.org/v1
--> ssh-ed25519 IRHAkA 4D6HVZ5SWx9tcW9bqnZFnwQq9nXmmI3f9HcTKctLUn0
+-> ssh-ed25519 IRHAkA Yor6DFn2J/ynGORisPeujiLJyzwDZVe7P8RzHvVxrU4
-NXhx6bqJvlsSiq7whyk4wkKSkp69zd9CQj5XP1LBQr8
+SQ60EFWYDHw5qQ/usJO/Sx0gagT3Qi1gCix80FbmUVY
--> ssh-ed25519 AqX2tg VA3AmrX/X1tgoblGd3dCUqzvFRJ2u/bkBVqTFWIwdFE
+-> ssh-ed25519 AqX2tg c7clc7uDVZ5Ak+oUQsRQRU0q6pUgxBxxqSuInXcdgG8
-6uF/EWnXBLH/ge1yfMn7W3LyFra9hfMT5bCSzKs7Kcs
+jppjml4DHkCcXGGYoeIbRakYAjO5rEKRkZCa7G/3tko
--> ssh-ed25519 bD9h7A 1dyN/JpCsJGLxK45Dz6guMhebgEgbJpRsz5l+Drsh38
+-> ssh-ed25519 bD9h7A BawGF+g64A0Yx8PpmbH1sbK87GRcBrVEMVpXcQz0Tyk
-urCtAMRimC3NRhwlGjeuQm4KrV/aZx4p6l9vZO3xvgE
+Q99jyUVP2iTOW4H25zMKkX99gupsfY08mHu5tZ/wtig
--> ssh-ed25519 2Wt2Kw eXUHlf9ETUR6JtMyqpNSqp6skj1+sbHtV4rMw/k/ZyY
+-> ssh-ed25519 2Wt2Kw 5JdUNJEgvz43rvUgTvGt+fzhePDSHC/Dw8G1edxiMDg
-/wHQoTYCTYzc0f0PIX6C9BdJ36q3lEklIDTTMU2yeyQ
+kIF/SyQIamc2BfKSp7x1Qa0+x/NPJ2toOTzn77gRQ5M
--> ssh-ed25519 xaddyw Tu+QTX9j7aKpduHDjOmXuFnTlz9dGKcvtEeY06y9mxw
+-> ssh-ed25519 xaddyw phnnGyPc7XuTQYJWrm9AG+2Tf8ika/4YAJUomu/BC2g
-yTy/f8/s+UAKwC8q641zXq2PKesj8+cjqPdKVgpcD/g
+EGz5Xr02gi1vHE7mPH9D0H8ARpuHtWvI2GanhucfoHc
--> ssh-ed25519 6rkyTg 14iILVzA+fWmxFzetr5fN5ZeCae/GDgEJmXTf/huyUo
+-> ssh-ed25519 6rkyTg nzHNVlsQ/tTymVXv7ES3b1zkjYM0V51pgZ2LDNBmU28
-Y9fFAQbw3Oeg8TBwmlFRedVmLcxTnlhpDb1qFSQp4ag
+zp5+eCYDUSzj1DTXiTPa90JFdPntDgDko/fEqJbHfx0
--> ssh-ed25519 d3M2Dw Y+Iyk+RfrNGnsfSTBsR+QEwvP+/1CrkDIooL2JsOOnw
+-> ssh-ed25519 d3M2Dw qdNB6x7UJtVB3QJIByZOKOtTOb42MtysvU7YDeTUyyI
-AXide9nognzHI+SSA/S+f6NZaPqsCeporr34M/szsic
+7GnWf45YGooDZhE1Jc/kCqI638J/OhI8bthKQSV7uVs
--> ssh-ed25519 81O5Zw vN38rQPt7BCUrBAr79c6zFZPqL5V+/skV0dR6JG6OVs
+-> ssh-ed25519 81O5Zw HI5dBG5TsE0M3F4qM0OBB43q3PF5ZonxZ1gnWhuL8xo
-XwMaAgpALZVfOpUQIyw2I0dfvepvgcZzszO6sE2B5Gw
+e+0GE6YRH//69eHu0/EWDaCeu+cAJoehfL4e+pJBRgY
--> ssh-ed25519 Ye6ufg 9V9dvEE814wj9JwVBlQNrrpCIgW5waalO03WYfVXzhQ
+-> ssh-ed25519 Ye6ufg +4OqwNlAYajpXeqPHebqCFCRtJqlcCXvoCdEcH2Z1nA
-jBVqSxaaTS2BEW9+XjRHpQ5/Xvlk0uPD46FiitFdwpU
+eU8rJMWvFtqqfAVglTVSY47WKuQHc5rTPRcKiIBxaxc
--> ssh-ed25519 RiYKHA hRDDCkfAy+lHZ9TdbQW/q+h+OGW7QbVxXaIsb0rUN2g
+-> ssh-ed25519 eySVIw w+7fENaneUwZuR8YTzK4mnY5VX+a9auXP87jklYjjHE
-lIWtHHKeL3gyVJWv3chtMkftddVXyMrqpdKtPXgSR4k
+4rNghf+z8MkWCkGpqUpxTassAUC9LQJcWBuze3E+nwM
--> ssh-ed25519 eySVIw 5HO0DEwp3inC7shzRmCu+LkfxhsOIUVYplASsYMBXnk
+--- YSQKqh2zS6hLHdymoQ8Y4It8U82HgCCl9XyO0V3V9Os
-mtYTb0jyo8W/lnyJj2LUQtcGYeozaFKpCSCdKzwxlbs
+gTë&o˜<6F>2˜ýé-C(`'m[³s¸´NŒøâxßUÖZ´àjq~ì‹Ä
---- Wpo7x0aEn9wu/4gqBQ4ZKPWJ8aJTkz4t+rc+bryKKQc
-IÀµ0wsê=@z
i÷ê/Þ>´cÒ÷Kž¡¹„µîœpìú’„Á´ä

secrets/ens-mail-pw.age

@@ -1,15 +1,15 @@
 age-encryption.org/v1
--> ssh-ed25519 u3yXZQ k0PCHuouLHEOqkGNU6kAcFussncfK9tjXyeYqQM1pnE
+-> ssh-ed25519 u3yXZQ GV0TRdzA6isx2TKy193vRNsM77aloxEbsBM78izSzDk
-QXmOVnbxiHfsCt++ofBKLKzXCs+inxm7H5STDNyyUgc
+Zhm0398rv5EcBVSfxbd4Auii8C/j5vbjCpYzK7cYrxQ
--> ssh-ed25519 AqX2tg /WrA4yj8/5/JKOPK1nPo/7lUiO2pQuEFcd/knOcIsjY
+-> ssh-ed25519 AqX2tg 5BoUl/UxiUv3QVWRjqssKI1ksDQgveYUZIQ33nf+nCk
-7bNv5jxJvLGIK4fdPBn225wdrFmm7T7+JYT+WWrB3Jo
+z/2SbE2bNPNL2EFQuTQhXYmSFBw0sPh6xTAkLAoDOl8
--> ssh-ed25519 eySVIw DojogsIIrxHdZrCmhMxXTR81jdYpESTk3s20KoGEqwo
+-> ssh-ed25519 eySVIw 9ouIghFtVVw6xFvRFzqhnSTSd4tjktsqeMtGpGlYhEQ
-Hv7bC0pNLJfpgO4rPb5KSDXMsvyev9tBKQTSxXQ2JmQ
+yllu/dnS8kaXEt/Ietxx9aXqbJY5yJ1ldUoFjap1xDQ
--> ssh-ed25519 7MARBg ttPcpPx2/fqfUJoiDzmQmHuHC81c17gR28JABt+7FAs
+-> ssh-ed25519 7MARBg /ln/6mcFzRq1lf24WMmronTbJYra2vypPQ24MKKoaDc
-V+GFGHhptX2kz+AZhtLTPOZDTl6aRirsdtQrfBFoej8
+vnxTXSfPfQMRYtRNxD3od52AkECHCiQ8sDmMScntg14
--> ssh-ed25519 e1FG/w eXpMOs0vdewF02qjXeeyQw2ZPnSxYUXRCZXxW2TEkmc
+-> ssh-ed25519 e1FG/w IhVZi6S9xzDiNue8Ax5YsUAULDFd8dhBZ5rH6p69IE0
-6PWtUCCTU58oEoanRpPeApbwACeIJWG4ZFsG45DbSUQ
+PRt8LCyUWFI+VdKArsg7srXflIsxW9ZjMyeBsef0y0U
--> ssh-ed25519 LFAtBQ mYpH9SUTjR7HvtvhdBz/9fgPn6IcYOVDwW2L0/0kFnA
+-> ssh-ed25519 LFAtBQ NiEVQTRkdSMQclJk5KT9JogbkkTRiDm1pEGoVzJhknA
-bQ+gnmebZ5/MLxu3PGZUScKHnFbgOnYKO7IHx1G+bHk
+VEzP3kpwGFAn1vjNt929WDdiWa8l1Ub+12G8iLAHDbc
---- hq0Cg8aGuCupQC2DRgQ7YO/LI+RMxgziqLD0ASc3ZE0
+--- CPXlElOcCRIVQmheK+gdKsBXr28hcKTQtx20DahVo3Q
-(cÒ$Õ^Y#æ#FÈ~ታ¿n¾+;½â£vóêíùGZl\PMpàL_–œ
+÷¨§_é¡7°ΣiÄP<C384>‡b]ò$œ8©øR·Õ Ëz‹›M$F€

secrets/garage-env-file.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 AqX2tg bdi/YZW/ISUhXj+tSDU4xULeRE1v4sdg0KUmbSi4UAc
+-> ssh-ed25519 AqX2tg /zhInQpotjEKvSncgF0gfLdJQ2o8HLDvkUm87NQizlA
-EwbHjDPdCmyKuwEkwiGJ+X5QSMpWvomEGIHmmUTj/sw
+Kt8+262i7/l67nqJ6OGuaN0KarZwJ2AWVxEFj1vVzEc
--> ssh-ed25519 u3yXZQ m+U2W4SZ63Ca9WQUNcHFjdccp2nuZCziC0ba91lBGhY
+-> ssh-ed25519 u3yXZQ gmHEji91fVHks8CP+2gNI4uxoiEKe9K5+A7iXMFOkT0
-SBMNK9JoQxrigI1vrdWDY4rGz/by/VVo1N3oz/Nz+3Y
+q3Kchjta6jrrZ9QQTeH13d8uyhCaxC0KHW0YrHle3pE
--> ssh-ed25519 Ye6ufg k/Uwt9tEWeuZ1SIEb+74udKjpGfxHdGCtheH+LWFAC8
+-> ssh-ed25519 Ye6ufg a4NEC87H0i4wu6jH4b+DB4s0eEN9i0Okcsc+Wzwb8A4
-8DaA3ntefwrvK3Bj7E7nxgOGc7MPJpWoRkePzyYIuqw
+r18QX6CFPlvvfJ+fN+gSiAsE9+B7EvPv+FJT1zSNjh4
---- 8AvR4ud35YjTgQE1IqW9dU2nXDUbdhffTyjgmLfcm+M
+--- I1NXCUaOWbRJsrBIfjsbETheIknrI7E7zc4O6r8Dyyw
-	$„­Ì©†é‡ÄÀ@ƒ¤&žK™2¡Ç<C2A1>Iëö:Ånå°L¡ŽéŒ…e‡¥ðvažûfœ+Ái„SÜk™*9Û)ÉÂ[Ÿá½jÎ!æ›À<8"£¶à
¤)‰t€ZÊ{B£‡Ís–wBF‘F‚sV”ÄBvpÑé.7
+HÚ72Ô6tpÄ´áhÔü5s¼}._@3ñÖøÍów„LˆX
·™	ª¢'HØc/ÈÜ9J½ Ü°n‡7<E280A1>/ærùÛü«‘Jo…)dHHxT«{¬mu/{“ÏÃÊùÂñW€:oÈ–Jþ
©;¾Õ$âvÖׇ

secrets/github-oauth-secret.age

@@ -1,5 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 AqX2tg g9w21IrxYYi1wdtQzgYRji6tLvoXEvMbArm5P/vmmm8
+-> ssh-ed25519 AqX2tg u8HG//6vBnzEloLysdUGH9gYj/io7TNq8V5cNtZQdQQ
-v5XJX4rDwXnKOFLfAydM5jsgSOcGHKcg7DgNBmBSvp0
+reAo0TnbXB9ZesxfIMkYdhiYfQ9gtyc3V6J7aHFVpsc
---- o+fH69EbYVP6Eoh0//uaJNurVRFd77rh3ACz9I9XGQc
+--- a2O+Q1XlRlpQAS6QiyKN2bJn52TcfMKDyyPbRV8wKUw
-îÍÎ	ľ,U-O[ň	ĘŠ…@qŚč–„:äe‹NÚ}MËúئi|5ôëŃhĂŽn‹ę-;€ëa=o<>Ź+|±#ěç—đvë°
+S""Æ(š<03>O-6‡È“Åp¶#ÙX)>±œØ÷„†]õ˜ù	Tä1cÅ5 ®IXs&<06>Ü	ØõÞ$ø°
$X>0ûü*ö¤-j

secrets/github-webhook-secret.age

@@ -1,5 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 AqX2tg 5oIzea4DqtoS2AwcX9FJloF3NCTAolikjunkxcGPMBU
+-> ssh-ed25519 AqX2tg mvaHrNSFEc8LRQZAVaSaCwHc1CMwYuRLUfmiy55HjW0
-u8rpjafo+YY1CEcWcttWF9LJpnrU2TEwvoaeJ3zqoeU
+Rzsc99zd+tGG+Cf3pN8jpiNtDL7NYbhTaUGB9+zvpac
---- VkMHQUCkv8SFtiT1xF0BIha2Iqknuys2sxprD63N17U
+--- 6IVGRLeWq5eS0cqq4R7WHwOWcPjAsZAxSKbpkgrMJZ0
-8<EFBFBD>1<EFBFBD>'<27>^<5E>Q<EFBFBD><51><04>1<EFBFBD>5<EFBFBD><1E><>En><3E>)!<21><18>Vë<56><C3AB>@<40><><EFBFBD><Z%<19><> <20>P<><50>/nj]<5D><>K<1D><>ⷕ
+D}<7D>¢+\á9‚€1Åi²½ä/9ú*âÀk}¸¤uêV¸RéË™¢$wøRX#„õ¦Ô—üö¹ÎHS*8®’Å

secrets/mondon-ens-school-mail-password.age

@@ -1,7 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 bD9h7A sjOtdgQm5r7LjPCJ2Azpkzg/O6d5VxBJmJVinnjtRW4
+-> ssh-ed25519 bD9h7A CY5915LsvOKM3ZCwggFRXlJJK64RGSrWQ/PBfAypiVU
-hrqMTSIkwePrvU1fToUJullS7HZrgzO68wbYubMdsyk
+ebJybkIAmGrsjeiAeWddjNYqDuam63x7inkJHtOtXus
--> ssh-ed25519 AqX2tg EOMr5CfEdizgpq8NRs5rq0Tru/LxfpDSl9JqCYVWWjQ
+-> ssh-ed25519 AqX2tg Uqb0Xg4j/hkg2Iuin4BW80hzYYezoYj2gN+z+MX971k
-+UGDI2+jkvriERYOKjbP6mNSznNomAXTUg69KBSq2fY
+BWpOIS2PrwNOa575aTAyYJlFbkSAeNpbgjsubTX30FQ
---- aNQwaVVVYJdAfJepFcFlO9mbbRnCE2/Bp++gTrewK1A
+--- e/6D6TuTSaQZ6wfQ38Vy+rHILl9LOLqlBp6moNE9cdo
-~UpÈácñŒ8þ-_Ð!Þ-»0<3S¶<53>F|¤Â`¿œàìF
è™üu{_R
)\\›“\€‰Ë­JÞÝÒ­WWyÍ<Ò÷º$	ËR4y'ìŠ$:—ècÓº:
+<EFBFBD>Cc½bá+
qJÿ
È2‘_)n ôýw
+ÁÃ	H,B_o^a«´þs€A’¯ÍŒ<C38D>—+`P,ƒ·Ý³uM©±Ø‹0)tííqpeŽˆ‰ˆ\½õ
+ÚÖÏÔ¤s:†èŒ`

secrets/nextcloud-s3-token.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 AqX2tg MNSLRaksYQpUIqE5WCiDcsxfJmGsD+wXHJx+vWj92kI
+-> ssh-ed25519 AqX2tg qgpiZgpazBDeLl/HZfJEstzWAZz03QRMoJdbkIShEFA
-LTjGD8JL1UqF8c73rSfjhTFbVWEFNVPj4KFA34HB2gw
+xGKmKeVYr2LahOgjnBbqTwk9NCD7o+tbAAQuUuQiZWo
--> ssh-ed25519 u3yXZQ YVZTW5kMSUZLUGFqLaXhcGYja0aL61k0m7ZPxMhcRAo
+-> ssh-ed25519 u3yXZQ Utbi4LJMheEZ0ZLOwrpRFI4fXmYmTEecuz6sXbNYdRc
-PZjB1d/6SAItyLyJBJF3LN/yHC6XrdopxAP+eqgEck8
+q5cqtudBDRSgdjPFdRlTQ5hm0GF1Ilidt9TRdmngoKk
--> ssh-ed25519 IRHAkA U7NTy3tEsdF4xh2RsyWC9lmtc/3tmzRV9NX/vDARZl0
+-> ssh-ed25519 IRHAkA GFsXpJn1Ib9VrjmCSwJoxRuoWEDy/dQdBHQZUkMYOxc
-pTBQayQcGCND/me0y7f82zFfh4BFDbgTnSRTkR2s9Ns
+S+gLiWrsp8jj8b5l+aIeQYrTJ27IsW7LR4AlyxOBtqo
---- ekhRNYMoTRcHHTZNxkt59/WBIMt6PssKfiJCDdrPv2U
+--- yvjziYHCtr3g52AxKSljqMoCjj7bZvDXT727B+eTEvg
-ž0i›	®¹<C2AE>_ƒôW’Ý£»uŸ¥ßÜb >Æ2¾†­Î<12>ªJ0"?à´h“<0F>»‹Ê205d~Ì,í¼;/‰ÀÌÙü@%é;½!ÞéHÝ[?÷
ptRYà³Kä‹#
+L†AO
+'µ<\y¦òØÉ´ôO(Ù%V·±‘ôæ”Ñ<E2809D>lЉä_2:EÍøÓÍQ6õ’èw«­×Àëè/Qßw;Gy‡þ±(—"~PlÁR³dÀÿ“÷)!L :d-Nô?LÉwx

secrets/plausible-password.age

@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 AqX2tg wus6Jwt0/XoXxmHCN2ymP1bySFlDrafHu8iwzrZSNQo
+-> ssh-ed25519 AqX2tg mIv7Jm6TgmM4ms1U9D6K+ENKx1M9wO94HT+vap9IOEg
-gitXSkNSq+lsa0Tg+1kbxkcEgznQFC5BJUhhuqXe03s
+xSXg6rKaBemqqRKLXF+5sJmS2TjVtPwIKHOjOMYFyRU
--> ssh-ed25519 u3yXZQ ycWWglhLo0RRJJu+p3O70On3Q+jaZyND76LsQVz4eEE
+-> ssh-ed25519 u3yXZQ hh4ERymgLPMCLpZMmsGxsIN4ZMq2CqD4KFJQFOI2Tj4
-SKAyDMEzqMQkx+ddHIYZ335XonRaQO2fCdj4w3sA6fo
+mkaSotER2d5HHYmpzvZ63Ym5qKtlJTa+v5JnnlqdGh0
--> ssh-ed25519 IRHAkA TcGBzkeAIdlad/deaUhUhfcLgmhNe+LhEKPDKtti/Fo
+-> ssh-ed25519 IRHAkA hEqK5BnIQOb4uFoQBSSu1BU+cOX9tZKL5MoLF4Rn6wY
-MLWSpvodp/hG9MHPUmMgcdfVFMeDtM+QcZ8no3QflRI
+PpPJ2ZeT+/vpBq3HXZwArn5XiU0vLn+jY/NslKhyzVU
---- j7QyvhPw3jp7++jikGWRuvTD5MTKyDnF51qmMSZ69t0
+--- wWX99bj1rQ7VBVJG2vqMSx38E3lqLd33sgi1FteU3ds
-«{¤F8Æß’LýSö’²f4s[”ˆ…7_í÷šeJöÛsFs±Ó¿5ï.zÃsbp^öÝTÞ<>õË€Œ-©
+´I´Òäök
+ûkA—0ïÈ•*5<10>êbÖÉ7žk°r‡‚l•ôA&½F‡ea ß⇿Q0¡âD<1E>õ

secrets/secrets.nix

@@ -4,7 +4,7 @@ let
   tower = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA9QGKzHJ5/PR/il8REaTxJKB4G2LEEts0BlcVz789lt";
   lisa = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4kSscukEEoW/QiLgyZQluhsYK4wF+lFphlCakKYC2q";
   core-security = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICLnOINGYOFb+bLUUTV9sjwi2qbpwcaQlmGmWfy1PeGR";
-  x2100 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG/zyse3NaSi9nxMSZ9ICYe4MMjUka+DewJ5M5N8cCBy";
+  arcadia = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBR6TATH7NrekBiRk8mMnxNw0LcDzMHgHh/JtpPUCfqT julien@arcadia";
   fischer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPeKDFxgdZlhNXEUx8ex0Fj2Re+tDBvUr52SS4Wh3V9n";
   core-data = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPAcIdJ3gr17bvDZ8NAcDBkEmOPTEhpg2yq3p1NNQB0f";
   lambda = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKluGTi+vGRLU2emYBhTJuEy7Qw0xq1e0Ey7wvU9xYHz";
@@ -26,7 +26,7 @@ let
     biblios
   ];
   all = servers ++ [
-    x2100
+    arcadia
     fischer
     gallifrey
   ];
@@ -54,14 +54,13 @@ in
     tower
   ];
   "git-gpg-private-key.age".publicKeys = servers ++ [
-    x2100
+    arcadia
     fischer
     gallifrey
   ];
   "user-julien-password.age".publicKeys = all;
   "user-root-password.age".publicKeys = all;
   "ens-mail-password.age".publicKeys = servers ++ [
-    x2100
     fischer
   ];
   "julien-malka-sh-mail-password.age".publicKeys = [