diff --git a/home-manager-modules/ssh-client/default.nix b/home-manager-modules/ssh-client/default.nix index e9bfd73..07e6795 100644 --- a/home-manager-modules/ssh-client/default.nix +++ b/home-manager-modules/ssh-client/default.nix @@ -12,8 +12,8 @@ with lib; programs.ssh = { enable = true; matchBlocks = - lib.mapAttrs (_: v: { - hostname = if v.ips ? "vpn" then v.ips.vpn.ipv4 else v.ips.public.ipv4; + lib.mapAttrs (n: v: { + hostname = "${n}.${lib.snowfield.${n}.tld}"; user = v.sshUser; port = v.sshPort; }) lib.snowfield @@ -34,9 +34,7 @@ with lib; hostname = "ssh.enst.fr"; user = "jmalka"; }; - ferrari = { - hostname = "195.154.212.97"; - }; + lame24 = { hostname = "lame24.enst.fr"; user = "jmalka"; diff --git a/lon.lock b/lon.lock index 3b2063b..43a2279 100644 --- a/lon.lock +++ b/lon.lock @@ -7,19 +7,19 @@ "owner": "ryantm", "repo": "agenix", "branch": "main", - "revision": "4835b1dc898959d8547a871ef484930675cb47f1", - "url": "https://github.com/ryantm/agenix/archive/4835b1dc898959d8547a871ef484930675cb47f1.tar.gz", - "hash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=" + "revision": "96e078c646b711aee04b82ba01aefbff87004ded", + "url": "https://github.com/ryantm/agenix/archive/96e078c646b711aee04b82ba01aefbff87004ded.tar.gz", + "hash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=" }, "artiflakery": { "type": "GitHub", "fetchType": "tarball", "owner": "JulienMalka", "repo": "artiflakery", - "branch": "authenticated-listing", - "revision": "9fc2c243c0f152303c602836ccbec8c23b4743eb", - "url": "https://github.com/JulienMalka/artiflakery/archive/9fc2c243c0f152303c602836ccbec8c23b4743eb.tar.gz", - "hash": "sha256-rbm5Ws+nsguJTZ1404bGLVexpJmFyyVirdRXCvLgtJs=" + "branch": "main", + "revision": "485ef296b4f9ff7bb6edb9ff5fe525a04e422adc", + "url": "https://github.com/JulienMalka/artiflakery/archive/485ef296b4f9ff7bb6edb9ff5fe525a04e422adc.tar.gz", + "hash": "sha256-fADYwTMZuO4S1uH3RSYc9wowvGoa/55mYvG47NmVvbc=" }, "buildbot-nix": { "type": "GitHub", @@ -37,9 +37,9 @@ "owner": "zhaofengli", "repo": "colmena", "branch": "main", - "revision": "c61641b156dfa3e82fc0671e77fccf7d7ccfaa3b", - "url": "https://github.com/zhaofengli/colmena/archive/c61641b156dfa3e82fc0671e77fccf7d7ccfaa3b.tar.gz", - "hash": "sha256-csQQPoCA5iv+Nd9yCOCQNKflP7qUKEe7D27wsz+LPKM=" + "revision": "2370d4336eda2a9ef29fce10fa7076ae011983ab", + "url": "https://github.com/zhaofengli/colmena/archive/2370d4336eda2a9ef29fce10fa7076ae011983ab.tar.gz", + "hash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=" }, "disko": { "type": "GitHub", @@ -47,9 +47,9 @@ "owner": "nix-community", "repo": "disko", "branch": "master", - "revision": "7f1857b31522062a6a00f88cbccf86b43acceed1", - "url": "https://github.com/nix-community/disko/archive/7f1857b31522062a6a00f88cbccf86b43acceed1.tar.gz", - "hash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=" + "revision": "b5d1320ebc2f34dbea4655f95167f55e2130cdb3", + "url": "https://github.com/nix-community/disko/archive/b5d1320ebc2f34dbea4655f95167f55e2130cdb3.tar.gz", + "hash": "sha256-mLlkVX1kKbAa/Ns5u26wDYw4YW4ziMFM21fhtRmfirU=" }, "dns": { "type": "GitHub", @@ -67,9 +67,9 @@ "owner": "nix-community", "repo": "emacs-overlay", "branch": "master", - "revision": "cff16fc129c76889ddfb0ebb17b53b6633c77ba5", - "url": "https://github.com/nix-community/emacs-overlay/archive/cff16fc129c76889ddfb0ebb17b53b6633c77ba5.tar.gz", - "hash": "sha256-EtSUmvOKU7mfocPNsBSmgjOcqPBKWshSN/jsxmHZqfI=" + "revision": "7a9a25389a6ad9402f9aa5087ccb36f8383045a8", + "url": "https://github.com/nix-community/emacs-overlay/archive/7a9a25389a6ad9402f9aa5087ccb36f8383045a8.tar.gz", + "hash": "sha256-YMy01dURXhxyjx2W+Dv83b2RRnNq28K4t4+kvrRxFto=" }, "git-hooks": { "type": "GitHub", @@ -77,19 +77,19 @@ "owner": "cachix", "repo": "git-hooks.nix", "branch": "master", - "revision": "623c56286de5a3193aa38891a6991b28f9bab056", - "url": "https://github.com/cachix/git-hooks.nix/archive/623c56286de5a3193aa38891a6991b28f9bab056.tar.gz", - "hash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=" + "revision": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "url": "https://github.com/cachix/git-hooks.nix/archive/fa466640195d38ec97cf0493d6d6882bc4d14969.tar.gz", + "hash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=" }, "home-manager": { "type": "GitHub", "fetchType": "tarball", "owner": "nix-community", "repo": "home-manager", - "branch": "release-25.05", - "revision": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", - "url": "https://github.com/nix-community/home-manager/archive/7aae0ee71a17b19708b93b3ed448a1a0952bf111.tar.gz", - "hash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=" + "branch": "release-24.11", + "revision": "50eee705bbdbac942074a8c120e8194185633675", + "url": "https://github.com/nix-community/home-manager/archive/50eee705bbdbac942074a8c120e8194185633675.tar.gz", + "hash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=" }, "home-manager-unstable": { "type": "GitHub", @@ -97,9 +97,9 @@ "owner": "nix-community", "repo": "home-manager", "branch": "master", - "revision": "28eef8722d1af18ca13e687dbf485e1c653a0402", - "url": "https://github.com/nix-community/home-manager/archive/28eef8722d1af18ca13e687dbf485e1c653a0402.tar.gz", - "hash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=" + "revision": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", + "url": "https://github.com/nix-community/home-manager/archive/8a318641ac13d3bc0a53651feaee9560f9b2d89a.tar.gz", + "hash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=" }, "impermanence": { "type": "GitHub", @@ -117,9 +117,9 @@ "owner": "nix-community", "repo": "lanzaboote", "branch": "master", - "revision": "38c2addd2e0cedcb03708de6e6c21fb1be86d410", - "url": "https://github.com/nix-community/lanzaboote/archive/38c2addd2e0cedcb03708de6e6c21fb1be86d410.tar.gz", - "hash": "sha256-PBfJ7dGsR02im/RYN8wXII8yNPFhKxiPdq+JDfbvD2k=" + "revision": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba", + "url": "https://github.com/nix-community/lanzaboote/archive/995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba.tar.gz", + "hash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=" }, "lila": { "type": "GitHub", @@ -137,9 +137,9 @@ "owner": "nikstur", "repo": "lon", "branch": "main", - "revision": "c44e33ce55eed38a06fde43e69512380c4065441", - "url": "https://github.com/nikstur/lon/archive/c44e33ce55eed38a06fde43e69512380c4065441.tar.gz", - "hash": "sha256-bxu83mbdfAeDZYOnjZQYyjTs5WgZS8o6Q2irlzgbYs0=" + "revision": "d17d0fe04fb7ce15f0e2e3521b97906514ec1857", + "url": "https://github.com/nikstur/lon/archive/d17d0fe04fb7ce15f0e2e3521b97906514ec1857.tar.gz", + "hash": "sha256-3wppxmmCMoizu6aemTt2wtakXlPI4E68odEVxU2r2Uc=" }, "nix-index-database": { "type": "GitHub", @@ -147,9 +147,9 @@ "owner": "mic92", "repo": "nix-index-database", "branch": "main", - "revision": "424a40050cdc5f494ec45e46462d288f08c64475", - "url": "https://github.com/mic92/nix-index-database/archive/424a40050cdc5f494ec45e46462d288f08c64475.tar.gz", - "hash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=" + "revision": "137fd2bd726fff343874f85601b51769b48685cc", + "url": "https://github.com/mic92/nix-index-database/archive/137fd2bd726fff343874f85601b51769b48685cc.tar.gz", + "hash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=" }, "nixos-anywhere": { "type": "GitHub", @@ -157,19 +157,19 @@ "owner": "nix-community", "repo": "nixos-anywhere", "branch": "main", - "revision": "ff87db6a952191648ffaea97ec5559784c7223c6", - "url": "https://github.com/nix-community/nixos-anywhere/archive/ff87db6a952191648ffaea97ec5559784c7223c6.tar.gz", - "hash": "sha256-7iTUVUP6xgEYXdl9aCYBbYMYVsQmOvMoLUsUS2aoDNA=" + "revision": "edf1adb89307f921575b5fcd0c6bb4e684fbd38b", + "url": "https://github.com/nix-community/nixos-anywhere/archive/edf1adb89307f921575b5fcd0c6bb4e684fbd38b.tar.gz", + "hash": "sha256-F9IekLaLYVG/UNUiaN194qu0n1pOgeqjGkD1l5OVEgM=" }, "nixpkgs": { "type": "GitHub", "fetchType": "tarball", "owner": "nixos", "repo": "nixpkgs", - "branch": "nixos-25.05", - "revision": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", - "url": "https://github.com/nixos/nixpkgs/archive/6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3.tar.gz", - "hash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=" + "branch": "nixos-24.11", + "revision": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "url": "https://github.com/nixos/nixpkgs/archive/5b35d248e9206c1f3baf8de6a7683fee126364aa.tar.gz", + "hash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=" }, "proxmox": { "type": "GitHub", @@ -177,9 +177,9 @@ "owner": "saumonnet", "repo": "proxmox-nixos", "branch": "main", - "revision": "8df841766fab6c15341577b6982ddd368be72113", - "url": "https://github.com/saumonnet/proxmox-nixos/archive/8df841766fab6c15341577b6982ddd368be72113.tar.gz", - "hash": "sha256-yaEzei8/2LBZL+h0iKO28eeP1Cvl5v0piAyakZfZL0s=" + "revision": "4ebf07bd714747a9cd01e5bdb97dc0f04b92b7bc", + "url": "https://github.com/saumonnet/proxmox-nixos/archive/4ebf07bd714747a9cd01e5bdb97dc0f04b92b7bc.tar.gz", + "hash": "sha256-WtqTRYzXb2wTxPaIhzZof8lIp80lRZAlCZq2Q98jSZI=" }, "stateless-uptime-kuma": { "type": "Git", @@ -196,9 +196,9 @@ "owner": "nixos", "repo": "nixpkgs", "branch": "nixos-unstable", - "revision": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", - "url": "https://github.com/nixos/nixpkgs/archive/ee930f9755f58096ac6e8ca94a1887e0534e2d81.tar.gz", - "hash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=" + "revision": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "url": "https://github.com/nixos/nixpkgs/archive/979daf34c8cacebcd917d540070b52a3c2b9b16e.tar.gz", + "hash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=" } } } diff --git a/machines/akhaten/stalwart.nix b/machines/akhaten/stalwart.nix index 11db346..6d2edfd 100644 --- a/machines/akhaten/stalwart.nix +++ b/machines/akhaten/stalwart.nix @@ -1,11 +1,17 @@ { config, lib, + pkgs, ... }: { services.stalwart-mail = { enable = true; + package = pkgs.stalwart-mail.overrideAttrs ( + _: _: { + patches = [ ./stalwart.patch ]; + } + ); settings = { authentication.fallback-admin = { user = "admin"; diff --git a/machines/arcadia/default.nix b/machines/arcadia/default.nix index 66295c1..5afa411 100644 --- a/machines/arcadia/default.nix +++ b/machines/arcadia/default.nix @@ -4,6 +4,16 @@ lib, ... }: +let + emacs-from-overlay = pkgs.emacsWithPackagesFromUsePackage { + config = ../../../emacs-config/ReadMe.org; + package = pkgs.emacs-igc; + alwaysEnsure = true; + alwaysTangle = true; + extraEmacsPackages = epkgs: [ epkgs.exwm ]; + }; + +in { imports = [ ./hardware.nix @@ -89,7 +99,7 @@ services.xserver.windowManager.session = lib.singleton { name = "exwm"; start = '' - ${pkgs.emacs}/bin/emacs -l /home/julien/.emacs.d/exwm-config.el + ${emacs-from-overlay}/bin/emacs -l /home/julien/.emacs.d/exwm-config.el ''; }; diff --git a/machines/biblios/default.nix b/machines/biblios/default.nix index 76de3dc..bb575fe 100644 --- a/machines/biblios/default.nix +++ b/machines/biblios/default.nix @@ -21,7 +21,7 @@ ]; ips = { public.ipv4 = "82.67.34.230"; - vpn.ipv4 = "100.100.45.39"; + vpn.ipv4 = "100.64.0.2"; public.ipv6 = "2a01:e0a:de4:a0e1:eb2:aaaa::46"; vpn.ipv6 = "fd7a:115c:a1e0::27"; }; diff --git a/machines/biblios/garage.nix b/machines/biblios/garage.nix index afe2feb..8fffad5 100644 --- a/machines/biblios/garage.nix +++ b/machines/biblios/garage.nix @@ -37,18 +37,6 @@ in }; age.secrets."garage-env-file".file = ../../secrets/garage-env-file.age; - age.secrets."book-auth" = { - file = ../../secrets/book-auth.age; - owner = "nginx"; - }; - age.secrets."notes-phd-auth" = { - file = ../../secrets/notes-phd-auth.age; - owner = "nginx"; - }; - age.secrets."notes-perso-auth" = { - file = ../../secrets/notes-perso-auth.age; - owner = "nginx"; - }; services.nginx.virtualHosts."${api_domain}" = { enableACME = true; @@ -73,53 +61,6 @@ in ''; }; - services.nginx.virtualHosts."hownix.works" = { - enableACME = true; - forceSSL = true; - locations."/".extraConfig = '' - proxy_pass http://127.0.0.1:3902; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - ''; - locations."/book" = { - basicAuthFile = config.age.secrets.book-auth.path; - extraConfig = '' - proxy_pass http://127.0.0.1:3902; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - ''; - - }; - }; - - services.nginx.virtualHosts."notes.luj.fr" = { - enableACME = true; - forceSSL = true; - locations."/" = { - basicAuthFile = config.age.secrets.notes-perso-auth.path; - proxyPass = "http://127.0.0.1:3902"; - - extraConfig = '' - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - ''; - }; - }; - - services.nginx.virtualHosts."phd.luj.fr" = { - enableACME = true; - forceSSL = true; - locations."/" = { - basicAuthFile = config.age.secrets.notes-phd-auth.path; - proxyPass = "http://127.0.0.1:3902"; - - extraConfig = '' - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - ''; - }; - }; - machine.meta.zones."luj.fr".A = [ config.machine.meta.ips.public.ipv4 ]; diff --git a/machines/gustave/artiflakery.nix b/machines/gustave/artiflakery.nix index 1a8790c..54cee3f 100644 --- a/machines/gustave/artiflakery.nix +++ b/machines/gustave/artiflakery.nix @@ -10,11 +10,6 @@ forceSSL = true; enableACME = true; locations."/" = { - proxyWebsockets = true; - proxyPass = "http://localhost:8090"; - }; - locations."/ws" = { - proxyWebsockets = true; proxyPass = "http://localhost:8090"; }; }; @@ -105,16 +100,9 @@ flakeref = "git+ssh://forgejo@git.luj.fr/luj/assert-prez.git?ref=main"; access = [ "assert" - "phd" - "julien" - ]; - }; - "slides/2025/chains-april-workshop/" = { - flakeref = "git+ssh://forgejo@git.luj.fr/luj/chains-2025.git?ref=main"; - access = [ - "public" ]; }; + }; }; } diff --git a/machines/gustave/default.nix b/machines/gustave/default.nix index 34e298e..25c3cc5 100644 --- a/machines/gustave/default.nix +++ b/machines/gustave/default.nix @@ -19,6 +19,7 @@ ./glance.nix ./syncthing.nix ./artiflakery.nix + "${inputs.unstable}/nixos/modules/services/web-apps/readeck.nix" ]; users.users.julien.linger = true; diff --git a/machines/gustave/nextcloud.nix b/machines/gustave/nextcloud.nix index 1e62a66..0a7c890 100644 --- a/machines/gustave/nextcloud.nix +++ b/machines/gustave/nextcloud.nix @@ -20,7 +20,7 @@ enable = true; configureRedis = true; database.createLocally = true; - package = pkgs.nextcloud31; + package = pkgs.nextcloud30; https = true; hostName = "nuage.luj.fr"; autoUpdateApps.enable = true; diff --git a/machines/gustave/plausible.nix b/machines/gustave/plausible.nix index c5911f3..9115421 100644 --- a/machines/gustave/plausible.nix +++ b/machines/gustave/plausible.nix @@ -3,6 +3,11 @@ { services.plausible = { enable = true; + adminUser = { + activate = true; + email = "analytics@luj.fr"; + passwordFile = config.age.secrets.plausible-admin-password.path; + }; server = { baseUrl = "https://probable.luj.fr"; port = 8455; diff --git a/machines/gustave/readeck.nix b/machines/gustave/readeck.nix index 8bac7a0..5337867 100644 --- a/machines/gustave/readeck.nix +++ b/machines/gustave/readeck.nix @@ -1,4 +1,7 @@ -{ config, ... }: +{ config, inputs, ... }: +let + inherit (import inputs.unstable { }) readeck; +in { age.secrets."readeck-config".file = ../../secrets/readeck-config.age; @@ -13,6 +16,7 @@ services.readeck = { enable = true; + package = readeck; environmentFile = config.age.secrets."readeck-config".path; }; } diff --git a/modules/buildbot/default.nix b/modules/buildbot/default.nix index 4746ca0..89524b8 100644 --- a/modules/buildbot/default.nix +++ b/modules/buildbot/default.nix @@ -36,7 +36,7 @@ in "JulienMalka" "camillemndn" ]; - evalWorkerCount = 6; # limit number of concurrent evaluations + evalWorkerCount = 10; # limit number of concurrent evaluations }; systemd.services.buildbot-worker.path = lib.mkForce [ diff --git a/secrets/404-ssl-certificate-cert.age b/secrets/404-ssl-certificate-cert.age index 1aea2f2..d73e1b7 100644 Binary files a/secrets/404-ssl-certificate-cert.age and b/secrets/404-ssl-certificate-cert.age differ diff --git a/secrets/404-ssl-certificate-key.age b/secrets/404-ssl-certificate-key.age index d551a3b..ee39056 100644 Binary files a/secrets/404-ssl-certificate-key.age and b/secrets/404-ssl-certificate-key.age differ diff --git a/secrets/arkheon-env.age b/secrets/arkheon-env.age index 2a24bf0..6864a14 100644 --- a/secrets/arkheon-env.age +++ b/secrets/arkheon-env.age @@ -1,8 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 xaddyw zad7rIPt7YmMINK+6AJeBg0QLKjXRBpi1I686XJFjRc -6wIwquKdRSrHEw5M3TpFOiBs2ujO1IuwHjoxSzQYxOI --> ssh-ed25519 AqX2tg /JXc+SICUiwgheJuUsi3Jf1NqA+Fk7nZooQ+MJB0kAU -CEjcUhpMoKP2EXyz5Jy8Jg8ME9sEBXAVjvVj0bfH540 ---- 3IOLgCrvtGC7wjwR5X2Cn5z8O2wO4vt26/FrRuDIHus -=ld45R*-׊!2;>Snβ5U|KnQsO6g, K -s \ No newline at end of file +-> ssh-ed25519 xaddyw VdPYiLMPuCc+36tk42OgqJCnrsUjWBGqjF9O/hqULhA +SzPL/MK99FT51J7r/ru5H7+5+woYb5ZPwzGYQZSRFYU +-> ssh-ed25519 AqX2tg iX8/Nd3AFVR5nh/EdFG4SPVSbBs7LtQmqUjjbd6I1Ss +9fhg7F9iN3I/m7KCI2UPD8rC5hk/RLl5iCOhgu04Ltc +--- 8t4rCXSaDqFujzf6f+2rvwsq4TX7KOeC4A9ka039qI8 + Kkk27Oڀ102ܠJ+!+ >NpJ#`` +t;Y, \ No newline at end of file diff --git a/secrets/arkheon-token.age b/secrets/arkheon-token.age index 2ff4e86..df385c4 100644 --- a/secrets/arkheon-token.age +++ b/secrets/arkheon-token.age @@ -1,21 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 IRHAkA 7lsX23PbejDfz2Qsw1Z79VpIKeE+OG0UBEIy6Z13TCE -DAqsFt8tdbTK8Juyi6EbE0dP8uYK7dysbi62RltzAoo --> ssh-ed25519 AqX2tg Iuvw+AN1xrpvc1BLS6wZDqkKlbZTXL7XjfhN0batS0E -cpeBQ48U6hEq6yGtQIdSIdCSAUFBz3+Tf+FJw4iPNxU --> ssh-ed25519 bD9h7A 9H7zGcs4s14Ow0mQtTcMYAZA/tKvNo1bZtX0Phr1nQo -mV31iQtkqs6p/TjaRYvb+2ATkKOHvlCKKrWtN4Rlluw --> ssh-ed25519 2Wt2Kw JFIQfq65TaiWWchy9ew36+2fnn8/DJb12+Ked6HHiU8 -TyZ9wqh/uvfaE9z0U+uuXXSDPgd8OL/p/7jFjeclFhk --> ssh-ed25519 xaddyw eiE9Cv3eBwWCkf79RIB+ktclTAldqd2tk2x8n0a0h04 -Rx1F/dx8vLzl1PkupfjsaoM4LeHFO3kT2pDLwT3pjUI --> ssh-ed25519 6rkyTg j7b41KnYdY7IGuszX/N0n0z0ZQ3IZ7oFqQ9oj2WHLTE -LVOR+L3BUJ4mXUqaLCoopVZeHbUaUySmxA7yzDlXMI8 --> ssh-ed25519 d3M2Dw VcD2TfG9Z6ZE62Xavr58F/MjXCLAJTvLZTd+y9/PMyc -hijMC0lVABN7nWWa23TgowZE3NFjc2mKS7QdJSf25UQ --> ssh-ed25519 81O5Zw wZ/35O/yVaI4bw5AdZho6K67BvioXiITjHNBak31AwQ -gaE9BLdnVwPh8z30/BINUIDgu8zn4g6RSVsnc1G57B0 --> ssh-ed25519 Ye6ufg cc6XtPVZUfmuewSB9EzjxcK41l26UQAlJnJZZW5zc3s -SiRKfBc01ompb9HsyLS2wJhlXuAWHJqvu9gBcLG0GAs ---- l4BP9E5c9FdRgFTreUPT9Ek1XK3zwAlPFQQD2ggLYzk -Vb[xUR ?>_s6Edo -=B~AƄ9sbۍ \ No newline at end of file +-> ssh-ed25519 IRHAkA YybCq0obw3Ktz0lO3Ng71cnl+Bc7Px+cTBzAwT5D5FA +pyZQHY9LK75ARHvxuInBzzcopCV9hfgB+V2ZBDG26Tg +-> ssh-ed25519 AqX2tg w8hWh/LPQxiQM73qeoVlYgDNUZJS2Pgmb1Xj4HQJCzg +GVjl2ezCPh87E8DY+8/+LqsrWkPfnJVq+yvVydyYnXw +-> ssh-ed25519 bD9h7A uR6tMyznpJwPcCbm+wdjCoS85Rcm3++zwkHEYRiEnlw +S6FnHuUcGTG6jp0QPTEAZW0MHnMGrOlCkh2WrbakuGU +-> ssh-ed25519 2Wt2Kw 1rZKvUzI9y8dKMF/gCJLfJi2JcGkEpDZ9wNcs4F+OCY +z955DNob+3wp8OuMfRVpwlz9wssDgaKwdVJCkT2HAKU +-> ssh-ed25519 xaddyw HpmiXM5kZiPpjGoSzwntXxxZEfVExM6ckBe/7rec3Ew +tiXZih58yJOg8YRNFsgFFyrlpYGCcMoqIf8qMyb9O6s +-> ssh-ed25519 6rkyTg TsxO219oyNrfriDQTiqD8CsS8C11PvvGVtshXHup+TY +xKpHFEGn+kvyfONhTL6o3UyB/tHWu5czkyIf+WjAKBc +-> ssh-ed25519 d3M2Dw 9+eESWmjg14/W9nEDwCbPdNYLdjI7k2gPKWZdkiyyCs +ZlI7PNDS7tDCFaikbQUJL0BD7dbpJVC2/9V3nbdvw98 +-> ssh-ed25519 81O5Zw 43bd5jGe00loIqdutB5X3oakq2nYM0k4/atgyyDUkzc +kuDcEvyp2yk7T+eP9RWoUaQ8QxfY8F9tGhdvCQomDF4 +-> ssh-ed25519 Ye6ufg M2JgArRMWFSDzXdfkQs1cPYAQE3Uqzg92TKBYiK5qgw +7iy7R1s4TaihRItdc5MEh5sYbyzRCNuBJy/wpkF156Y +--- T9jsBvjj4eu+aILc3wSkLZddWnv7V3DN+VTUUWwoKjw +[iiKS;8g |kPrP攪BPTx!}mFٳ.\2 \ No newline at end of file diff --git a/secrets/artiflakery-auth.age b/secrets/artiflakery-auth.age index d1c7e4a..e5ac01b 100644 Binary files a/secrets/artiflakery-auth.age and b/secrets/artiflakery-auth.age differ diff --git a/secrets/book-auth.age b/secrets/book-auth.age deleted file mode 100644 index 7913eab..0000000 --- a/secrets/book-auth.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 AqX2tg zDqh2PvGIPYp0KY5vkk0/PvwpVui2I0D2PcADIqjJ2g -nAbsleFGQ6m2GP3U/awi/PSAaG9CoCNhtRCqzhWtNUM --> ssh-ed25519 u3yXZQ N8lqAInc0PEju+3A8a01Hw4SiHBIt0fGGwUfeQ4SU0I -sGmDrRk/EAxXq+Zuh+xBVihB993dP3gsUptC6MfRYoE --> ssh-ed25519 IRHAkA CeDM5bpCNDO6FnDAFlvNN47uUs6fC7J9S82cLOEfm0k -LKxbADvWMSyVs4L/GkPhFGtss+QRtdwg1LCwV3CSdGI --> ssh-ed25519 Ye6ufg SCi2vaZqmkqhldcGY3V6AOguPoImlJCjYRQORf9D50c -BDfKtBKf13j6d6vUU0Uzk0kQWk+JzqYHb+G9XeKxwCk ---- Nk8GC8ujrTpDzFpJwm1VfypxEl5PfxWup9bEaTkdRwc -B@^2uW-5@i4f L|L"|gdO>2I5C|^/iyK 0$ʨ?_pJz0vιs| \ No newline at end of file diff --git a/secrets/borg-encryption-secret.age b/secrets/borg-encryption-secret.age index 908459b..b390032 100644 Binary files a/secrets/borg-encryption-secret.age and b/secrets/borg-encryption-secret.age differ diff --git a/secrets/borg-ssh-priv.age b/secrets/borg-ssh-priv.age index b328974..b3137fa 100644 Binary files a/secrets/borg-ssh-priv.age and b/secrets/borg-ssh-priv.age differ diff --git a/secrets/buildbot-nix-worker-password.age b/secrets/buildbot-nix-worker-password.age index b076ca6..55b5515 100644 --- a/secrets/buildbot-nix-worker-password.age +++ b/secrets/buildbot-nix-worker-password.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 AqX2tg lt9JpQbAw+VDMuZJxJMEDttSGc67ZpTbUIznI+CQvkA -rRDMuTbGe9ebamKGEuy3bI73K7IY1J5qQO87R9sFlH8 ---- dfHwjj/IywWQfUN7vpo1wmySkEKMKb22EQuvADgzo8E -&nfh\VhwaJgضWgLI Sַou(:rɤ{ \ No newline at end of file +-> ssh-ed25519 AqX2tg e8N1W82EArzMbgKtGxdlgFQd43WpQAD3Gnm3sM8AX24 +KMt2iomNNZnfEpw6/RaKzprcGnm2/SiDC82uU0hmxxc +--- PiZh2M3UPkCZmXkG3KqxiB30atW1HPHWMmT0akSqEys + ssh-ed25519 IRHAkA ui0eCIFLxo0QDCLCvluv7/rE5inuMPuULWwwb0nbRmA -nca6oVHNi3dYWGN7NBPRIT12Yqcw0HfIm544hVyoqfA --> ssh-ed25519 AqX2tg QBIXX6hV/UhsTZhE5pfaopnOSyLbMg9gK4ZtzpSQYUc -D4MOqKVAwbnOhR6cl9R+YYL9mGo2x6zs/fLCLBCyA8k ---- EMoeNyxRFsUdrQmmRV+SKuufm77Ma2pqndVjS7CczKc - +nr64ת76lu D;+h-Maj0ap%(b]^ojJ \ No newline at end of file +-> ssh-ed25519 IRHAkA J8MUYIJtl2TgSuaZ9H1vAsE1ZWPYggtsELUdDPDPCio +Z+OJt0mWYNmklmJAxcqHrYYu536hTGtHgEZAhEK2dzo +-> ssh-ed25519 AqX2tg Lp7CYoGpLYdLJ7P9/irEwZj3QJwrR8cXAWZp7PalSXY +XJ54Wk+l9ahV5PFZIZyyaX/O8dNjswdCMEwecrWtF3Y +--- okY9tshPetc/v5wSfYXzewF/pOXezTyTqI7XooY/PYI +6eu2CEQg:k i$"zvpO^*[ܣQLE \ No newline at end of file diff --git a/secrets/dgnum-mail-pw.age b/secrets/dgnum-mail-pw.age index 92961e3..f685c11 100644 --- a/secrets/dgnum-mail-pw.age +++ b/secrets/dgnum-mail-pw.age @@ -1,19 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 u3yXZQ +wH1AooNvcLP949JQM1drPuyN2IRs21zHr+Vczcbakw -wYmZ73l6Qd+ri4xVgqN4QKXgnBNP9Cjj1dBOBwc7l1Y --> ssh-ed25519 AqX2tg Lv2TWT4cVkyDhdgkzFxEU1jCcgJQsuJV3LjMo0WRXjE -eb6HyZlcml7My8OYzOA+a9V3KD8h/3yOFsFJ/k4ow1M --> ssh-ed25519 eySVIw QFG2KornBLk3k8i/GKCySCosPKytoiwse0xhSey0g20 -Fi730f8eF1Ct6P2GcIiJAgBkaPfW1nAZ+xJ3z317G/o --> ssh-ed25519 ThuR9A rHzocWJhWyCdQ2QuEnkufWY8hVwRbzN3Mm+GyXjxTis -L9JUezAd87zW6YSwSuH+znD8G3lWmYGiwc3KHmDVwiE --> ssh-ed25519 7MARBg 3NeaybBa2LN4qNMcw2GqQWeDTsHqr6/GZjSxoR4vhzk -4JoRSUfT9DJY348/paCSYCqJ/puWZTIiaOZj3ylhohg --> ssh-ed25519 LFAtBQ iqeFnRf/cDzFQ6ebFvUOzdPkGoIvJNO9ZdMYFOwn3W4 -XyCP91Fb1uj85/8gbTCbRbUgyXYNXogDOR2jCzE5TFY --> ssh-ed25519 pgfKjQ uTPCP/1L22cYUxRbjGT6hImXnzEg6jM+vx5vU6aptH4 -gCXk8Caa1sQKdx2Y/1PZ4X4yuJ7w2R+5lhFNJ8OO0cg ---- 8dHSuYgjlL+F/JwbkhJzgVEokGtk4V3ozIjh7QAnwsU -d\ p0FI''55C_ [ -.kAB -P/n,]fBv;;+hP2d{% \ No newline at end of file +-> ssh-ed25519 u3yXZQ fdf6O4YBUetCfvqqQzL/0ouolTs1BbwMnwx70wujXUU +BneVMc4qvQLu2IVCj4rwatc3okrv3WX2gBOXJmsvMNw +-> ssh-ed25519 AqX2tg JbFnHf+M50YH4558cWxI0tlE6BN4mpps0w2RN/6uXHs +WIG4UiYV/hqubw4E1rhePzy6WDiiqi4rbbOVXQxxaF4 +-> ssh-ed25519 eySVIw n/EVdz+1XL8L8858POpQui06q8apegL7T+rWr/IDmxs +paFMpjf7QBkC0V42eEmyeEb4x4DOAMmGZ8C8spr937g +-> ssh-ed25519 ThuR9A pPuXpdwPbp5DYB48LGDmNKw8CMcSBywgxl/R5G4UtV4 +ieaOFPWl9bOgzebzU6yhvJLXI7bXizxZL21B9nTx3/s +-> ssh-ed25519 7MARBg US+u5wAGhACmbeV23k2NK9Yootd4CxI5w3/7lnMzCTY +VwPpiPjQvShk9KhRQQ7dF3ZbT3Termj+KCvO0SWfqBA +-> ssh-ed25519 LFAtBQ L9c6MLUznFrbKeW/JVhJwty58CZoZRlEqtalHPiTFhE +Kekk7X8R7+kdeSRLCyV2dffwu2kY8pqJ3zNEfwjRWU8 +-> ssh-ed25519 pgfKjQ a+Co8XjgG+ui9jUsNQuuU4idd8bqUOi4Ez/fgZHoXDk +pBKTEZm9MaxNaPk7xgk2YJDwwiaxh5pWz45yxy05YJk +--- LFcSFJGkDJOhKGQKA64uG4hDRh4W43lhzNfvBfaOKio +(kK#6ɚ+|϶x(tR{#g_-;!§ +1kf4um{p:G 2B7"~/Bر9 \ No newline at end of file diff --git a/secrets/ens-mail-password.age b/secrets/ens-mail-password.age index 69256b1..cd0f151 100644 --- a/secrets/ens-mail-password.age +++ b/secrets/ens-mail-password.age @@ -1,23 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 IRHAkA KKmIYYgr7RoHaFarMUu2MQxtfq7s6LFlkxWE2AiliUM -aoThCXX1Mwpeic5cKqpIYH66K6dnir3xZcUAVlFVm6w --> ssh-ed25519 AqX2tg ukfeBi25gPQfJSCTgK6XzYAtdtu74WNTcDa4HWgiED0 -ATEWFoGWuNCw5JsHlJgOgmO2x7QUEWJGsJhQcfonj08 --> ssh-ed25519 bD9h7A 4ecAGa7aX8QnxyBDcl8quzom3v6l4TCRZtQGzZT8KhQ -mtWdD8tM1YYo1MoQTENAZJYCSPYD7x2kCmUPc1uPHmw --> ssh-ed25519 2Wt2Kw rWJcOrA4j1X3ygTkFjImKuS4bAyOlrBRqq98syTFuxU -FINJkFVzbSd3TkXh+l69TMwN3b9ZINknRYR6VzIGej0 --> ssh-ed25519 xaddyw UiKM/eka9EJozle5zuEqfhZvES3OR9XnGb+c84I9tHc -S8gbIpi+SMw9PclFTa+zoiTmzE3XPmCIeTvzlCAGKCo --> ssh-ed25519 6rkyTg QnPd4yP1q3y95CZD7CvOsQF9hHVc3OQQNTh6S6jleAs -tBTrboe1nRB1BpwCzSz+7CQ6CBpDCkWrJyR7x3HW0Ww --> ssh-ed25519 d3M2Dw F4Ox/wYLCMaM5xsJQi7mMhDg3tOET7deQdofbfDi3gM -LsJjGUxMnV11JLxU9sdEvYFKV1lXgYiDypDXSfqyeYk --> ssh-ed25519 81O5Zw zDQE7eCBtRBxqP8KJtgH2CQUWofLE8A7rW05SAQEuGU -Y+ff0hh/OoqEYQHCefl/KRpuO5g/wRwx+kL7BkLMweI --> ssh-ed25519 Ye6ufg ca6dUiJfWehBpcOBPryk2cXnaI3MkYPBAbMwNXMi4Eo -pG3Baepk7wswiWn+3tvL2P5egckOrTvG9yZrXH4bpjs --> ssh-ed25519 eySVIw pwAaiREYDhFnShx270t1GjAQ/xBbHrf3Qqrg/nXfcFU -fOMTE6eaqRmlAf/aAp9pSmxXernBMTeH6Gr63j8uMSA ---- 65+++rjiLS5eEDZbqQoR0li2H/VVq7NJvwNixCLUTUo -ւ@W;מ^{Cx*'ßwZ*ÏBlF;z \ No newline at end of file +-> ssh-ed25519 IRHAkA DfH/oGwUW7QhVOolTYmXzA63GcHy4AclkJTb/deAIAA +O2Eg6+HETvshbvwM567+AX1fvKSgBKMTYIjiD5+Sab0 +-> ssh-ed25519 AqX2tg 4JYu4wjG6xb56wOJC3Qb5hxaQtX04GRJONcm46LzbSU +dcBQ1i2JTD+f+fGgME6FYVajZVGzXFPELfeYBeXRrJI +-> ssh-ed25519 bD9h7A l8yyq/gsz1HPoJoaKKM2/5YxFtQth2TOemSHWIkSRWI +iMzNiDuK7MFEA4coM+eEOfqZTZQlmGLrRypf26NCTis +-> ssh-ed25519 2Wt2Kw 3gJA77fb21Ol0NxE+OEYriihlBbkdgkr9ygVlp1jRmo +iyxYCc1JWxki/AvYitxBq3dzd5aKyZDd3hASoCj9ypk +-> ssh-ed25519 xaddyw nmHuaAMzb8ANoV7ud1fTBCBP8wbjMtSjdWPVNnVokgo +xxdOSQEPV9wndCoDYmO+8lk24spqqF769TbfnVr69pE +-> ssh-ed25519 6rkyTg jeKcJXoRteB/pB9grdaXs5bAzgRP4h57oz54WdhSnBo +x/3Ez182Y7ugzW9JLYQpiKHgUk4a+hwvwLxhDcbMP00 +-> ssh-ed25519 d3M2Dw 7hkSLkGZKLj8tr3WhUBHpsbPBfCBpNxcbsq5Przcjho +7o5NP9GtQOPaeVWDuqWIStb/qga6iAUA7YHaKDnbYFc +-> ssh-ed25519 81O5Zw dzfT849rHzxivHIqt9ZeqxKNxEVN/EMSI733BsvsXxA +hRHs0YH0e2VAAtL7Je4aEo1VHuBhxtkvYED4vvZkQBA +-> ssh-ed25519 Ye6ufg GRBgLzxk3bIT1XlqQjvTNw8xdHk3bkIBMv+H2lsakjo +FJ/Pzcqz2hw+i/EgjZSUPpu+UedVb54hF7OCTeJ5LSk +-> ssh-ed25519 eySVIw ws853GzopgVKFTVw4Oh71pN7izuiOZx68cPBbgSHcng +tpnXjDQNmtF3koYSiisBNaJYyfeLoFaMVBo0m0zztpA +--- AWJrEI+IMMEv8AxjK0W/KbaetT1mFxV2ipqPCAn/ifY +GNd\*hqhqLSH%׊=#"\/k, \ No newline at end of file diff --git a/secrets/ens-mail-pw.age b/secrets/ens-mail-pw.age index f5de799..ca3ea49 100644 --- a/secrets/ens-mail-pw.age +++ b/secrets/ens-mail-pw.age @@ -1,17 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 u3yXZQ plTrCNAxnkMZ/+M8TD6umNkufSkUjSoAdJaiRVlx6Aw -qLg+wHa2gv9sgnRGXOVnzqlkKFznsC5P8ev2qYvN+No --> ssh-ed25519 AqX2tg fil8vo0f6HUhW8xoIo/qoGECekBM3uU3aBlU/z53+Xc -lw19zCnPJWv79z+mICQFeQY4pQ6Bnu2rVmdXKOv2hqo --> ssh-ed25519 eySVIw /MpShOP+mCDqqG68SezyB1FpO9M5Z1OvYjoiDRMgb00 -WZ6kK1hNSoEZUI3A8bxx+svn6OuqreDY+kTlqK1A9yQ --> ssh-ed25519 ThuR9A Z5TfVJ7s/OPEkEELX8/z9S7IvrGu+KajPXSc6162zX4 -OygoKGN932ignRf8Y79qFECPt7x+WBmW896U7i9MHvM --> ssh-ed25519 7MARBg hEI80P1lLpnaUCPgCf7zMdxK7Gidw9PhSZQiIaCNWUY -MNLlWs3DNS418h7YVWhbhreUb3Ub248kQX1KQVcWL24 --> ssh-ed25519 pgfKjQ 2RS+GPy+NwseE+UWV9NAiPyHpnxHpkaeguOUm25Juh4 -NZQvLvom7jFNC9384LC8pQc/nO14qq0FZVWxCSB8gIc --> ssh-ed25519 LFAtBQ R+eHawl+RRFDJarA22oZgq1bJvVg5dbDU8Rmp97fY30 -Db1hATY6aIN6ZKvtheFtrLnrqyzUFBPU2lwjATrY+HM ---- NvSg63mxMKTVXW3QF6cWDdbLmPPZPj+Uw711kCQSxWs -~d4Xs^BC-GҬܼ*.H \ No newline at end of file +-> ssh-ed25519 u3yXZQ 2rEipNhz/QuJILbdZfBSflXA1yBe5HbCmaJF6+aHbRE +CUzpG3RxkwmNpLYxfV9GTdnSBo/4w/RjXa+SPHgllTg +-> ssh-ed25519 AqX2tg THNgafIXoMcn+9P6JPfajC+GfsQ/JygnHONtTBDI5AQ +CP8fyGVDOtWo/H2TXRMPRSKdZ4YCjDfKMzCOTD9xVew +-> ssh-ed25519 eySVIw apXDUyGYIQEwq8J8sK2Ytg+it9jbZNxhkpstUz6SCQc +6D3ibOfF1V9MZ2EeYjNdmmYk7/lMf49/uh5NCRBumks +-> ssh-ed25519 ThuR9A IpjWbB9Y2KQryFgZQf1E+w0AkQBqBFnCnKMT7QgMUxU +zmkhLcX8mENhXP0RR0q/10/7BYYt4uiNImBsSxcNho8 +-> ssh-ed25519 7MARBg Oiu7M2TYb2Q6rZ1+0qLOsnuqPTkUQzqjv8yDh9cC13I +q7v1uGWm/xPnsuSPS9zJFibNJkD+LWCGQECiqZspDwE +-> ssh-ed25519 pgfKjQ DS7LvywaV8cc2lZ1htM021Bj7eeS9u7uXd+t823ShQI +4J0iE7KzvxYC7/PuRT5KQUeKLPkUfptj1z5N0qqCwSA +-> ssh-ed25519 LFAtBQ f8am41B022elAv2GD6rWtCa5t2+Gqb9Nr3xgVt+5fhk +8BKlML6st0knzDQVFaiChnBFj/Mq9JTu0s7YEUMqF7w +--- EdhxNdwbECVUAZCQPYjM1tYtfnxLR5DTyBEW64EtfFs +C^QJeA0kDnƒQG'x; \ No newline at end of file diff --git a/secrets/forgejo_runners-token_file.age b/secrets/forgejo_runners-token_file.age index 8598457..64fb24b 100644 --- a/secrets/forgejo_runners-token_file.age +++ b/secrets/forgejo_runners-token_file.age @@ -1,6 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 AqX2tg X36nT0FkTjPcz0Lx14yHmHTYEv8clqHFui2OqmVOYQY -lUCstPKuatwdqCwInbjziQvp3c7sicp/NTHAhFrZGao ---- lOcAy9JVNLqK55W0dALAq6TDzme6svs30MFrTHyuR0s -7BF< -+yIʝO4Tt{}tȶ[R77}]pwj#^#& \ No newline at end of file +-> ssh-ed25519 AqX2tg llH7FbLqfXCJyDyBqnvPZ71Qjhys66MNt9EWnBDzuwM +U9ZxSoyWOf/ZCvuv+SyBcONgFuo5nWaSr/KKFwoTf60 +--- AJKRiBy4o3Me0uOUaBKe+plcIwhUcIrwCc2jeyNkIAw ++Q (ʪkxu>x[ +\1a%u׊씃RqK{v8C? \ No newline at end of file diff --git a/secrets/garage-env-file.age b/secrets/garage-env-file.age index 6152a15..bbf94d5 100644 Binary files a/secrets/garage-env-file.age and b/secrets/garage-env-file.age differ diff --git a/secrets/git-gpg-private-key.age b/secrets/git-gpg-private-key.age index 065ba07..5b32ae3 100644 Binary files a/secrets/git-gpg-private-key.age and b/secrets/git-gpg-private-key.age differ diff --git a/secrets/github-oauth-secret.age b/secrets/github-oauth-secret.age index f8f282c..13fef4a 100644 Binary files a/secrets/github-oauth-secret.age and b/secrets/github-oauth-secret.age differ diff --git a/secrets/github-token-secret.age b/secrets/github-token-secret.age index 163d0e5..f6b7110 100644 Binary files a/secrets/github-token-secret.age and b/secrets/github-token-secret.age differ diff --git a/secrets/github-webhook-secret.age b/secrets/github-webhook-secret.age index 468abed..a142583 100644 --- a/secrets/github-webhook-secret.age +++ b/secrets/github-webhook-secret.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 AqX2tg HUfPk3uqwIEcRrUwz96wzUZQ+MlAitVArONK0kVtxCo -EP5yxZ7TyNm6DW4aiWijgEEzTK+QBe7Brm9xadcGvZU ---- K6kwz37dqA38tUuMhSxvcjHq3h8sS/4uRUj1vjHEFBs -VR+W_V>(<F%\c{ CǩmQ-tm&~[k5^Dn; \ No newline at end of file +-> ssh-ed25519 AqX2tg m8Al/A7NrcignAVlf43r+IaTgKg3CH9BcE2bbd0/Wz0 +QTKWmnLTVH+H3ZRyNo073t0D8iasGqR0PMT5Ha8fSr0 +--- kWPGRPq6ViZv5DsP5jsQJejLBSmObBT/W2d6dqOQCQ4 + 1. i690KbRM&~ey2ﴠlm_N Z#-ǎ \ No newline at end of file diff --git a/secrets/julien-malka-sh-mail-password.age b/secrets/julien-malka-sh-mail-password.age index a5da33f..54c7ddf 100644 Binary files a/secrets/julien-malka-sh-mail-password.age and b/secrets/julien-malka-sh-mail-password.age differ diff --git a/secrets/keycloak-db.age b/secrets/keycloak-db.age index d743baf..dd81039 100644 Binary files a/secrets/keycloak-db.age and b/secrets/keycloak-db.age differ diff --git a/secrets/malka-ens-school-mail-password.age b/secrets/malka-ens-school-mail-password.age index 48e47b0..14bcb74 100644 Binary files a/secrets/malka-ens-school-mail-password.age and b/secrets/malka-ens-school-mail-password.age differ diff --git a/secrets/mastodon-env.age b/secrets/mastodon-env.age index 7b0a32a..f811c42 100644 Binary files a/secrets/mastodon-env.age and b/secrets/mastodon-env.age differ diff --git a/secrets/mondon-ens-school-mail-password.age b/secrets/mondon-ens-school-mail-password.age index 4de8c10..6c1f09c 100644 --- a/secrets/mondon-ens-school-mail-password.age +++ b/secrets/mondon-ens-school-mail-password.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 bD9h7A qF5Z8CLaqNVlW9MNvkMqJER3Vy32xxDntp3vy0KZJ2M -1k7WMxLN9Mfax66f9AzIZmJELrFTmuN/WJ5vnWnB8qg --> ssh-ed25519 AqX2tg +26A9G8InpOHmkIA5syXP5jaOAK3g3Yiv9Ey8gDduRw -INSSJA2u/EIw7B1DWokfHICQP1mTSqRCiKk6cPFeYVw ---- G8cd0BgWQRAmEQENg1Vv7Io0I4uwxFvxVQNL+bEJFu4 -ѠML\'>9 ck(J(LH.i;gCز -/OL"dRP]`?j۵yUT˘\ٵ \ No newline at end of file +-> ssh-ed25519 bD9h7A sQT3zcuKbxh2Ra4VLD9RLrLh0U6YwDjFTMQ2FTgvr1U +0sdgXHpo0ikX9GEUwWBE0773IViAROehSqBKcnX7/tw +-> ssh-ed25519 AqX2tg 8zm4bI8HLK5Ec6PWnNI2Yb08sQkhmz4463004WCBB08 +7NpLUXlEjpErT1yX7h9ceCIH5Y8naY2rCqPnhqvPCXE +--- TpI8X2RcfiskRThO3yzGERqZdhY1C/QIp1mQToi9t1w +0G ,Y*-ɨXH sVᏻѳ.}" ;ʆuEK ssh-ed25519 AqX2tg 4/c0gbNhOQMBlkk0M2M6CV5FShMdy6HhZptpL0WOBFI -uCqMKdDaInUMLlwCrG51d6AM7byg4a8EHLou5bQGzkE --> ssh-ed25519 u3yXZQ HF3wgBxfE+Hmz9a5QB3+H03F9R/QFMk39vobB7QNglM -1ZMXLG6jpsM+NCYlOMEcx+wIxfA/4iHZCfRVQPtgLAI --> ssh-ed25519 IRHAkA nTp3Yc7vypZ1bSie1lFuFpMUZFg67UdhKpSvvsA3Dhw -3aeOSI1R9IkaK5bjHkxMaK+/IruhKQkBxLOatyA4hME ---- h7OURmu2BfnFUklxRAwdGkJdy/vSFUobfVC4fz1H2lU -uH\xN ,w;]Cqv5U4t\NN|<7eb[E-g="u.F$ \ No newline at end of file +-> ssh-ed25519 AqX2tg yRUwt300dgN3I/f4ZEteXaxygn5FzANbzOOmAEV8f2I +vR5nVYASYMqgkor5aMgRSBJaUR2vBCe0te0COHc+As8 +-> ssh-ed25519 u3yXZQ oChJ3qbc6MVzgvZxnQKvgaHnPSnOfNeCTEqYZgOuOGk +pImjd+vt4k8Wk1V0hI1gFZKI1cegOEDjI4K4ktJ03KI +-> ssh-ed25519 IRHAkA u1he/n9+mMJwos5abLtSeoNEkb7uSpoRxWdesM2a7SM +YrjoSH65oBme42sq74ts+qDaj0lm3YDNcOSxxcy62FY +--- zkJU3sMlcPNubLt9JvHgF8jmfPeuWXbQBKPbCMhepM8 +AtRRzi` g@wcYwg+%Q/ftu籮N)ɇ8ژ \ No newline at end of file diff --git a/secrets/nextcloud-s3-token.age b/secrets/nextcloud-s3-token.age index 5ac5a4a..ee81f67 100644 Binary files a/secrets/nextcloud-s3-token.age and b/secrets/nextcloud-s3-token.age differ diff --git a/secrets/notes-perso-auth.age b/secrets/notes-perso-auth.age deleted file mode 100644 index 8fe059b..0000000 Binary files a/secrets/notes-perso-auth.age and /dev/null differ diff --git a/secrets/notes-phd-auth.age b/secrets/notes-phd-auth.age deleted file mode 100644 index 8761c20..0000000 --- a/secrets/notes-phd-auth.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 AqX2tg WaB2KyF5Pn7bctfQPoQeYxLVrgJWOTJWEzy1idXbDH8 -6tMd9pXqlgE9c3WVZXpGhs+BI7u2/O28X2NRWRaDHe4 --> ssh-ed25519 u3yXZQ pnv6mKrWs9TdDRgpK4KH8M50adnWhTOwEVBzA7O9Lhs -S7BHn26/5gw7pfix3Rzb3dKmPUdpWY/o6ujiogbKgTs --> ssh-ed25519 IRHAkA f0vpRxGKTuowWFCAvlOCwxBEFGzua21QS0+n1xzGo0U -IhdHiySCsexbw/942wJPpiI3UspJY66AqGwJ4YuOPsM --> ssh-ed25519 Ye6ufg YKi+IgVF9I4Qd9BWO9H+ZmR7dxTvfkroq4K+02GXQWw -YTRVYDiWcPsX4O5cllk7+BCslcBReHdw+jRitsqP43A ---- qhUlxjLo+pbiv23NWc2Vt83pa4DjHN9MFDAUv+XzuIE -YUϺ4qoqeNx[&:0A8 D nM:iC?P9 #عX?dqv4ڑ}o+ \ No newline at end of file diff --git a/secrets/pages-settings-file.age b/secrets/pages-settings-file.age index dcd2cca..2389413 100644 Binary files a/secrets/pages-settings-file.age and b/secrets/pages-settings-file.age differ diff --git a/secrets/plausible-keybase-secret.age b/secrets/plausible-keybase-secret.age index e1071a0..7760810 100644 --- a/secrets/plausible-keybase-secret.age +++ b/secrets/plausible-keybase-secret.age @@ -1,11 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 AqX2tg ckWqS2AjXeQPrrA0NKeBJk+0WMe1o66bYjhDrk/N7w8 -Ab8w1oZtNKQATH4+t5TnlVN2ZJvMEI290HNn+hdRnys --> ssh-ed25519 u3yXZQ mvHzT1GtRJysnrKLMaimIBZiN7TlfHbYqImE/zwPf1Y -kO/WdnbOvBD4YvFp+f0+ndkpdRpAhLIfpaeNsV58Zr8 --> ssh-ed25519 IRHAkA jBEbSOiw1H8HyrQ8ItarIr2LAYxkCQKpTvSPIljMbgk -kllR6d6W2CzeErhmMpTWpsRzPER3p3XmzEwBMzs7vcQ ---- zpBIErWXERbFzcUw/JKSwRIOUSfhdVDsk5KQ+GU704M -ȠBŗo^6 |rwr\(ՏN^* \ No newline at end of file +-> ssh-ed25519 AqX2tg BKGsvS7rgUU2IxJspcTRCAOs1a7BeUtVagibrZsnkX0 +gWN2G7JgbRWOuXWGvOQj3ZAw74zALbTbgjdXseiJkPE +-> ssh-ed25519 u3yXZQ O3X903Rk1e0ZEj2DV4rrrsaccLviP+iYrl4piBwOsF8 +O1YgSmq/uR1/kI/eZv9i22LBYjUNgl4/CMSd17FswMM +-> ssh-ed25519 IRHAkA h4ZwbN94MZO+tsgO/FUYbJun3BrHMjbTVnJy3xH2UxY +CkQrMXF8FKqN4Z+kSSwBfhOnmPBODJnIDXNhtxlkX2w +--- tVUGAL9CGLwdIfggu3UQzxnqVXMQnf2O5Jjc8j9sxec +$=~ݟ_:n&F̖7H \ No newline at end of file diff --git a/secrets/plausible-password.age b/secrets/plausible-password.age index 4ea62b7..ce7b541 100644 --- a/secrets/plausible-password.age +++ b/secrets/plausible-password.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 AqX2tg /uwZbh6tiF8xjpEuaKeQhQMfMHXbFSmF1qwKZDea0W8 -WTGydvGAob58NkZGU/8kBytKWCVJBSwTMcjsBlxCetY --> ssh-ed25519 u3yXZQ 3VpfVvCeMj23gF5R+dhOFJuiBWtN1NvdUzIZGit/1HM -kNQZzD3zgIKAeikdnl2xRrjLssyvpFqOm0vU6gD8DLI --> ssh-ed25519 IRHAkA oa0nwwtyB3oMrJJ294oo9LZXkfFkApqi9uO+oCLjCmA -TT2SmDck2CQta2mFanNVptASuebbMeKEaY7em6r77uU ---- Un9n8WwXJOMDaVn6eyqacJxOqfV7z8N3nTwJ7D3AWKY -/ޞĻHE0j:6'B2Gt\Ȝ` >o I \ No newline at end of file +-> ssh-ed25519 AqX2tg cYECeHFY4cB7AM6OrFXOYIgkM0TvFKqWZDpTm7YQoQY +GFvTxBeQXDS3lRLeaXWdJRmtbeu2JyhD3+Rss4YXnQw +-> ssh-ed25519 u3yXZQ 60atYzhzMYVrAuiumga5dWjNk3USK12SYR1uokcXVFY +Z/Ts39Chp1a6TrIF4S1E0TpbEw1GbkezyXvVt4HF8vM +-> ssh-ed25519 IRHAkA B/rv+4fUaE5xs/0ok568dtm5vVEhL4RPeaWF1Jfw+RI +OzlvQH5sBTLRI41gzYPt2zYUQ/pKcpl697PCDaNquyM +--- eUsZp9YSIZ34FGEiaGEZeV+7LDTR9Qoc8n85kmbP1Zs +wV<4@<?—B4O-r> 嗘ژzq e "0%H \ No newline at end of file diff --git a/secrets/readeck-config.age b/secrets/readeck-config.age index 2503c56..c928a0c 100644 --- a/secrets/readeck-config.age +++ b/secrets/readeck-config.age @@ -1,9 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 u3yXZQ jTuPs5Lzit/TMUS8ZjQSOmghJvXZIolT+cVA95owFTA -BGClI5JknoL1CAuPYyuLv9dHNodDUQDBkDYrp8RnkfU --> ssh-ed25519 AqX2tg 84YCm2M1scsnBPG+EVgWRlS3Eo0BPwI8fKQ2HA9kjS8 -XepdbDkxbXk6YqtchdtJ7DWHF8RY8sNvuA1m2vpD+zQ --> ssh-ed25519 IRHAkA J9/JjHJ/em87NGLFTh8Gr7z0KLfyPuaXBOTr/lJNtjM -E9ECDhKGevsyUR3Omw4/p4GaX0TrYDVpL6yATuN+rnA ---- zQWNfPYkzPgQkTZtgcfILUK+wrjrvLZ7LTmwgkUw9NQ -ݴerO KҚ(UL КozV%SCK@,MKx;Mg K/oƾDŠE7|鐹d㇅Φ 8}s-jBtKۃd(X:0ͨ \ No newline at end of file +-> ssh-ed25519 u3yXZQ X4kJO7feb7nOD5SOLkCcN7DJIalUE+iwBqT8tJlH6Tw +0Hy8XV2H2m6paLAGEdfI3yuDw7nHfonXTPHRHCVb97E +-> ssh-ed25519 AqX2tg WMb6MhYvTE3meVkWJxB4mBwbqoc10DM6Q4TYV9weS1c +6Ao5ALdnNAmI+mKLjwoxXyYklVCUhLge7a2vqievsYg +-> ssh-ed25519 IRHAkA X6eljUEaQhdP0D0AZz7q9VIhiEuCwtJ8ti3Kkf5h1QE +7j2w6F/VKf3pTa4A3jlC5Vw1rrTD1W4j5jaAarRO+OE +--- sX+STbitgwxeuNkrV4LuDdBjViGFzNIyBoFRxYfoXtw +0pAג+bOGThٟl"߫Dz`탭% !'.q24 +4/Ky .ۼINc7i%}D][X2"Iedfݝ4d4tm1%Z \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 4fd1a32..dac1e0f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -185,31 +185,4 @@ in gustave ]; - "artiflakery-auth.age".publicKeys = [ - tower - gallifrey - gustave - ]; - - "notes-perso-auth.age".publicKeys = [ - tower - gallifrey - gustave - biblios - ]; - - "notes-phd-auth.age".publicKeys = [ - tower - gallifrey - gustave - biblios - ]; - - "book-auth.age".publicKeys = [ - tower - gallifrey - gustave - biblios - ]; - } diff --git a/secrets/ssh-lisa-priv.age b/secrets/ssh-lisa-priv.age index 8293671..6d1cb41 100644 Binary files a/secrets/ssh-lisa-priv.age and b/secrets/ssh-lisa-priv.age differ diff --git a/secrets/ssh-lisa-pub.age b/secrets/ssh-lisa-pub.age index bf5a208..b1213fd 100644 Binary files a/secrets/ssh-lisa-pub.age and b/secrets/ssh-lisa-pub.age differ diff --git a/secrets/stalwart-admin.age b/secrets/stalwart-admin.age index 5296a2a..c6e7da7 100644 Binary files a/secrets/stalwart-admin.age and b/secrets/stalwart-admin.age differ diff --git a/secrets/stateless-uptime-kuma-password.age b/secrets/stateless-uptime-kuma-password.age index 3ae6e07..b503dd7 100644 --- a/secrets/stateless-uptime-kuma-password.age +++ b/secrets/stateless-uptime-kuma-password.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 u3yXZQ 1x5UeuazhHgklICvQndvZ27Rfqs02j9elCkk0EW6iUQ -zbBwzSdCjuxPjIKqZOoL2RYs9OJzR1lZCzN2htdqLgI --> ssh-ed25519 AqX2tg afqPcqgi6Efk7XGrd81q62PXm2rspPrikVJa9TS9EAA -4swXMpm8QYqEQQDfDzMROVdMU7tqBucYtEQSiWlTCbQ --> ssh-ed25519 xaddyw RfeAJwFJsMbjWn7EG/xvuW8fZnP2MmbSnVJwRxRaqSo -AJ9yFv0yhTLctokYF8klXfFYddCPwp0EYVlVbhRZ7I0 ---- YNjU8tYiN8L3Dq1RahW0l5g56nRLEGpVTMtlGZMNXHQ -\F#"j*`)5dueG5X>II#FޫFwvӼn]4s \ No newline at end of file +-> ssh-ed25519 u3yXZQ 9+Xv2cty0bG10mt4FR2CUJl5p/CVYMgxHTiICKvJOzQ +q3l31VZYM/ei0NIz6V7dCW+Jpx02rPRUtQBlnhAKRxM +-> ssh-ed25519 AqX2tg xCy2wR6oVlXDgLirI4/fOYLhp+NvXI1mJ+dG1RZeI3I +7KHAZ2cUv2CnfNxZXyQkoPpQOwXBwTbHQkzKMT6RMAk +-> ssh-ed25519 xaddyw DhCjlG3QgsjUYyzsGvdUwD2tDtAHg59cRPGJ3gJbFHk +ziQAixcCW6k/Ae11A291Fl6+/fBz0YT0ESVBSQRQC3I +--- rX2Am6HeyjmcxbCAZDOQ+qOL2/M8uBnNtLkhB0jDJgc +9B6>c0sLDJmfe|ڈ |$YjfʅN 34 \ No newline at end of file diff --git a/secrets/telecom-mail-pw.age b/secrets/telecom-mail-pw.age index 0a6a6bd..a125cef 100644 Binary files a/secrets/telecom-mail-pw.age and b/secrets/telecom-mail-pw.age differ diff --git a/secrets/user-julien-password.age b/secrets/user-julien-password.age index eec7973..3ee0bb3 100644 Binary files a/secrets/user-julien-password.age and b/secrets/user-julien-password.age differ diff --git a/secrets/user-root-password.age b/secrets/user-root-password.age index 91b6cf1..3172428 100644 Binary files a/secrets/user-root-password.age and b/secrets/user-root-password.age differ diff --git a/secrets/work-mail-pw.age b/secrets/work-mail-pw.age index 18fa505..7eb62b2 100644 Binary files a/secrets/work-mail-pw.age and b/secrets/work-mail-pw.age differ