From 1083d0e717621a9febd76b980e1782c0abf7a5bc Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 5 Jun 2025 16:51:51 +0200 Subject: [PATCH] feat(firefox): only set all profiles for steveej; nix fmt --- nix/home-manager/profiles/sway-desktop.nix | 2 +- nix/home-manager/programs/firefox.nix | 120 +++++------ nix/os/containers/mailserver_secrets.yaml | 86 ++++---- nix/os/containers/webserver_secrets.yaml | 86 ++++---- nix/os/devices/elias-e525/user.nix | 42 ++-- nix/os/devices/justyna-p300/boot.nix | 12 -- nix/os/devices/justyna-p300/configuration.nix | 14 -- nix/os/devices/justyna-p300/default.nix | 29 --- nix/os/devices/justyna-p300/flake.lock | 70 ------- nix/os/devices/justyna-p300/flake.nix | 13 -- nix/os/devices/justyna-p300/hw.nix | 42 ---- nix/os/devices/justyna-p300/pkg.nix | 72 ------- nix/os/devices/justyna-p300/system.nix | 48 ----- nix/os/devices/justyna-p300/user.nix | 30 --- nix/os/devices/steveej-pa600/boot.nix | 5 - .../devices/steveej-pa600/configuration.nix | 13 -- nix/os/devices/steveej-pa600/hw.nix | 23 --- nix/os/devices/steveej-pa600/pkg.nix | 11 - nix/os/devices/steveej-pa600/system.nix | 43 ---- nix/os/devices/steveej-pa600/user.nix | 11 - nix/os/devices/steveej-pa600/versions.nix | 29 --- .../devices/steveej-pa600/versions.tmpl.nix | 37 ---- nix/os/lib/default.nix | 77 ++++--- nix/os/profiles/common/user.nix | 36 ++-- nix/os/profiles/graphical-gnome-xorg.nix | 6 +- nix/os/snippets/nix-settings.nix | 3 - secrets/holochain-infra/nomad.yaml | 68 +++--- secrets/hstk0/secrets.yaml | 86 ++++---- secrets/router0-dmz0/secrets.yaml | 86 ++++---- secrets/router0-hosthatch/secrets.yaml | 86 ++++---- secrets/router0-ifog/secrets.yaml | 86 ++++---- secrets/servers/dyndns.yaml | 86 ++++---- secrets/shared-users.yaml | 194 +++++++++--------- secrets/sj-srv1/secrets.yaml | 86 ++++---- secrets/sj-vps-htz0/secrets.yaml | 86 ++++---- secrets/steveej-x13s/secrets.yaml | 86 ++++---- 36 files changed, 709 insertions(+), 1201 deletions(-) delete mode 100644 nix/os/devices/justyna-p300/boot.nix delete mode 100644 nix/os/devices/justyna-p300/configuration.nix delete mode 100644 nix/os/devices/justyna-p300/default.nix delete mode 100644 nix/os/devices/justyna-p300/flake.lock delete mode 100644 nix/os/devices/justyna-p300/flake.nix delete mode 100644 nix/os/devices/justyna-p300/hw.nix delete mode 100644 nix/os/devices/justyna-p300/pkg.nix delete mode 100644 nix/os/devices/justyna-p300/system.nix delete mode 100644 nix/os/devices/justyna-p300/user.nix delete mode 100644 nix/os/devices/steveej-pa600/boot.nix delete mode 100644 nix/os/devices/steveej-pa600/configuration.nix delete mode 100644 nix/os/devices/steveej-pa600/hw.nix delete mode 100644 nix/os/devices/steveej-pa600/pkg.nix delete mode 100644 nix/os/devices/steveej-pa600/system.nix delete mode 100644 nix/os/devices/steveej-pa600/user.nix delete mode 100644 nix/os/devices/steveej-pa600/versions.nix delete mode 100644 nix/os/devices/steveej-pa600/versions.tmpl.nix diff --git a/nix/home-manager/profiles/sway-desktop.nix b/nix/home-manager/profiles/sway-desktop.nix index 93cfb2e..65ba632 100644 --- a/nix/home-manager/profiles/sway-desktop.nix +++ b/nix/home-manager/profiles/sway-desktop.nix @@ -217,7 +217,7 @@ in window.commands = [ { command = "border pixel 0, floating enable, fullscreen disable, move absolute position 0 0"; - criteria.app_id= "flameshot"; + criteria.app_id = "flameshot"; } ]; }; diff --git a/nix/home-manager/programs/firefox.nix b/nix/home-manager/programs/firefox.nix index 3869ca1..b9c575f 100644 --- a/nix/home-manager/programs/firefox.nix +++ b/nix/home-manager/programs/firefox.nix @@ -329,65 +329,67 @@ in enable = true; package = pkgs.firefox; - profiles = mkProfiles { - "personal" = mkProfile { - id = 0; - isDefault = true; - color = colors.blue; - }; - "comms" = mkProfile { - id = 1; - color = colors.blue; - }; - "admin" = mkProfile { - id = 2; - color = colors.blue; - }; - "infra" = mkProfile { - id = 3; - color = colors.blue; - }; - "finance" = mkProfile { - id = 4; - color = colors.yellow; - }; - "business-admin" = mkProfile { - id = 5; - color = colors.teal; - }; - "business-comms" = mkProfile { - id = 6; - color = colors.teal; - }; - "business-dev" = mkProfile { - id = 7; - color = colors.teal; - }; - "holo-dev" = mkProfile { - id = 8; - color = colors.green; - }; - "holo-infra" = mkProfile { - id = 9; - color = colors.green; - }; - "holo-comms" = mkProfile { - id = 10; - color = colors.green; - }; - "justyna" = mkProfile { - id = 11; - color = colors.pink; - }; - "justyna-office" = mkProfile { - id = 12; - color = colors.pink; - }; - "tech-research" = mkProfile { - id = 13; - color = colors.purple; - }; - }; + profiles = + lib.filterAttrs (_: v: config.home.username == "steveej" || (v.isDefault or false)) + (mkProfiles { + "personal" = mkProfile { + id = 0; + isDefault = true; + color = colors.blue; + }; + "comms" = mkProfile { + id = 1; + color = colors.blue; + }; + "admin" = mkProfile { + id = 2; + color = colors.blue; + }; + "infra" = mkProfile { + id = 3; + color = colors.blue; + }; + "finance" = mkProfile { + id = 4; + color = colors.yellow; + }; + "business-admin" = mkProfile { + id = 5; + color = colors.teal; + }; + "business-comms" = mkProfile { + id = 6; + color = colors.teal; + }; + "business-dev" = mkProfile { + id = 7; + color = colors.teal; + }; + "holo-dev" = mkProfile { + id = 8; + color = colors.green; + }; + "holo-infra" = mkProfile { + id = 9; + color = colors.green; + }; + "holo-comms" = mkProfile { + id = 10; + color = colors.green; + }; + "justyna" = mkProfile { + id = 11; + color = colors.pink; + }; + "justyna-office" = mkProfile { + id = 12; + color = colors.pink; + }; + "tech-research" = mkProfile { + id = 13; + color = colors.purple; + }; + }); # policies = { # # search via policy. the other one doesn't always work because of schema version mismatch diff --git a/nix/os/containers/mailserver_secrets.yaml b/nix/os/containers/mailserver_secrets.yaml index 24a3376..9814c66 100644 --- a/nix/os/containers/mailserver_secrets.yaml +++ b/nix/os/containers/mailserver_secrets.yaml @@ -7,47 +7,47 @@ dovecotSslServerCert: ENC[AES256_GCM,data:ylK0IIj2vdY0mXOqSgA5zYmFYGote/uMtDWy2r dovecotSslServerKey: ENC[AES256_GCM,data:KYpQZbioLGrp/6R6j/c4uJhBpoDT2aj7UffQQug8Otzr/0rk51tavsjg4YRQGIv+ZpFYpWAuHbhW4O8AsRgpi0AX3hKsZICEdNubfK5zfd+SInXveaVFbHHjOuzcqftraUrqx9APu+omk4LlpxpWTbj/bAcRnRBn0C093AeJNi1giaCZd4NxmmkYqwYzrjUc6LYHvICEnjA87ZVpeOKE/6B2Ng5QWDKhZNmjy7YDXAk4DS+P2grLmoGvnz6ubtaypSzaKXYTFz/uxEvtCCPlIaJHm3Nz0i0j1rjX3S/w3c26zuIFtwCmAQzGnHyQwbx7ILwCXfnyQnpM7+R5+fxcYvcK2GEJyTGzg/JFa++TI1YO+wpknjzxK3Sa8aX0pUbx/TEjnY3+tRnx7YNuih2ZNZrPHy8uJJtO9Aef84Sq5vLQG5n1/ya0pVhjCbs1pgpeK/qT3ikLbkcJg6NxAq3hqqQdR4TTkZBwKLVfzcMXLDZB0GphhVvtO0W7afRCE+nA/FPDT2NN6WLD15cN5F8w6USi0iQlwFb+TE8nt1ghhoGmwCMx+lX1Bk/jdIlYtJ62T8+T3nRVJ6ZRlUa1rkbAADaWZVvLR2/ylaEkeYFo/CC6lUg4DWPCVoGFxaWaU+ZaIDjbiYcqGQFBwq8JZ44hAOyJQpb7N1zgDVyPh/xr+ukmjutFuu97FY55VTn+8eipRiR4TZpPRH+KvB/FmlLNaim76YZCRH9Dv2ENbz9fXpWv7P+yh06+ci9HKvjNAzR6NRr368tK2srEEhWzFv+nAsRetzc2VcfwNMcg5/mvlWHVZSmONXC5adEo/W5XgJgUnH/fkz5IRPY/1iteq8PTCPUkubzF+qT2+suzEDnvgXlaKsqHkrk+n8YySl+GRABnasmnBYdb8vboDM41ptw3PXDoL+l07o6KxTwPOWWl9BVNMT8VzL7gAl+dlxjkEUSqn53OrsYDluxefBa3c0rfvk8CCvOMjgLkagK9O+VavqJEo00zd3f0ZzMcIoRebuDzYILw3DTrG/qyLXGsRoybBr+qcuSVBzM5RnjcToFJO4W/0EIdH1drZmqHdNgSNwPPRSNCivrhV25syUCrTee/xkDVUr47z67pK/5Mh0ewlwq0hcl/dBoA0YP/PptntK0CHfistD8chNtdMk3PyzqSiFaDPQ3T4wdc3zTNUjXeQ5643k5weJXFPg4tUuCCa8HxUJHd5sLnNY0OaRBwh2SLkQlcXYFQDzVHSoVscR3tf+57L7aF2hVQT2QtJKdZQjOyMg5YK0UlVc3tkyPZzyjOVaP7eTCRKwXI1NminHmmy1ZzZ+w+8+oX8cfvE9HdbqDoDp0MnkicS0+5S0lZwkRWrjUx/gS4aMWLbCHUQHY8wm+fmyDLJ/oI4ukdUI5YLOutlCsIY+aotnVMoORgdd/EPeZVYJmci/pvMjPF9Eard0aD4rLA7z/HwGgc3VEGmNluE+20BXO3bFIqwa9tzMqzOJB0qglP35MjVGiUe6Svq13DAmSOnzN+WqcVbTMJG8J1bwKqvmaN8AEpO0zU94ZhHspUtGyQQ0D6sMsw9jqJ1WyLE7aXeFR6OHrpw3DC2mCpr/qX8QFsveeyB83Za2+CuVVi2sqGAKYzkwlUPkeuaxfBak0apwJsF2trT1uMvPOuIda8k4XhtYLxah2BDJZIoMqUVz2xcN4OuW8bdSX/lepsyZZO34VEQDLBa2dxCCHJmCKf6io/0YlswNKGDQh+DI935KTdqBnHSJ9IjvADQuu+K37aS0L9V0ZLXiM5SBQtbB7kQpHjvivq97ru7QpFqJf8HCl1vDs4gJ/NV+J0+CX6dQTQOtHvwxD2CPGiiSv40ycoJAcwiqTh5T+hRPtca6bSes/jGN5iQjfLCRbwvL/ItLLAK3F2cEIdKZnfhJkdEAIwWFLvR4R5I7ZcCK5GgKz5dPROup8BAONA8XxcJWXaXV0YkfEmCDbZYMFC7pcx4NAnGp881RyAaG/HlstBHHVagpP2fwZ8K0J/2KPillOq/Die+vNc2++hx4EuftvNkZhSd+7zIYNKHQd0M4Ea74flgmmW5lG73bE1BkhVd2DsgEDihH19/vJjFH4PxKINKp0ij4jMyq9w+WsGiUqSDaQz/MZJ8wjzaSjvmSj4qlOAitr/s3f041e77rMb0W2ieCtYEy7IsebIqIWgKn/crm5FhyUtBCPEqFZgAKS313bXUio8LktqXCrZjZ0ZG8DmQG6hnK4PstKlIUQoNuFnb8Bp1zDgY4i2hb6Zmu7NnqnOaJJTjSGwaZOav0oMousn67BuFtwoMaGp+OjCopZ3HPfg19usnjvWpOgccXWYlQc0HOlGXUq+otKlXtQwAjUvz50GmV+lY3t4rpCgqk+pj9iH62xuzDQ01FOXl+v3Ehnw97mNJk9YarueG0Hl/1f6dhwXnjeEv35LLyWUjQolOoYgycEkgQ/cCCOSm7zgK1VT0oTLFISai8IG0qDP9HCszteHZhp+y4bsXQfAJTY11QLr7hx9/nQmVlHksDN5Wsno4wbkT+D2xb5EaDU2RBqZfTVcbRBWRtAhQcRPxdaUXyI7oKEaFg8fvQZ8wK/Ae+L18ub+Latb5W69dUVT6I13tPleXDl1oen9BXzaX7sygSpY4lJoXlu+SCKyNTMrC36PrB39QUWosw03ZsiKT5xjgN5+1m32yv4cg8lAwNCR4xxShrnhSbZ328yifaAuTnSawZmUGBVxPx4glVcvNUOXW2UvVtmeKU0SG1E+UGBAq7/UfaadMM7BsjyaaKpBa/tXZTm0rn8UiFqujvgNjQ3F/3ybRdlO5d6eMI9Na+1gqg6qxYSGR0H0wAdPhtyGRxpumehAQGeMKd49Sg6jspaf3NAjjuZ0Yp+eJV9652WqVZ7xtCNqRURV353h+XPGR+ZZ9siHRDQ+NcbxPkfbHw0/RTvZvEIdaDi5+DLh6tgIxMEtOpwTlfFrOUDaIcmWvzk92VtBFuafvoGzTipryTnMszjCsUTvyEPN8jPd6r8UmOFGXF2aVNksmn/bI97i4s1kYLgY8XsEOyx+Q9pUTkTEMn2JWgnEcSOAtaX1ZskHnfueKzUPb+/YWb+z8SNCgnUqHqa42qBqwlhdshzYhhfKhEisUptirzzp1kcbyHrug5PzHxh8Qri2pjHxSHYQ5sjig6K6B1YEuHP6uo19fL6BdgGlhKroiOF/6TMAcE9V3+yqvDdsW/IC0QXLHIBKC7wlDgLc25ltGogD/76P6tViDAb6+HNSSXJO056Ovq0z2BrXhnq1AmWa99mVnOLJwafRWPZC,iv:XxnAsh6yx9gICi3N6oTttpGXvguGZImWNIMp9srDJLM=,tag:M9gFSD5PNIfoCLet6Vy6QA==,type:str] hetznerDnsApiToken: ENC[AES256_GCM,data:JfL4Xg9TZu4Og35g0SwfrI1uxiqgdFa7p5AQcfiPwLY=,iv:yOak3uXX7CNglu8O2UW/1sOI7BGZxpRQAFJCvRbzU0Y=,tag:6orkQIy7BxACziLWpYoS5Q==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArQjVya2RyY1MxQUxtTHdX - MGlZRWdxZ3VXb01KbCtTSkJMR3dkZkZ0UGw0CitXcldZT3NJWExYZG50QnowMVhV - WDBpc0VFYjZnZDJDSWhUcHFHTzBiYkUKLS0tIFlrMmlxUkNVZExSNGN4VlMxcUw1 - VW8rSVdDcGZKcHpocjdqZldiaFpqRlUKfQNcKrI6PuyeFv06Es8NsHm8I7NzxJ1k - ir088kx66xcXeEiyA4DnIcAWG9O6HEVXXnSahAIE2jcupSSouDF3ug== - -----END AGE ENCRYPTED FILE----- - - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0OGlqTEhtaGR2Yi8vTVcv - NUtvd0ptS3h5Rnd1RGNuYlY2bHMrUmpKWHhRCkJpYjloQWhSM0FsNlNYSVcvWktV - VkkvblAyRXBadUJjK3h3c2JJbDZHc0kKLS0tIEhMbVZsekM5VDRhbDB0KzdyK1li - dWdhSGtFN1oybGpIb294ZE0zcDFUaEkK/AyEXeVmiYk1/IZdkyNGN4bccMFx5+JE - BazBF2NkztUWnyhqRvyp0cBucx7h/HhRSzqxwSr20lvv8XpRPGh8Iw== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-17T12:01:21Z" - mac: ENC[AES256_GCM,data:003nzaNWdXLscJy9XZcwAb93M9Eo3Bdg9s5MHHiv4/TitaaZE7VghWHKv5DrcoA0GGdN9SnIVqHd+o6OPVER91XLVxoiX7ixtlu1RIRfqdama3RRPtSki5wP5wPz6qF4vRBIKfrTpZK7thXLYs2NhCB9HJYljNhcgLtzEG5bWgY=,iv:tEP530Pij3bt3hc5PCYGjFFyPiKgo34dHm23Xtmrxt8=,tag:macr/U8R5+wktTBJ9OqI/w==,type:str] - pgp: - - created_at: "2025-06-05T09:49:08Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArQjVya2RyY1MxQUxtTHdX + MGlZRWdxZ3VXb01KbCtTSkJMR3dkZkZ0UGw0CitXcldZT3NJWExYZG50QnowMVhV + WDBpc0VFYjZnZDJDSWhUcHFHTzBiYkUKLS0tIFlrMmlxUkNVZExSNGN4VlMxcUw1 + VW8rSVdDcGZKcHpocjdqZldiaFpqRlUKfQNcKrI6PuyeFv06Es8NsHm8I7NzxJ1k + ir088kx66xcXeEiyA4DnIcAWG9O6HEVXXnSahAIE2jcupSSouDF3ug== + -----END AGE ENCRYPTED FILE----- + - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0OGlqTEhtaGR2Yi8vTVcv + NUtvd0ptS3h5Rnd1RGNuYlY2bHMrUmpKWHhRCkJpYjloQWhSM0FsNlNYSVcvWktV + VkkvblAyRXBadUJjK3h3c2JJbDZHc0kKLS0tIEhMbVZsekM5VDRhbDB0KzdyK1li + dWdhSGtFN1oybGpIb294ZE0zcDFUaEkK/AyEXeVmiYk1/IZdkyNGN4bccMFx5+JE + BazBF2NkztUWnyhqRvyp0cBucx7h/HhRSzqxwSr20lvv8XpRPGh8Iw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-07-17T12:01:21Z" + mac: ENC[AES256_GCM,data:003nzaNWdXLscJy9XZcwAb93M9Eo3Bdg9s5MHHiv4/TitaaZE7VghWHKv5DrcoA0GGdN9SnIVqHd+o6OPVER91XLVxoiX7ixtlu1RIRfqdama3RRPtSki5wP5wPz6qF4vRBIKfrTpZK7thXLYs2NhCB9HJYljNhcgLtzEG5bWgY=,iv:tEP530Pij3bt3hc5PCYGjFFyPiKgo34dHm23Xtmrxt8=,tag:macr/U8R5+wktTBJ9OqI/w==,type:str] + pgp: + - created_at: "2025-06-05T09:49:08Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfAQ/8DFSjoJYmO4+yvi4WT6mgrlzmAIvX0Ozch9XY+6DDOwiN - 746QgI6FI5NpmayTbhddhL1J3tiWkzOyAMhxd8JVNDdZHDJ9lDMCq5s/6yYJZvst - qpoU2pjeYFc+ag+H7m8d5dIaR352aBlKw+MMGOvBinM+5qAWNWo1Vams/9HV3BAV - vsFKLSj3eo3/MjjzY3bPlfBwhkDnudzfVJXcY7GhbVVzaQKXosoGjMfCKvSQNMWr - z52P40pfkXx1nWUt79G4xcH/G+lCUlz93RmS89sLS+YrrjKGQc4xcYpqpNjy5Xdw - rz+nGuOsMKXqLuxYJVuiTcxN0agVily9BTifUYiJZfS9cpbMvLwTyUOcc64EVCKH - Gg0b5l5DhyUKKk3klzgeXTlj2zPhKjGVT2MnZShZRspfGfV6T7iP761YD4ucaExd - 1+/cegyfeCNAykt4lD6ACeQXRLDs8rU2hUjpN3J6AemLW+Aj/ZnRVZWzgIvnDEEY - pyz/rAk5J6m7Q7909TcMuFg3j9ENeJZuRSwxwF0MRUYLZByKCH3QY9CE3mCh7Xni - p5znHpYaYqNIoiTmbBcxEx4mYRXUkorLTJXt4AO7zQB24ZReLDRsSzvrnQqyLIdA - b4pK2k2/L0Hagu2SZFvfhgw4qWZpIlgcoOVbe2dkmbIXMbjb8SuF/2jFwushALjS - XAG+iXYORCrvsuJoNjnQtSW0OGqYwuNNvWo2Ymyg2sA6CW+O6gsCZpZE0FKHcbl/ - FxgecFBl+P6Dk4OOewie+E4cZWIq2uXQch8QPSk5huuyUms6VZI2fre83dMv - =mHmB - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.7.3 + hQIMAw+OdhfgD3wfAQ/8DFSjoJYmO4+yvi4WT6mgrlzmAIvX0Ozch9XY+6DDOwiN + 746QgI6FI5NpmayTbhddhL1J3tiWkzOyAMhxd8JVNDdZHDJ9lDMCq5s/6yYJZvst + qpoU2pjeYFc+ag+H7m8d5dIaR352aBlKw+MMGOvBinM+5qAWNWo1Vams/9HV3BAV + vsFKLSj3eo3/MjjzY3bPlfBwhkDnudzfVJXcY7GhbVVzaQKXosoGjMfCKvSQNMWr + z52P40pfkXx1nWUt79G4xcH/G+lCUlz93RmS89sLS+YrrjKGQc4xcYpqpNjy5Xdw + rz+nGuOsMKXqLuxYJVuiTcxN0agVily9BTifUYiJZfS9cpbMvLwTyUOcc64EVCKH + Gg0b5l5DhyUKKk3klzgeXTlj2zPhKjGVT2MnZShZRspfGfV6T7iP761YD4ucaExd + 1+/cegyfeCNAykt4lD6ACeQXRLDs8rU2hUjpN3J6AemLW+Aj/ZnRVZWzgIvnDEEY + pyz/rAk5J6m7Q7909TcMuFg3j9ENeJZuRSwxwF0MRUYLZByKCH3QY9CE3mCh7Xni + p5znHpYaYqNIoiTmbBcxEx4mYRXUkorLTJXt4AO7zQB24ZReLDRsSzvrnQqyLIdA + b4pK2k2/L0Hagu2SZFvfhgw4qWZpIlgcoOVbe2dkmbIXMbjb8SuF/2jFwushALjS + XAG+iXYORCrvsuJoNjnQtSW0OGqYwuNNvWo2Ymyg2sA6CW+O6gsCZpZE0FKHcbl/ + FxgecFBl+P6Dk4OOewie+E4cZWIq2uXQch8QPSk5huuyUms6VZI2fre83dMv + =mHmB + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/nix/os/containers/webserver_secrets.yaml b/nix/os/containers/webserver_secrets.yaml index 179ec0b..d5c1dcd 100644 --- a/nix/os/containers/webserver_secrets.yaml +++ b/nix/os/containers/webserver_secrets.yaml @@ -9,47 +9,47 @@ FORGEJO_JWT_SECRET: ENC[AES256_GCM,data:nVz9x7+K+rBIZxuQP7o0WNFHUz89eR9cwBjfSAx9 FORGEJO_INTERNAL_TOKEN: ENC[AES256_GCM,data:EIono9HSyvp1nQM0ij3ln3IUXO4moFbRgVddeV0BZBXmZG05jdjZ1SIXo/BxoSmRKnjllR7P00CpajNM5zORldlsBId5oAYL5GZtY3/nmxeXucJidknuow22G7Z8wRJJGBdishbgQhmc,iv:1D93gTUF1+DUR8qLJgML+oUhvSslhxEjGnbBC/PWHXw=,tag:NZB+mwba4TzLcUANZLDRTw==,type:str] FORGEJO_SECRET_KEY: ENC[AES256_GCM,data:CewYFZtcXKUD5/oSM0Q32rhw+urdA0eQhdYp8EFHUXxEtL6f5NWK6IOwIlMuEv1/FjtTWlqxWekOZpmxBRzwnw==,iv:qLyVB7Nc+rDbBoO5g82/vPdykwOATHCSDLhvS+fK9PM=,tag:4NMhUvKmrRd6qrcQq3R8wA==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuTitidDZpWVJsZWxmWDFa - emdyTSszczVNbDhZSlVjeWRDMDdXQmg4QmpBCmNLZ0tob2hsRHhlTXY5VHZEY01T - MUtRdUxBM0lmeEo2OVBMdElrYVVvY1EKLS0tIHIwWllkQU9RRjF1U0F0OWdCKzlq - Y3ZxSWI3MUxQNEljNXlUSnlTdlpxazAKKjJYqcDsBzo6yOYDkgtBZntxhsHjqOyZ - yg5G8vtuOiDvPLvODzI/I9VupGyLwEkxaFc67bpg4u/1Cql7oaAADQ== - -----END AGE ENCRYPTED FILE----- - - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsdFg1cm9JTFFyUmYxb1ZP - WWtKTDE4bDBya3pWakJ0bFVkSnZvdExGMlNVCmo0N1BvNnV4MERUTjU2blUzbngv - VDduRWd2K1VlK1k2OWp6L0JhTERnOUEKLS0tIGV0aFZMTGRHNW5HUUhGRkYxNGMz - dHJwN0R1eHkyWXpiVDlRcldHT0gvV28KRiwauYvF4CCu5LeW7+kR3GSkZ+rpIbsC - JF9vV3rxbE9SdJ3nP6CyYQX7tQ6rbXtOKawq3k+z4zV/Dw7gYSNn5Q== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-16T12:28:51Z" - mac: ENC[AES256_GCM,data:nrd2czzJlBcFfwn6lzh4qqco+/XsU2J6BqvQqMtskh3mL4Xx25IAzxiCno0KlNGr6o4YsuZP5anOX9RvrDq76Us3JQ7pDi3iQGPhmg+SE9u3Rwqn1/3YConvdfPV2DNB+tuyG3UVoRqpA4d+HdcYjN9n1UKk54R6UdSm9UrA+zc=,iv:Juupyet09zUAMu7bmVxq+/Q0bXJAzR0wAyt6vKNns3w=,tag:owdUWuXrQcDdiWi+1geY9A==,type:str] - pgp: - - created_at: "2025-06-05T09:49:08Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuTitidDZpWVJsZWxmWDFa + emdyTSszczVNbDhZSlVjeWRDMDdXQmg4QmpBCmNLZ0tob2hsRHhlTXY5VHZEY01T + MUtRdUxBM0lmeEo2OVBMdElrYVVvY1EKLS0tIHIwWllkQU9RRjF1U0F0OWdCKzlq + Y3ZxSWI3MUxQNEljNXlUSnlTdlpxazAKKjJYqcDsBzo6yOYDkgtBZntxhsHjqOyZ + yg5G8vtuOiDvPLvODzI/I9VupGyLwEkxaFc67bpg4u/1Cql7oaAADQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsdFg1cm9JTFFyUmYxb1ZP + WWtKTDE4bDBya3pWakJ0bFVkSnZvdExGMlNVCmo0N1BvNnV4MERUTjU2blUzbngv + VDduRWd2K1VlK1k2OWp6L0JhTERnOUEKLS0tIGV0aFZMTGRHNW5HUUhGRkYxNGMz + dHJwN0R1eHkyWXpiVDlRcldHT0gvV28KRiwauYvF4CCu5LeW7+kR3GSkZ+rpIbsC + JF9vV3rxbE9SdJ3nP6CyYQX7tQ6rbXtOKawq3k+z4zV/Dw7gYSNn5Q== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-10-16T12:28:51Z" + mac: ENC[AES256_GCM,data:nrd2czzJlBcFfwn6lzh4qqco+/XsU2J6BqvQqMtskh3mL4Xx25IAzxiCno0KlNGr6o4YsuZP5anOX9RvrDq76Us3JQ7pDi3iQGPhmg+SE9u3Rwqn1/3YConvdfPV2DNB+tuyG3UVoRqpA4d+HdcYjN9n1UKk54R6UdSm9UrA+zc=,iv:Juupyet09zUAMu7bmVxq+/Q0bXJAzR0wAyt6vKNns3w=,tag:owdUWuXrQcDdiWi+1geY9A==,type:str] + pgp: + - created_at: "2025-06-05T09:49:08Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfAQ/8DIuNUO6tpyuG0j4Ros6MjHs1USkfY+2ntzqyugGe4OpA - cXLzXWGT7pCxE6bcd7FepG/Nln17219siP9PX1WqEl324GnKXjbAbczjnu/9ggeF - bUWBhKFwGivVXDfO8VusG0MN41tJMoDwAelaJdgnXnbAwHISJ20UzFtnTBx67ALs - 5pqHzOf7uuY7eZbl79iEiBJ8Ecj/Y3yrcANbVXQtET7X5629nTMHuizFsym9fy0p - 6elwdrJSGPlncWA/+wsec5WIxwOsrLoEz8rvFpZJo/YI4/5heiL6RmgqKODzAhFp - +PD/VoksJQ0lynzH2jBUKNte7UU5fyMAn9CEu0eY7sNRHpEKWjj/uPoWPkaV3JQ/ - Au2YN9VV0qkyqYZ/6mU1L+Ukaci3kG/hJKM9MxXZ6rVEsuOnbuHPgW9jW/xogo38 - /522CAF+NThKPWbiS/VDHyUsH+h2ubh9jGyFuesP/dNhXbc+6vkcIIBgfsb2IWt1 - Fc2fvUlX9tpJYobk3PmyR88DHv4pXPkgIIEqW6JUHmkjdH+q82sGsRtni58eWUj6 - DXn09tSpM3gu02wlqobca1qrOIKVsQJ/bHB4p6PRFoeqx6Yzfdy8h4WvT75PONGD - DGW7uLYo/ISb/SDgbclNw6vlYsI7ZFtYDTWxtCjrYXFBqRSMftgreRwhi8gU0rTS - XAFXAkIp4B0y8cfxofqJyDsZmil0gJraJpkz/Y0JA+jXlQ2jHlC03xoMZIn60RKn - XI91UY65PAyoQ0LROa/TRBFCLJarLFcCSeth4MhDq06f4spXYtCV9i+2HNBj - =bUJ6 - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.8.1 + hQIMAw+OdhfgD3wfAQ/8DIuNUO6tpyuG0j4Ros6MjHs1USkfY+2ntzqyugGe4OpA + cXLzXWGT7pCxE6bcd7FepG/Nln17219siP9PX1WqEl324GnKXjbAbczjnu/9ggeF + bUWBhKFwGivVXDfO8VusG0MN41tJMoDwAelaJdgnXnbAwHISJ20UzFtnTBx67ALs + 5pqHzOf7uuY7eZbl79iEiBJ8Ecj/Y3yrcANbVXQtET7X5629nTMHuizFsym9fy0p + 6elwdrJSGPlncWA/+wsec5WIxwOsrLoEz8rvFpZJo/YI4/5heiL6RmgqKODzAhFp + +PD/VoksJQ0lynzH2jBUKNte7UU5fyMAn9CEu0eY7sNRHpEKWjj/uPoWPkaV3JQ/ + Au2YN9VV0qkyqYZ/6mU1L+Ukaci3kG/hJKM9MxXZ6rVEsuOnbuHPgW9jW/xogo38 + /522CAF+NThKPWbiS/VDHyUsH+h2ubh9jGyFuesP/dNhXbc+6vkcIIBgfsb2IWt1 + Fc2fvUlX9tpJYobk3PmyR88DHv4pXPkgIIEqW6JUHmkjdH+q82sGsRtni58eWUj6 + DXn09tSpM3gu02wlqobca1qrOIKVsQJ/bHB4p6PRFoeqx6Yzfdy8h4WvT75PONGD + DGW7uLYo/ISb/SDgbclNw6vlYsI7ZFtYDTWxtCjrYXFBqRSMftgreRwhi8gU0rTS + XAFXAkIp4B0y8cfxofqJyDsZmil0gJraJpkz/Y0JA+jXlQ2jHlC03xoMZIn60RKn + XI91UY65PAyoQ0LROa/TRBFCLJarLFcCSeth4MhDq06f4spXYtCV9i+2HNBj + =bUJ6 + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.8.1 diff --git a/nix/os/devices/elias-e525/user.nix b/nix/os/devices/elias-e525/user.nix index 0a46155..3e154da 100644 --- a/nix/os/devices/elias-e525/user.nix +++ b/nix/os/devices/elias-e525/user.nix @@ -1,30 +1,36 @@ -{ config, pkgs, ... }: +{ config, lib, ... }: let keys = import ../../../variables/keys.nix; - inherit (pkgs.callPackage ../../lib/default.nix { }) mkUser; + inherit (import ../../lib/default.nix { inherit lib config; }) mkUser deepMergeAttrsets; in -{ - sops.secrets.sharedUsers-elias = { - sopsFile = ../../../../secrets/shared-users.yaml; - neededForUsers = true; - format = "yaml"; - }; +deepMergeAttrsets [ - sops.secrets.sharedUsers-justyna = { - sopsFile = ../../../../secrets/shared-users.yaml; - neededForUsers = true; - format = "yaml"; - }; + { + sops.secrets.sharedUsers-elias = { + sopsFile = ../../../../secrets/shared-users.yaml; + neededForUsers = true; + format = "yaml"; + }; - users.extraUsers.elias = mkUser { + sops.secrets.sharedUsers-justyna = { + sopsFile = ../../../../secrets/shared-users.yaml; + neededForUsers = true; + format = "yaml"; + }; + } + + (mkUser { + username = "elias"; uid = 1001; openssh.authorizedKeys.keys = keys.users.steveej.openssh; hashedPasswordFile = config.sops.secrets.sharedUsers-elias.path; - }; + }) - users.extraUsers.justyna = mkUser { + (mkUser { + username = "justyna"; uid = 1002; openssh.authorizedKeys.keys = keys.users.steveej.openssh; hashedPasswordFile = config.sops.secrets.sharedUsers-justyna.path; - }; -} + }) + +] diff --git a/nix/os/devices/justyna-p300/boot.nix b/nix/os/devices/justyna-p300/boot.nix deleted file mode 100644 index 9d6bbe7..0000000 --- a/nix/os/devices/justyna-p300/boot.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, ... }: -{ - boot.loader.grub.efiInstallAsRemovable = lib.mkForce false; - boot.loader.efi.canTouchEfiVariables = lib.mkForce false; - boot.loader.grub.efiSupport = lib.mkForce false; - - boot.loader.grub.version = 2; - boot.loader.grub.device = "/dev/sda"; - - # boot.initrd.availableKernelModules = stage1Modules; - boot.extraModprobeConfig = ""; -} diff --git a/nix/os/devices/justyna-p300/configuration.nix b/nix/os/devices/justyna-p300/configuration.nix deleted file mode 100644 index e636106..0000000 --- a/nix/os/devices/justyna-p300/configuration.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: -{ - imports = [ - ../../profiles/common/configuration.nix - ../../profiles/graphical/configuration.nix - ../../profiles/graphical-gnome-xorg.nix - - ./system.nix - ./hw.nix - ./pkg.nix - ./user.nix - ./boot.nix - ]; -} diff --git a/nix/os/devices/justyna-p300/default.nix b/nix/os/devices/justyna-p300/default.nix deleted file mode 100644 index 427ce7e..0000000 --- a/nix/os/devices/justyna-p300/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - nodeName, - repoFlake, - nodeFlake, - ... -}: -let - system = "x86_64-linux"; -in -{ - meta.nodeSpecialArgs.${nodeName} = { - inherit repoFlake nodeName nodeFlake; - packages' = repoFlake.packages.${system}; - }; - - meta.nodeNixpkgs.${nodeName} = import nodeFlake.inputs.nixpkgs.outPath { inherit system; }; - - ${nodeName} = { - deployment.targetHost = nodeName; - deployment.replaceUnknownProfiles = false; - # deployment.allowLocalDeployment = true; - - imports = [ - nodeFlake.inputs.home-manager.nixosModules.home-manager - - ./configuration.nix - ]; - }; -} diff --git a/nix/os/devices/justyna-p300/flake.lock b/nix/os/devices/justyna-p300/flake.lock deleted file mode 100644 index 25d4f90..0000000 --- a/nix/os/devices/justyna-p300/flake.lock +++ /dev/null @@ -1,70 +0,0 @@ -{ - "nodes": { - "disko": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1689977778, - "narHash": "sha256-lvz4hZO/EP6xLJQIrEdHdYWi/Uz49HCAownL5HZUy1M=", - "owner": "nix-community", - "repo": "disko", - "rev": "7b186e0f812a7c54a1fa86b8f7c0f01afecc69c2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1687871164, - "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.05", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1689885880, - "narHash": "sha256-2ikAcvHKkKh8J/eUrwMA+wy1poscC+oL1RkN1V3RmT8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fa793b06f56896b7d1909e4b69977c7bf842b2f0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "disko": "disko", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nix/os/devices/justyna-p300/flake.nix b/nix/os/devices/justyna-p300/flake.nix deleted file mode 100644 index 9b8b8ed..0000000 --- a/nix/os/devices/justyna-p300/flake.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; - - inputs.home-manager = { - url = "github:nix-community/home-manager/release-23.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - inputs.disko.url = "github:nix-community/disko"; - inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; - - outputs = _: { }; -} diff --git a/nix/os/devices/justyna-p300/hw.nix b/nix/os/devices/justyna-p300/hw.nix deleted file mode 100644 index b68e082..0000000 --- a/nix/os/devices/justyna-p300/hw.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ nodeFlake, ... }: -{ - imports = [ nodeFlake.inputs.disko.nixosModules.disko ]; - - disko.devices.disk.sda = { - device = "/dev/sda"; - type = "disk"; - content = { - type = "table"; - format = "gpt"; - partitions = [ - { - name = "boot"; - start = "0"; - end = "1M"; - part-type = "primary"; - flags = [ "bios_grub" ]; - } - { - name = "root"; - start = "1M"; - end = "100%"; - part-type = "primary"; - bootable = true; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; # Override existing partition - subvolumes = { - # Subvolume name is different from mountpoint - "/rootfs" = { - mountpoint = "/"; - }; - "/nix" = { - mountOptions = [ "noatime" ]; - }; - }; - }; - } - ]; - }; - }; -} diff --git a/nix/os/devices/justyna-p300/pkg.nix b/nix/os/devices/justyna-p300/pkg.nix deleted file mode 100644 index d23cfb0..0000000 --- a/nix/os/devices/justyna-p300/pkg.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - pkgs, - lib, - packages', - ... -}: -let - homeEnv = keyboard: { - imports = [ - ../../../home-manager/profiles/common.nix - - ../../../home-manager/configuration/graphical-gnome3.nix - - ../../../home-manager/programs/firefox.nix - ../../../home-manager/programs/libreoffice.nix - ../../../home-manager/programs/neovim.nix - ]; - - home.keyboard = keyboard; - - home.packages = with pkgs; [ - dia - - rustdesk - ]; - }; -in -{ - services.gnome = builtins.mapAttrs (_attr: value: lib.mkForce value) { - gnome-remote-desktop.enable = true; - }; - - services.printing.drivers = lib.mkForce ( - with packages'; - [ - dcpj4110dwDriver - dcpj4110dwCupswrapper - ] - ); - - services.printing.extraConf = '' - LogLevel debug - ''; - - home-manager.users.steveej = homeEnv { - layout = "en"; - options = [ "nodeadkey" ]; - variant = "altgr-intl"; - }; - - home-manager.users.elias = homeEnv { - layout = "de"; - options = [ ]; - variant = ""; - }; - - home-manager.users.justyna = - lib.attrsets.recursiveUpdate - (homeEnv { - layout = "de"; - options = [ ]; - variant = ""; - }) - { - services.syncthing.enable = true; - services.syncthing.tray = true; - - home.packages = with pkgs; [ session-desktop ]; - }; - - system.stateVersion = "21.11"; -} diff --git a/nix/os/devices/justyna-p300/system.nix b/nix/os/devices/justyna-p300/system.nix deleted file mode 100644 index 82a7b02..0000000 --- a/nix/os/devices/justyna-p300/system.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ pkgs, lib, ... }: -let - passwords = import ../../../variables/passwords.crypt.nix; -in -{ - networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [ - # iperf3 - 5201 - ]; - - networking.firewall.logRefusedConnections = false; - networking.usePredictableInterfaceNames = false; - - services.fprintd.enable = true; - security.pam.services = { - login.fprintAuth = true; - sudo.fprintAuth = true; - }; - - time.timeZone = lib.mkForce passwords.timeZone.justyna; - - services = { - xserver = { - layout = lib.mkForce "de"; - xkbVariant = lib.mkForce ""; - xkbOptions = lib.mkForce ""; - displayManager.autoLogin.enable = true; - displayManager.autoLogin.user = lib.mkForce "justyna"; - displayManager.gdm.enable = lib.mkForce true; - displayManager.lightdm.enable = lib.mkForce false; - desktopManager.gnome.enable = true; - }; - - # dbus.packages = [ pkgs.gnome3.dconf ]; - # udev.packages = [ pkgs.gnome3.gnome-settings-daemon ]; - }; - - security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]; - - services.xserver.videoDrivers = [ "modesetting" ]; - - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - - nix.gc = { - automatic = true; - }; -} diff --git a/nix/os/devices/justyna-p300/user.nix b/nix/os/devices/justyna-p300/user.nix deleted file mode 100644 index c4690cf..0000000 --- a/nix/os/devices/justyna-p300/user.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, pkgs, ... }: -let - keys = import ../../../variables/keys.nix; - inherit (pkgs.callPackage ../../lib/default.nix { }) mkUser; -in -{ - sops.secrets.sharedUsers-elias = { - sopsFile = ../../../../secrets/shared-users.yaml; - neededForUsers = true; - format = "yaml"; - }; - - sops.secrets.sharedUsers-justyna = { - sopsFile = ../../../../secrets/shared-users.yaml; - neededForUsers = true; - format = "yaml"; - }; - - users.extraUsers.elias = mkUser { - uid = 1001; - openssh.authorizedKeys.keys = keys.users.steveej.openssh; - passwordFile = config.sops.secrets.sharedUsers-elias.path; - }; - - users.extraUsers.justyna = mkUser { - uid = 1002; - openssh.authorizedKeys.keys = keys.users.steveej.openssh; - passwordFile = config.sops.secrets.sharedUsers-justyna.path; - }; -} diff --git a/nix/os/devices/steveej-pa600/boot.nix b/nix/os/devices/steveej-pa600/boot.nix deleted file mode 100644 index 639698f..0000000 --- a/nix/os/devices/steveej-pa600/boot.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: -{ - boot.loader.grub.efiInstallAsRemovable = lib.mkForce true; - boot.loader.efi.canTouchEfiVariables = lib.mkForce false; -} diff --git a/nix/os/devices/steveej-pa600/configuration.nix b/nix/os/devices/steveej-pa600/configuration.nix deleted file mode 100644 index 68ad190..0000000 --- a/nix/os/devices/steveej-pa600/configuration.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: -{ - imports = [ - ../../profiles/common/configuration.nix - ../../profiles/graphical/configuration.nix - ../../modules/opinionatedDisk.nix - - ./system.nix - ./hw.nix - ./pkg.nix - ./user.nix - ]; -} diff --git a/nix/os/devices/steveej-pa600/hw.nix b/nix/os/devices/steveej-pa600/hw.nix deleted file mode 100644 index 651a6e2..0000000 --- a/nix/os/devices/steveej-pa600/hw.nix +++ /dev/null @@ -1,23 +0,0 @@ -_: -let - stage1Modules = [ - "aesni_intel" - "kvm-intel" - "aes_x86_64" - - "xhci_pci" - "hxci_hcd" - ]; -in -{ - # TASK: new device - hardware.opinionatedDisk = { - enable = true; - encrypted = true; - diskId = "ata-TOSHIBA_MK1652GSX_Y8B9CL6XT"; - }; - - # boot.initrd.availableKernelModules = stage1Modules; - boot.initrd.kernelModules = stage1Modules; - boot.extraModprobeConfig = ""; -} diff --git a/nix/os/devices/steveej-pa600/pkg.nix b/nix/os/devices/steveej-pa600/pkg.nix deleted file mode 100644 index 360c17b..0000000 --- a/nix/os/devices/steveej-pa600/pkg.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -{ - nixpkgs.config.packageOverrides = - pkgs: with pkgs; { - inherit ((import ../../../default.nix { versionsPath = ./versions.nix; })) nixPath; - }; - home-manager.users.steveej = import ../../../home-manager/configuration/graphical-fullblown.nix { - inherit pkgs; - }; - system.stateVersion = "20.09"; -} diff --git a/nix/os/devices/steveej-pa600/system.nix b/nix/os/devices/steveej-pa600/system.nix deleted file mode 100644 index 2a4551a..0000000 --- a/nix/os/devices/steveej-pa600/system.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ pkgs, lib, ... }: -{ - # TASK: new device - networking.hostName = "steveej-pa600"; # Define your hostname. - - networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [ - # iperf3 - 5201 - ]; - - networking.firewall.logRefusedConnections = false; - networking.usePredictableInterfaceNames = false; - - services.printing = { - enable = true; - drivers = with pkgs; [ - hplip - mfcl3770cdw.driver - mfcl3770cdw.cupswrapper - ]; - }; - - services.fprintd.enable = true; - security.pam.services = { - login.fprintAuth = true; - sudo.fprintAuth = true; - }; - - security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]; - - services.xserver.videoDrivers = [ "modesetting" ]; - services.xserver.serverFlagsSection = '' - Option "BlankTime" "0" - Option "StandbyTime" "0" - Option "SuspendTime" "0" - Option "OffTime" "0" - ''; - - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - - hardware.ledger.enable = true; -} diff --git a/nix/os/devices/steveej-pa600/user.nix b/nix/os/devices/steveej-pa600/user.nix deleted file mode 100644 index bb94098..0000000 --- a/nix/os/devices/steveej-pa600/user.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -let - keys = import ../../../variables/keys.nix; - inherit (import ../../lib/default.nix { inherit (pkgs) lib; }) mkUser; -in -{ - users.extraUsers.steveej2 = mkUser { - uid = 1001; - openssh.authorizedKeys.keys = keys.users.steveej.openssh; - }; -} diff --git a/nix/os/devices/steveej-pa600/versions.nix b/nix/os/devices/steveej-pa600/versions.nix deleted file mode 100644 index e7d4567..0000000 --- a/nix/os/devices/steveej-pa600/versions.nix +++ /dev/null @@ -1,29 +0,0 @@ -let - nixpkgs = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-20.09"; - rev = "e065200fc90175a8f6e50e76ef10a48786126e1c"; - }; -in -{ - inherit nixpkgs; - nixos = nixpkgs // { - suffix = "/nixos"; - }; - "channels-nixos-stable" = nixpkgs; - "channels-nixos-unstable" = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-unstable"; - rev = "2f47650c2f28d87f86ab807b8a339c684d91ec56"; - }; - "nixpkgs-master" = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "master"; - rev = "cb7c39605051c7b268f8e0c5c47818a06b5d88c5"; - }; - "home-manager-module" = { - url = "https://github.com/nix-community/home-manager"; - ref = "release-20.09"; - rev = "22f6736e628958f05222ddaadd7df7818fe8f59d"; - }; -} diff --git a/nix/os/devices/steveej-pa600/versions.tmpl.nix b/nix/os/devices/steveej-pa600/versions.tmpl.nix deleted file mode 100644 index 08f1a43..0000000 --- a/nix/os/devices/steveej-pa600/versions.tmpl.nix +++ /dev/null @@ -1,37 +0,0 @@ -let - nixpkgs = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-20.09"; - rev = '' - <% git ls-remote https://github.com/nixos/nixpkgs nixos-20.09 | awk '{ print $1 }' | tr -d ' - ' -%>''; - }; -in -{ - inherit nixpkgs; - nixos = nixpkgs // { - suffix = "/nixos"; - }; - "channels-nixos-stable" = nixpkgs; - "channels-nixos-unstable" = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-unstable"; - rev = '' - <% git ls-remote https://github.com/nixos/nixpkgs nixos-unstable | awk '{ print $1 }' | tr -d ' - ' -%>''; - }; - "nixpkgs-master" = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "master"; - rev = '' - <% git ls-remote https://github.com/NixOS/nixpkgs.git master | head -n1 | awk '{ print $1 }' | tr -d ' - ' -%>''; - }; - "home-manager-module" = { - url = "https://github.com/nix-community/home-manager"; - ref = "release-20.09"; - rev = '' - <% git ls-remote https://github.com/nix-community/home-manager.git release-20.09 | awk '{ print $1 }' | tr -d ' - ' -%>''; - }; -} diff --git a/nix/os/lib/default.nix b/nix/os/lib/default.nix index b4f4dcc..206c367 100644 --- a/nix/os/lib/default.nix +++ b/nix/os/lib/default.nix @@ -1,43 +1,52 @@ { lib, config }: let keys = import ../../variables/keys.nix; + deepMergeAttrsets = + listOfAttrsets: lib.foldl' (acc: cur: lib.recursiveUpdate acc cur) { } listOfAttrsets; in { - mkUser = - args: - lib.mkMerge [ - { - isNormalUser = true; - extraGroups = [ - "docker" - "podman" - "wheel" - "libvirtd" - "networkmanager" - "vboxusers" - "users" - "input" - "audio" - "video" - "cdrom" - "adbusers" - "dialout" - "cdrom" - "fuse" - "adbusers" - "scanner" - "lp" - "kvm" - ]; - openssh.authorizedKeys.keys = keys.users.steveej.openssh; + inherit deepMergeAttrsets; - # TODO: investigate why this secret cannot be found - # openssh.authorizedKeys.keyFiles = [ - # config.sops.secrets.sharedSshKeys-steveej.path - # ]; - } - args - ]; + mkUser = + args@{ username, ... }: + { + users.users.${username} = deepMergeAttrsets [ + { + isNormalUser = true; + extraGroups = [ + "docker" + "podman" + "wheel" + "libvirtd" + "networkmanager" + "vboxusers" + "users" + "input" + "audio" + "video" + "cdrom" + "adbusers" + "dialout" + "cdrom" + "fuse" + "adbusers" + "scanner" + "lp" + "kvm" + ]; + openssh.authorizedKeys.keys = keys.users.steveej.openssh; + + # TODO: investigate why this secret cannot be found + # openssh.authorizedKeys.keyFiles = [ + # config.sops.secrets.sharedSshKeys-steveej.path + # ]; + } + + (builtins.removeAttrs args [ "username" ]) + ]; + + home-manager.users.${username}.home.username = username; + }; disk = rec { # TODO: verify the GPT PARTLABEL cap at 36 chars diff --git a/nix/os/profiles/common/user.nix b/nix/os/profiles/common/user.nix index 6c799c9..d5f64fe 100644 --- a/nix/os/profiles/common/user.nix +++ b/nix/os/profiles/common/user.nix @@ -1,6 +1,5 @@ { config, - pkgs, lib, ... }: @@ -8,8 +7,7 @@ let keys = import ../../../variables/keys.nix; inherit (import ../../lib/default.nix { - inherit (pkgs) lib; - inherit config; + inherit lib config; }) mkUser ; @@ -37,13 +35,13 @@ in # TODO: test if this works installPassword = lib.mkOption { - default = ""; - type = types.str; + default = null; + type = types.nullOr types.str; }; }; config = lib.mkIf cfg.enable ( lib.mkMerge [ - (lib.mkIf (cfg.installPassword == "") { + (lib.mkIf (cfg.installPassword == null) { sops.secrets.sharedUsers-root = { sopsFile = ../../../../secrets/shared-users.yaml; neededForUsers = true; @@ -64,7 +62,7 @@ in }) { - users.mutableUsers = cfg.installPassword != ""; + users.mutableUsers = cfg.installPassword != null; users.users.root = lib.mkMerge [ { openssh.authorizedKeys.keys = keys.users.steveej.openssh; } @@ -74,20 +72,18 @@ in (lib.mkIf (cfg.installPassword == "") { hashedPasswordFile = cfg.rootPasswordFile; }) ]; - users.users.steveej = lib.mkIf cfg.enableNonRoot ( - mkUser ( - lib.mkMerge [ - { uid = 1000; } - - (lib.mkIf (cfg.installPassword != "") { password = cfg.installPassword; }) - - (lib.mkIf (cfg.installPassword == "") { - hashedPasswordFile = config.sops.secrets.sharedUsers-steveej.path; - }) - ] - ) - ); } + + (lib.mkIf cfg.enableNonRoot (mkUser { + username = "steveej"; + + uid = 1000; + + password = cfg.installPassword; + hashedPasswordFile = lib.mkIf ( + cfg.installPassword == null + ) config.sops.secrets.sharedUsers-steveej.path; + })) ] ); } diff --git a/nix/os/profiles/graphical-gnome-xorg.nix b/nix/os/profiles/graphical-gnome-xorg.nix index ba50a5b..bc88473 100644 --- a/nix/os/profiles/graphical-gnome-xorg.nix +++ b/nix/os/profiles/graphical-gnome-xorg.nix @@ -66,8 +66,8 @@ programs.seahorse.enable = true; programs.dconf.enable = true; - environment.gnome.excludePackages = - (with pkgs; [ + environment.gnome.excludePackages = with pkgs; + [ orca gnome-photos gnome-tour @@ -81,7 +81,7 @@ evince # document viewer gnome-characters totem # video player - ]); + ]; services.pipewire = { audio.enable = true; diff --git a/nix/os/snippets/nix-settings.nix b/nix/os/snippets/nix-settings.nix index 6fb6347..99d26d4 100644 --- a/nix/os/snippets/nix-settings.nix +++ b/nix/os/snippets/nix-settings.nix @@ -4,9 +4,6 @@ lib, ... }: -let - pkgsUnstable = import nodeFlake.inputs.nixpkgs-unstable { inherit (pkgs) system config; }; -in { nix.daemonCPUSchedPolicy = "idle"; nix.daemonIOSchedClass = "idle"; diff --git a/secrets/holochain-infra/nomad.yaml b/secrets/holochain-infra/nomad.yaml index abe5526..c2a5987 100644 --- a/secrets/holochain-infra/nomad.yaml +++ b/secrets/holochain-infra/nomad.yaml @@ -4,38 +4,38 @@ holochain-nomad-cli-key: ENC[AES256_GCM,data:Kl7EJI1V5HGeE9nogY5rujwe8MQYA6tIc3b holochain-global-nomad-client-cert: ENC[AES256_GCM,data:eiPqZA5kCi5HPa5AlCTKmOD9r0uU5DlSClNTvg6asWybYZcipiQ6Md+cXxMl3VnemwBbxS8KxjuPg6k63SA+gypEW+XZP7VtCdHl4d65MOfIT6CpzTDVi0FUj58z2v7W6XfgAu33uDxTy+e4+SX69duUmmKicwe+CLK2ckfR3U32s39GKBDKYBZ8DTsAJmex45hf17rwcKsaMM142zgBcn2wbuNF46US8iWf4pKXJ4827pgD1HZ2Ry/IgFcRdSXGdsuAU9FcsuwTNfVftOtf/XGxrIJsvCoC7t/SalQSH4eg5s1N9N68vruKlV6AfVNIiQwfwdJ9ldeTOT3of/Fmu0ftiLaq5ZZ97zxd9Bean49EmJw5VEf63+cWKPonLxls1CV02dy1ua9zrjyX37Jz4dQiS02lZF/ljfcaGL+5TOQaX0oEIAA5tl7uaR/UIV7lqfFMZDUtQMHkYAkPkV/VF8wgyE8mD88KqKU+AdsL2yEyKo7VBAe/pYtGWsbyYhemmmpfPnUkt3wz+YQc7zs+MzaI/Z36BIGtY6ObNUfg++4dYXdoMrHufeRbihsLJ69m/bjF0qYtGCjrEPqTwF7WuWSz28to/ZOVrUKZgH8MOMoKKedzZ+kbzs9+hPDawCHs9VtiFo4d/roHBKMquDZVc6+VYtCjj8xjG8TJoJVWlKQogKa3zoWA0ZPwywwWb2V2ehocOk7MRxFZcek4gjvIJ7Ud6aom7dq3HIJJJYxwdVh7pJO9tJhW1T5R/n9g8zrANzXUvMyt55zUZytjF3pPFfaE7en+9LCf4h7AUocI1gOToUC9hlv/uhTOLCYU5S1xAtrlvvX4QSkmTyBTHe9XeOIZbI7LjzINRuO/XFKN/4dqz5/q195OprOBxg2fv1ETPJUwSN66PFYGh6VqhZZf/NokW1qYyrC0kW8lP/EZN6YGhQTyDRrSn3Y+U3nJuVEcydAKTSwzafR4pO4V6U02/CnBH8IqMsNMIhPPPwC1Wntqne3Rabdbx6ZWOxHQuv3cEPEronKGeeU4ADLBPSWnvGcVZuwgxzVpvVwCWtF59Aiew4pmWd8sqLnTOKrxY9BsV9nwRv0ZGE8l0NwiRGw2YIGWaXup0kwl6UVkSOgSuKqvIff09t3XXRINcwIh13jSAipsDpDjqT59qE0Uoc6/lV63eQKkqYs0wFTwc/XXZ2RJusNX+PDDCRW8xykmu4HC+rX7EMeF53xfDEi4wJGoSCySn3idt33A/QotnjDOl385/lkXwgVz4RjCiiCY016fje+78j7RBH3q,iv:nSXO+1ALy6Ie5aNIEm1ZZgZwOdJLrHjO+BwKVbbZQ7c=,tag:n4V165c86IQ3QHzYb1ThJA==,type:str] holochain-global-client-nomad-key: ENC[AES256_GCM,data:9w+1CYOXgm+xvg9iER+cLJBlKLyYmanr93tZ8xTl63ZIKho6DJLqGPCYdjlG4sHWyQUM6/Dpaa490yC4CToLX5MuUnSvqiaSgugcGqPa1DhlRYVsa8j5rdp90EDMoarN7xKe0ShIRW2GTT9S5EEyF2qdZUAFybpDPX2laZZ44UBz1QvlCp7gzs0duO4b95WPTHmlhfaw0BVF7FhFqkAHtH6qg24qEtwB3I4NmW5UsTKR+tbUCEyQcADQr1CrXhIHkQ8yZ52rc42H6gRQXoVrJomJgtiXf28ARY5K1oZMmICLDw==,iv:FSiRHgbqpKEYINVBLYp1A9YgroLT07GMDFqT/k8Vyqs=,tag:XX7oQhllDmrRLCEiMMYsfA==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtYStCU2FnN2oxWWU4aWJR - N1NXQW5oRlZCL3BPVDN0d01sTk8wUy9FNTM0CmEvdTJsZDEvWkhvcFdBSHNWMS9O - WDBYQjhzSE9IeTAzczR1eFlnVXUwRU0KLS0tIGtpTG45Qmh1cHc0ZUpGTUQ5NTF4 - OVJwWGR2TkR1VWtHeVp6Wlk4S3I4Q3cKAeQEBdqh8yeD1jSClUaofdqEPz7RNEaP - /Sk5FUTmjC07s2fyORf+03SK43+HbJRNASyC8EtCrqAMcwKFlti1eg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-12T09:51:29Z" - mac: ENC[AES256_GCM,data:Eq/hdaWf9+CG2jLQsL2Sw+IHy0vef7cC0IR5xL3jooYbmilRYS2Lj+lRckVcLKTRHjLBlJmnY20wbL/iNwlyTsY3MkCTEMAg1aY2GVPq3/gL0Gl0/Em4pktfVLZGVTZLt6mKzAJMWM9RdTapW5sRlywZ4/fa1YQwoQQ3tFVWm4U=,iv:+Oy+dBT0B5k5eItscLlXrRzbPO1u8eQNBwoDLnZC06I=,tag:hVwJwd6m6oCOlQ0jC8H+Ew==,type:str] - pgp: - - created_at: "2025-06-05T09:49:08Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtYStCU2FnN2oxWWU4aWJR + N1NXQW5oRlZCL3BPVDN0d01sTk8wUy9FNTM0CmEvdTJsZDEvWkhvcFdBSHNWMS9O + WDBYQjhzSE9IeTAzczR1eFlnVXUwRU0KLS0tIGtpTG45Qmh1cHc0ZUpGTUQ5NTF4 + OVJwWGR2TkR1VWtHeVp6Wlk4S3I4Q3cKAeQEBdqh8yeD1jSClUaofdqEPz7RNEaP + /Sk5FUTmjC07s2fyORf+03SK43+HbJRNASyC8EtCrqAMcwKFlti1eg== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-07-12T09:51:29Z" + mac: ENC[AES256_GCM,data:Eq/hdaWf9+CG2jLQsL2Sw+IHy0vef7cC0IR5xL3jooYbmilRYS2Lj+lRckVcLKTRHjLBlJmnY20wbL/iNwlyTsY3MkCTEMAg1aY2GVPq3/gL0Gl0/Em4pktfVLZGVTZLt6mKzAJMWM9RdTapW5sRlywZ4/fa1YQwoQQ3tFVWm4U=,iv:+Oy+dBT0B5k5eItscLlXrRzbPO1u8eQNBwoDLnZC06I=,tag:hVwJwd6m6oCOlQ0jC8H+Ew==,type:str] + pgp: + - created_at: "2025-06-05T09:49:08Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfAQ/7BTbxsFCBhKM6oM1JkRNgR3gHCabXrparjyC3ayfFkFQr - TGWW1S/RkTyAbzMkG6VJmvbd28AqzPUWMBxOHtJB8e/aLJIFchL0pAuSK3w51iGN - Ss20IDUkX8wyljdFSJYhiGF6CNRZGkMAvzghDW0zVHzJlaXlZvAL1sqhOHhykugZ - ++/RZsjnjymVL/chXr/z/VI/6Ovmjjv9mcSG5HvziJfdihZS3pChTbOPCRZhjPzT - Or/AzDBk191cF+PLq7qOSO8dNMoR/mW8gYLLpfi/N3rURpdZWPKsH11hFGo4/Iwx - pNVHER60Q98i8VYXwdvxprOc0TtknPkFRIWA1tvPuMY44992ok7eJITaPpUufB66 - POBoOQzkvjZZIY9sbJK//e3boqvGaUfs0ia+kKSovvGz9d1EefyNEmZfR9kA/Lyt - eGEBlpxwVVA+qGsC/MaCfYKsKRtzUkPshb/vPNV6pfBQ6eTuUdQKSDSIv+PTXoVt - wkIG8HJB3z/L1IlaE4y5o/8anHa/Z3cdI4wzMNoJKCTt49SzAWPONxL/KegWwLYl - KD7RVam47l2Ju4pV8IsYMTjSc2SYyzDxzAJSYNBzYT7Z+U1v08HMJLjH4oDR6mYH - d6kxkSQ77wXAwP9UcMOHbVbTbT+MKqv+UrvWSDMDdZrrymRNfMjlC65KItDBbCXS - XgHkBg6IcSO3VtmH79ceOwkhfNCXwF0rkQzfAn29l/+1MZu22CAxuiW4t0zxN83o - pv3FRQwrbuVQUZNFyy3Iq00mThs3J/Ze0BltrPBSG9mHTE8kHn6sg2uudQr69tU= - =1Ywm - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.7.3 + hQIMAw+OdhfgD3wfAQ/7BTbxsFCBhKM6oM1JkRNgR3gHCabXrparjyC3ayfFkFQr + TGWW1S/RkTyAbzMkG6VJmvbd28AqzPUWMBxOHtJB8e/aLJIFchL0pAuSK3w51iGN + Ss20IDUkX8wyljdFSJYhiGF6CNRZGkMAvzghDW0zVHzJlaXlZvAL1sqhOHhykugZ + ++/RZsjnjymVL/chXr/z/VI/6Ovmjjv9mcSG5HvziJfdihZS3pChTbOPCRZhjPzT + Or/AzDBk191cF+PLq7qOSO8dNMoR/mW8gYLLpfi/N3rURpdZWPKsH11hFGo4/Iwx + pNVHER60Q98i8VYXwdvxprOc0TtknPkFRIWA1tvPuMY44992ok7eJITaPpUufB66 + POBoOQzkvjZZIY9sbJK//e3boqvGaUfs0ia+kKSovvGz9d1EefyNEmZfR9kA/Lyt + eGEBlpxwVVA+qGsC/MaCfYKsKRtzUkPshb/vPNV6pfBQ6eTuUdQKSDSIv+PTXoVt + wkIG8HJB3z/L1IlaE4y5o/8anHa/Z3cdI4wzMNoJKCTt49SzAWPONxL/KegWwLYl + KD7RVam47l2Ju4pV8IsYMTjSc2SYyzDxzAJSYNBzYT7Z+U1v08HMJLjH4oDR6mYH + d6kxkSQ77wXAwP9UcMOHbVbTbT+MKqv+UrvWSDMDdZrrymRNfMjlC65KItDBbCXS + XgHkBg6IcSO3VtmH79ceOwkhfNCXwF0rkQzfAn29l/+1MZu22CAxuiW4t0zxN83o + pv3FRQwrbuVQUZNFyy3Iq00mThs3J/Ze0BltrPBSG9mHTE8kHn6sg2uudQr69tU= + =1Ywm + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/secrets/hstk0/secrets.yaml b/secrets/hstk0/secrets.yaml index 52e3c56..c5aa7b5 100644 --- a/secrets/hstk0/secrets.yaml +++ b/secrets/hstk0/secrets.yaml @@ -1,46 +1,46 @@ tf-eval-minio-root: ENC[AES256_GCM,data:83SacYkxLHU2fHbHNiLG9owDgakOY/nrZBnlDgltRlQDTSW9HkKejVrKtTaixjbxKCgsy9sgJBv8LZtqwthgZ6MI942YU2pJHL8le1wBsuY=,iv:uXbOw/9ljYjWCdafhupVJA7tIvcL801xszI8lrQnQIA=,tag:yolnZdYD1KZJFnH2gs8zzw==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5MFFBNWJkS3NpWlkrQXZu - dlJHNnlRUXhQOTNEazd6ZDh3dEZ0REtMQUc0CnVhcElHR1JMaG4zWjh0WER5c2tk - OXhuVU5lSTJRdmdlM3p1UStyVUtqdDAKLS0tIDdLT0RubGZPT1F1NWg1SnoxV05z - N2tyUlJwcmdHL2NldmFzR3VWcE5yRkkKzORrAR7iCVY0ifCE/guH5/qTPujU4MAe - tfHCW4j8gdbTDUlwN8fTQC8D2ILp/4ikaGcg76vTDekb8mHVM4nNpw== - -----END AGE ENCRYPTED FILE----- - - recipient: age10xwq7a4y256yhv02j0u80te0vt4krgfjc68r0uw07t96z7ggmpwqtv38a0 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCc1VvYi9kaDA1d2NlcGZJ - RjMvSFZ0b2VCSDc3aXJXY0pTY1VGQnlUZ0IwCit2bVBhejl2VFFBRmUxZVVReXBT - Um1kek1xWTZoMkd0blJ1MnFGdndqMDAKLS0tIDY2QW5uaXl4dHZUb0txZk1lRjVt - RE41R3JJOFpudGtNUDA4bnlEekt3NEEKOrnajH190HxAa+VuAScwWM4BOZvP2Amz - OYH7v+CXvp+74NqX/CT8/2EI1mGayrmEhpl5/iiUilBy0AUjwHQ6xA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-03-08T16:59:30Z" - mac: ENC[AES256_GCM,data:VIA7UaP1c2kli+BuppPl4LH1jiU9qAfqvfejZ0Mv0E8CxQ0eLAMJVkZIzSygLCx00cPbqAkESrniCeLYagyEP4tS/cff2ngplzig4uFbZzniYMXcYF9VIAyBhGgQGEZlZPgh4r4wmBdUFfhc0CPzmYt0obJ1LXElGdAoeM4OcPs=,iv:KPFJX2qJaxMwvrw/R8xrw5Fk5FRyTQdxq7DnszToy88=,tag:/H7iPZlWk2qMrWbwZdeF5w==,type:str] - pgp: - - created_at: "2025-06-05T09:49:12Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5MFFBNWJkS3NpWlkrQXZu + dlJHNnlRUXhQOTNEazd6ZDh3dEZ0REtMQUc0CnVhcElHR1JMaG4zWjh0WER5c2tk + OXhuVU5lSTJRdmdlM3p1UStyVUtqdDAKLS0tIDdLT0RubGZPT1F1NWg1SnoxV05z + N2tyUlJwcmdHL2NldmFzR3VWcE5yRkkKzORrAR7iCVY0ifCE/guH5/qTPujU4MAe + tfHCW4j8gdbTDUlwN8fTQC8D2ILp/4ikaGcg76vTDekb8mHVM4nNpw== + -----END AGE ENCRYPTED FILE----- + - recipient: age10xwq7a4y256yhv02j0u80te0vt4krgfjc68r0uw07t96z7ggmpwqtv38a0 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCc1VvYi9kaDA1d2NlcGZJ + RjMvSFZ0b2VCSDc3aXJXY0pTY1VGQnlUZ0IwCit2bVBhejl2VFFBRmUxZVVReXBT + Um1kek1xWTZoMkd0blJ1MnFGdndqMDAKLS0tIDY2QW5uaXl4dHZUb0txZk1lRjVt + RE41R3JJOFpudGtNUDA4bnlEekt3NEEKOrnajH190HxAa+VuAScwWM4BOZvP2Amz + OYH7v+CXvp+74NqX/CT8/2EI1mGayrmEhpl5/iiUilBy0AUjwHQ6xA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-03-08T16:59:30Z" + mac: ENC[AES256_GCM,data:VIA7UaP1c2kli+BuppPl4LH1jiU9qAfqvfejZ0Mv0E8CxQ0eLAMJVkZIzSygLCx00cPbqAkESrniCeLYagyEP4tS/cff2ngplzig4uFbZzniYMXcYF9VIAyBhGgQGEZlZPgh4r4wmBdUFfhc0CPzmYt0obJ1LXElGdAoeM4OcPs=,iv:KPFJX2qJaxMwvrw/R8xrw5Fk5FRyTQdxq7DnszToy88=,tag:/H7iPZlWk2qMrWbwZdeF5w==,type:str] + pgp: + - created_at: "2025-06-05T09:49:12Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfAQ//cOnKq/AUiMJI3gdGqxCA6kLTIjXfPJz8SceFo7QClpdL - XwJYlsvUJSLBLHhb5f1gADRtVAiGGTb80wGw1CGIHykS3+H4WwqdZCWbffg1lQ4v - QrBtZ+RTHNBWekYbyLH89E3bkM5e6DJWo2zjUzpELw9shpr23Bd9C3nLBRSGxhtj - C59HjEpcY+K4aInn1sD7/ocEuQwib+B2a8mMv0fhsrSnkDg2U9R984UbwPfH7c1b - 6XHWJe926aOv9tme0M0gZRKoDd4PWW55ZWpM+uqwi0A+elSNcwq08XdfFvSWXvua - DbFAyX/1TGYzcTuatqFuDdp1HvcdK8CxIziQWlwTjA/MCu3300bcdSm8J6G94yoy - EYQWHyore/5ztBFAd7QkuFLwDdQq9A7OSW89FWsEJtExC13Oyo1puqePoGKe8hI/ - +EWvWzZaYsuZhm0sqdhVhfy0jXGrmqjsHkfUD8+/kurl/U+ZhuMHykp0nGcz+xw1 - Aum60NTpl3/PFsxHsXdtRfJCMPNXtLbYvYUb/UUztU09sfcl1uN/eoEljGJDKSZW - TVHxFT1d5KbTQOnfrSlheqA6zJEGdaHRWmGOb6GbW/yMeX496qcAAHt90tkC0XrG - 1Sn/HXjX5ICH0gVjvDi4m/Yw2zaw/wGkaKWPGBdyUUkIYG33bCzJqYd7HtG6FPfS - XAEUgwFsnCWamLyfqUd3iuFLxOYL3IcoQdhkoKBa0Zo5Wjq4qPZWxG8smpwQ5IxL - +l4TGjTydE787lk29+Zi5tk3MGMsPSvUL1ev9o5ZnaUStY/NwdKrOE5wMY5y - =25kh - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.8.1 + hQIMAw+OdhfgD3wfAQ//cOnKq/AUiMJI3gdGqxCA6kLTIjXfPJz8SceFo7QClpdL + XwJYlsvUJSLBLHhb5f1gADRtVAiGGTb80wGw1CGIHykS3+H4WwqdZCWbffg1lQ4v + QrBtZ+RTHNBWekYbyLH89E3bkM5e6DJWo2zjUzpELw9shpr23Bd9C3nLBRSGxhtj + C59HjEpcY+K4aInn1sD7/ocEuQwib+B2a8mMv0fhsrSnkDg2U9R984UbwPfH7c1b + 6XHWJe926aOv9tme0M0gZRKoDd4PWW55ZWpM+uqwi0A+elSNcwq08XdfFvSWXvua + DbFAyX/1TGYzcTuatqFuDdp1HvcdK8CxIziQWlwTjA/MCu3300bcdSm8J6G94yoy + EYQWHyore/5ztBFAd7QkuFLwDdQq9A7OSW89FWsEJtExC13Oyo1puqePoGKe8hI/ + +EWvWzZaYsuZhm0sqdhVhfy0jXGrmqjsHkfUD8+/kurl/U+ZhuMHykp0nGcz+xw1 + Aum60NTpl3/PFsxHsXdtRfJCMPNXtLbYvYUb/UUztU09sfcl1uN/eoEljGJDKSZW + TVHxFT1d5KbTQOnfrSlheqA6zJEGdaHRWmGOb6GbW/yMeX496qcAAHt90tkC0XrG + 1Sn/HXjX5ICH0gVjvDi4m/Yw2zaw/wGkaKWPGBdyUUkIYG33bCzJqYd7HtG6FPfS + XAEUgwFsnCWamLyfqUd3iuFLxOYL3IcoQdhkoKBa0Zo5Wjq4qPZWxG8smpwQ5IxL + +l4TGjTydE787lk29+Zi5tk3MGMsPSvUL1ev9o5ZnaUStY/NwdKrOE5wMY5y + =25kh + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.8.1 diff --git a/secrets/router0-dmz0/secrets.yaml b/secrets/router0-dmz0/secrets.yaml index 3b5ca1c..e1f528d 100644 --- a/secrets/router0-dmz0/secrets.yaml +++ b/secrets/router0-dmz0/secrets.yaml @@ -17,47 +17,47 @@ wg1-privatekey: ENC[AES256_GCM,data:Q3zb6oLhBqW+D063S37O2vZD3PSn3yIYWWkOtZwvpmMm wg1-publickey: ENC[AES256_GCM,data:7svFjRVdWBmrUt2qzHSmgBo4HPwJR6I6p3rZg2U+h1uVhQwCnUCH6JATVZs=,iv:xWUKpjmmrf/U8T8XmdL4Ox+aqkftnh8oeORCkhtJoBU=,tag:+k+E13X+EbZxfiq0MoGIEg==,type:str] wg1-peer0-psk: ENC[AES256_GCM,data:egtyccOYD4NAUTunpvVXTJwjtSdJJT8v5O9Wl7NoCKy2eDzrQvrEEK8Zzts=,iv:D7EQkj2Oz2JJIF6slTLq3A4esKN6VfkOA+odHvjSeUE=,tag:z/blOUXX1JOyqtXgMldnlg==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQNzRJeDlFdHhYSlRFWjJ4 - dXZtN21CRllTSitTZ2h2VnBNV2l2Wk5hVFNRCjhvVDFBR0ZYc3pkT0ZOMmVNMkRj - MGk5RXJ6UExmTUxoMml1bFgxLytUZjQKLS0tIFhrYS9xYzhHc0NTbHVpNEJEMU5U - UElCL0JIdWxkQ3oyZWJTUTRsYUxJdkkKobP1eWNWnvFCOY9AQRNhGjg9EzAX1MjP - QxhTNYs94CPFLeVsMghSw1v5rHLoXdyQnHc6LJ/rer6qLoSq//mv0A== - -----END AGE ENCRYPTED FILE----- - - recipient: age1qju6ms625tlgcjwc9p447seu2p8gu0cr63e5gv5y0wx9mvgmre9slxzzs0 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1R1g5OHEyUVFzclNwYXFN - K3N1R2xoYjdyYzF3Y0NNUXNCemJ5Y05uSEJ3CkVNdXNudk13VnlXNGR0MWt2Vm5P - UHI0ZUlVemkyNGJFeklaTmhlRm5KU0EKLS0tIHQyckt0RWNtVDA1aXVLNlVyUklQ - REhSYTUzeCtoUmJhWW5oZlZkVDM0N3cKid4XtaA3rjY89HOcRdv2xivlJAabjj7u - ES/s4YtRx/S1TIaAXlMmtQe1llKv0OIaioFvtgKnkrlpf7+tROZT7Q== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-02-05T09:44:59Z" - mac: ENC[AES256_GCM,data:P2bEHq4ZBg2Y8RPmUSuIOxWxJdYTUpTD5nXv3vqAHOU0t5ZlyOjFUPYejGBLdvd++v+plwo4lYG4/JJ3/LFIM/n2f1kFOOPSIt6yox6oYHHzJRly2kBfyIpUz4q+1c/xhMjpcQdAlWEdIQLm80BMUpny9y2KhVYot9TvTNTSkxM=,iv:uso8kcW8gildOD7FF1Xvage2dccQ8GkMI6nDCaUw2qc=,tag:urKtsRoGqwoZzk7DuMCINw==,type:str] - pgp: - - created_at: "2025-06-05T09:49:09Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQNzRJeDlFdHhYSlRFWjJ4 + dXZtN21CRllTSitTZ2h2VnBNV2l2Wk5hVFNRCjhvVDFBR0ZYc3pkT0ZOMmVNMkRj + MGk5RXJ6UExmTUxoMml1bFgxLytUZjQKLS0tIFhrYS9xYzhHc0NTbHVpNEJEMU5U + UElCL0JIdWxkQ3oyZWJTUTRsYUxJdkkKobP1eWNWnvFCOY9AQRNhGjg9EzAX1MjP + QxhTNYs94CPFLeVsMghSw1v5rHLoXdyQnHc6LJ/rer6qLoSq//mv0A== + -----END AGE ENCRYPTED FILE----- + - recipient: age1qju6ms625tlgcjwc9p447seu2p8gu0cr63e5gv5y0wx9mvgmre9slxzzs0 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1R1g5OHEyUVFzclNwYXFN + K3N1R2xoYjdyYzF3Y0NNUXNCemJ5Y05uSEJ3CkVNdXNudk13VnlXNGR0MWt2Vm5P + UHI0ZUlVemkyNGJFeklaTmhlRm5KU0EKLS0tIHQyckt0RWNtVDA1aXVLNlVyUklQ + REhSYTUzeCtoUmJhWW5oZlZkVDM0N3cKid4XtaA3rjY89HOcRdv2xivlJAabjj7u + ES/s4YtRx/S1TIaAXlMmtQe1llKv0OIaioFvtgKnkrlpf7+tROZT7Q== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2025-02-05T09:44:59Z" + mac: ENC[AES256_GCM,data:P2bEHq4ZBg2Y8RPmUSuIOxWxJdYTUpTD5nXv3vqAHOU0t5ZlyOjFUPYejGBLdvd++v+plwo4lYG4/JJ3/LFIM/n2f1kFOOPSIt6yox6oYHHzJRly2kBfyIpUz4q+1c/xhMjpcQdAlWEdIQLm80BMUpny9y2KhVYot9TvTNTSkxM=,iv:uso8kcW8gildOD7FF1Xvage2dccQ8GkMI6nDCaUw2qc=,tag:urKtsRoGqwoZzk7DuMCINw==,type:str] + pgp: + - created_at: "2025-06-05T09:49:09Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfAQ/9Hx9PkWEL0en32Ji+fk4kCcXwToFf6EOe06bNit/8r5Qw - C3ixd+uOykhbwN77yssvB8uZ52A7NTSdf6iV5E7M+nFx4+mLYMW+mZekF82ICyjW - SW4b0HsI8WwVYn7EWb3BiNa2D3ku1XXqkmaMLtEb8N+LTXW3jCq/gC1xuB6Msdny - egz7l7KemiWcOPxXZmh9INKxpEYziXCnkq7p9T+04noi6Yz9hPWBzBRBOw88AfrP - eyFzFIbWPsNpsRhVzRlWNmu4Sx0NtqNy2zHk2wkcndJaldk5EEFO2c4szofuQV0o - lmssfVH+BGwtEUs/37igSxeHwnYxEEhEof3B8qnXReUsqcrLqpvQIgleQgUg4T3s - SCbA9dCSTBfos+rVM1764B6lw5ISOj2JxJyoV5itXu1LNK45fpsT2YgRXOoaziHK - hn4WOsVnRuaadHrd2ULA/0qXlWE+QscetZzrKCIZsuqHCqNumjhNhtIlOlKLFv4U - GVMyalRmSJTCVI5EfewyHzMJpGa+OVtfEoUgM2xm1Jd34dEjjHjyynyqOj0ybB0+ - CgC8IGcWpCQZwijITMMZ/bPyet68nVrApy44pniTENcXN1byQECUuZV3Z+BTWNZg - VOuOPmiTQf26qjQ8I4fEUuRgPpC1Wze4MiDyXkX2jtgU5nbLxAhZLln4z9JA1FfS - XAGEKaPlu9x0WB9vSu3ArEERIw/rmu5Ux23Gzev4IFhzJ21Jzp4tpjZhGQvAIafQ - fStDytk2DOS71x7Z8MzqE10BQJ0oB37donhAxqAgOCpOnAtK1a/IOkT1m9IZ - =xkVg - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.9.1 + hQIMAw+OdhfgD3wfAQ/9Hx9PkWEL0en32Ji+fk4kCcXwToFf6EOe06bNit/8r5Qw + C3ixd+uOykhbwN77yssvB8uZ52A7NTSdf6iV5E7M+nFx4+mLYMW+mZekF82ICyjW + SW4b0HsI8WwVYn7EWb3BiNa2D3ku1XXqkmaMLtEb8N+LTXW3jCq/gC1xuB6Msdny + egz7l7KemiWcOPxXZmh9INKxpEYziXCnkq7p9T+04noi6Yz9hPWBzBRBOw88AfrP + eyFzFIbWPsNpsRhVzRlWNmu4Sx0NtqNy2zHk2wkcndJaldk5EEFO2c4szofuQV0o + lmssfVH+BGwtEUs/37igSxeHwnYxEEhEof3B8qnXReUsqcrLqpvQIgleQgUg4T3s + SCbA9dCSTBfos+rVM1764B6lw5ISOj2JxJyoV5itXu1LNK45fpsT2YgRXOoaziHK + hn4WOsVnRuaadHrd2ULA/0qXlWE+QscetZzrKCIZsuqHCqNumjhNhtIlOlKLFv4U + GVMyalRmSJTCVI5EfewyHzMJpGa+OVtfEoUgM2xm1Jd34dEjjHjyynyqOj0ybB0+ + CgC8IGcWpCQZwijITMMZ/bPyet68nVrApy44pniTENcXN1byQECUuZV3Z+BTWNZg + VOuOPmiTQf26qjQ8I4fEUuRgPpC1Wze4MiDyXkX2jtgU5nbLxAhZLln4z9JA1FfS + XAGEKaPlu9x0WB9vSu3ArEERIw/rmu5Ux23Gzev4IFhzJ21Jzp4tpjZhGQvAIafQ + fStDytk2DOS71x7Z8MzqE10BQJ0oB37donhAxqAgOCpOnAtK1a/IOkT1m9IZ + =xkVg + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.9.1 diff --git a/secrets/router0-hosthatch/secrets.yaml b/secrets/router0-hosthatch/secrets.yaml index c019f04..6939402 100644 --- a/secrets/router0-hosthatch/secrets.yaml +++ b/secrets/router0-hosthatch/secrets.yaml @@ -7,47 +7,47 @@ wg1-privatekey: ENC[AES256_GCM,data:dcD5isfYT+diae7tS6OSEQiqEkrpUxw0io8EqaSUaaFx wg1-publickey: ENC[AES256_GCM,data:08fRjmGysmgGwXgwGqtMmO4iMWNIOucRnD7l4qaCh1hVWAk2BbO3OcHw010=,iv:PfKUVRyjEVT2BBUCmruR026n/P2kT2Papq46DOFq3rE=,tag:AhyI1yHdEucmQEo6iHnznQ==,type:str] wg1-peer0-psk: ENC[AES256_GCM,data:zlQv7B2Xm+QUzevsYDD2ckIp3PdEAOSEPv6UKYLKRUGWXKE9eLhC1dNq5t8=,iv:kehiDKfew68S2pfRFq5OyTm+Ixo05uiAiHDg30xhP4Y=,tag:0GSr1d26ALehewMF5b6woQ==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0bW12THJKV1B1Zkw2RG1H - YnpPZE9UTDVFSFZtWDRTWkd2c2pRaHdmRHdvCngyNDlmVSs0Zm5yYkFLbFFFZ2xR - M1FnYWx6UmZIQ0xZcnVtdVhmR1REL3MKLS0tIFA5TTYxSXhFN3JzRUd2UkJnV0tE - dHFiZFZIdkRtUzBSNTIzUWNIb3h4TTAKYThgfHX91UXq27b2U/wtrCyZY8484Yga - Ic7FhMQMEgRVC58q6xLOglCmM11USL3YeyOYEFeoLnsvecgobft3Aw== - -----END AGE ENCRYPTED FILE----- - - recipient: age1v458x2q70yt0a6m6cq5ehemphtrzfzyhmeg3r872vsyyf65asgwstmqqk4 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzdGZhTThjd290dUM4ME11 - Y2Q3dy9sNks2OFpUNXdQZmdEUFFuVGZRZzFzClhyU0ZxY1hvUkxaa3BLajJGOHlr - M05XQTZtNGlhZ1VaeTN1ZlAwVjZVNW8KLS0tIHk1WUt2UENZaHRaSVhoanY1WEdp - YzZpeDBrM05oRXFjM2E2dTRoZmF3R2sKr9kID48vUng7tbIoc50kzB3X8SM+vIvK - GQi0dHVaYIvrIkdDm7utuqPRFTwOrxb+Fii0HVBKGzeOLTfckqfOnA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-06-09T14:08:09Z" - mac: ENC[AES256_GCM,data:nCwAca0MktoxUb0W+1B7+4UP5IOG4cuj2BhJBxjDV4gjYBSKYJs5gSdYytjOpu76ePXSUHgyiPH0Joe5ESubaUN4zPIWMLpkEk6WjXnmXRTY8B5ZZ+AVR2lxNi7UtiCyx0yjAVZFxuk33MmKR2yXMLEqE6U/70fccJlY+dbTaVU=,iv:QTafba+auq3Zv/xoBzHmnIMmfDAynqApAcr/T0Uh/2g=,tag:RREUDKF4Kruy0AEFDqSVuw==,type:str] - pgp: - - created_at: "2025-06-05T09:49:11Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0bW12THJKV1B1Zkw2RG1H + YnpPZE9UTDVFSFZtWDRTWkd2c2pRaHdmRHdvCngyNDlmVSs0Zm5yYkFLbFFFZ2xR + M1FnYWx6UmZIQ0xZcnVtdVhmR1REL3MKLS0tIFA5TTYxSXhFN3JzRUd2UkJnV0tE + dHFiZFZIdkRtUzBSNTIzUWNIb3h4TTAKYThgfHX91UXq27b2U/wtrCyZY8484Yga + Ic7FhMQMEgRVC58q6xLOglCmM11USL3YeyOYEFeoLnsvecgobft3Aw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1v458x2q70yt0a6m6cq5ehemphtrzfzyhmeg3r872vsyyf65asgwstmqqk4 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzdGZhTThjd290dUM4ME11 + Y2Q3dy9sNks2OFpUNXdQZmdEUFFuVGZRZzFzClhyU0ZxY1hvUkxaa3BLajJGOHlr + M05XQTZtNGlhZ1VaeTN1ZlAwVjZVNW8KLS0tIHk1WUt2UENZaHRaSVhoanY1WEdp + YzZpeDBrM05oRXFjM2E2dTRoZmF3R2sKr9kID48vUng7tbIoc50kzB3X8SM+vIvK + GQi0dHVaYIvrIkdDm7utuqPRFTwOrxb+Fii0HVBKGzeOLTfckqfOnA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-06-09T14:08:09Z" + mac: ENC[AES256_GCM,data:nCwAca0MktoxUb0W+1B7+4UP5IOG4cuj2BhJBxjDV4gjYBSKYJs5gSdYytjOpu76ePXSUHgyiPH0Joe5ESubaUN4zPIWMLpkEk6WjXnmXRTY8B5ZZ+AVR2lxNi7UtiCyx0yjAVZFxuk33MmKR2yXMLEqE6U/70fccJlY+dbTaVU=,iv:QTafba+auq3Zv/xoBzHmnIMmfDAynqApAcr/T0Uh/2g=,tag:RREUDKF4Kruy0AEFDqSVuw==,type:str] + pgp: + - created_at: "2025-06-05T09:49:11Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfARAAosMhFMHsZ2uXt0AVKf+tbGxyr3oZte7uX45SDv+mWkpa - kGBQiiY2tLU2+GqTnec9MRx5D12r6kBuVjW3UG2FCIhONLMFk+3L80lHEZLYNVID - Og30hKqEGSRrJasnVgQPAo7SXfyfFKGflZyQV56P4jAphWCwSvkFywcXlP9ZZKA6 - SmMZrdQeylM9Qp9/B2DtoVLVv6beeSqV6gu8KBN8qSXky+MTOHadfNePNnyvl0EV - kH9SeH1ch+XbEqHhEMm/EB+RXZSBgXv0yVhHBhtr3sx06o3Jpbw7mDMEscNl76xx - QQtzR4OsBp/VKQEJde3OYUOvKzNyYk1yB5Oocrb+shAjHXrF73Yt0yeq1LiTWYA4 - BLQWzeraCoo14m8tMD9nKo4tEurTBFWOmSITTu85V+kzJ6FRc/F3i2OjB94DUBsM - VNsldqQhc4mDioVywBQ1MaA9phWHTUHprJPflByQmP3jj2bjbure1UHOFVqqzW0W - zAp5yFCJXfUJap6MPKl9ZR5zCTZmpiChJxkipwpmNSQh589uiJrCzgwJ/VQC/yHq - a56PGW6eANzjGC3CkWzEBDELjYsXhxV4jbc6Qfh0owcbWDNe2xV6u6Mp+9DvfJQx - iz06fQaN4YQP8xhfLSBg/utc+H7U8dkd1jr3/GYr4PAf17FNQA4VkF5XhxDkT6zS - XAEFECB086pVQFehiL3SpvoTJUdkJdLySQ3qVYmldA/mQXlg3SEDhGHtJlgkx+US - v0BYfCrlnygbXyuPcKKwN54K8H/uL8OAB90Vq0FFeaVbVE1zn5MJx5wQaxL7 - =v2Ad - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.8.1 + hQIMAw+OdhfgD3wfARAAosMhFMHsZ2uXt0AVKf+tbGxyr3oZte7uX45SDv+mWkpa + kGBQiiY2tLU2+GqTnec9MRx5D12r6kBuVjW3UG2FCIhONLMFk+3L80lHEZLYNVID + Og30hKqEGSRrJasnVgQPAo7SXfyfFKGflZyQV56P4jAphWCwSvkFywcXlP9ZZKA6 + SmMZrdQeylM9Qp9/B2DtoVLVv6beeSqV6gu8KBN8qSXky+MTOHadfNePNnyvl0EV + kH9SeH1ch+XbEqHhEMm/EB+RXZSBgXv0yVhHBhtr3sx06o3Jpbw7mDMEscNl76xx + QQtzR4OsBp/VKQEJde3OYUOvKzNyYk1yB5Oocrb+shAjHXrF73Yt0yeq1LiTWYA4 + BLQWzeraCoo14m8tMD9nKo4tEurTBFWOmSITTu85V+kzJ6FRc/F3i2OjB94DUBsM + VNsldqQhc4mDioVywBQ1MaA9phWHTUHprJPflByQmP3jj2bjbure1UHOFVqqzW0W + zAp5yFCJXfUJap6MPKl9ZR5zCTZmpiChJxkipwpmNSQh589uiJrCzgwJ/VQC/yHq + a56PGW6eANzjGC3CkWzEBDELjYsXhxV4jbc6Qfh0owcbWDNe2xV6u6Mp+9DvfJQx + iz06fQaN4YQP8xhfLSBg/utc+H7U8dkd1jr3/GYr4PAf17FNQA4VkF5XhxDkT6zS + XAEFECB086pVQFehiL3SpvoTJUdkJdLySQ3qVYmldA/mQXlg3SEDhGHtJlgkx+US + v0BYfCrlnygbXyuPcKKwN54K8H/uL8OAB90Vq0FFeaVbVE1zn5MJx5wQaxL7 + =v2Ad + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.8.1 diff --git a/secrets/router0-ifog/secrets.yaml b/secrets/router0-ifog/secrets.yaml index 71d8e7a..9a2ca9f 100644 --- a/secrets/router0-ifog/secrets.yaml +++ b/secrets/router0-ifog/secrets.yaml @@ -9,47 +9,47 @@ wg1-privatekey: ENC[AES256_GCM,data:dcD5isfYT+diae7tS6OSEQiqEkrpUxw0io8EqaSUaaFx wg1-publickey: ENC[AES256_GCM,data:08fRjmGysmgGwXgwGqtMmO4iMWNIOucRnD7l4qaCh1hVWAk2BbO3OcHw010=,iv:PfKUVRyjEVT2BBUCmruR026n/P2kT2Papq46DOFq3rE=,tag:AhyI1yHdEucmQEo6iHnznQ==,type:str] wg1-peer0-psk: ENC[AES256_GCM,data:zlQv7B2Xm+QUzevsYDD2ckIp3PdEAOSEPv6UKYLKRUGWXKE9eLhC1dNq5t8=,iv:kehiDKfew68S2pfRFq5OyTm+Ixo05uiAiHDg30xhP4Y=,tag:0GSr1d26ALehewMF5b6woQ==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtRHh0S0o2RWh2azFpL0k3 - b3dPNjJmbzZwclkxVkxDdkJ6NWpTRGxycFZVCmtkNWVRZldKUXVTTFA4LzRxZita - QmNJV00wYVBOUGdlOEViVjRqRjFSSE0KLS0tIGtSYzMrQTFUREQ3all3N3VHTXZ1 - M251bnVseUdqcUFwek9SZ1FEbk9XWEEKs7g7qxFzmr5I56jPiLH2K06a4lZ59pxy - qQCXK3AIZZtz8ibLfgo058Om/36SIX7rddOVxab7QnagGwdKF4d6EQ== - -----END AGE ENCRYPTED FILE----- - - recipient: age1dktk5glcuu34u9t6kp3g2vqyj7dy0elray38t8n75mwa6l0s0vdst2cy00 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkdjE0YUlKNW1WeHJ5YWZl - aGk3N250MHlHRTNaZDN4OExjVmRoaVhReFE0CmRTeDZleHR1RzZBMWJXV2U5YU1L - MklidG5lcm1sWlZIbDV2YzlmU1ZQNEkKLS0tIFZNL2o5RlpRdlhxMnhSV3p1Ukg5 - ZHJyalhzSWJhUk96TkxuM09aUWcwMjAKu6pzq11IDeOLR9C4GEf5VyLk6WJHxxAl - X1JUdl7IFfGLSpGfFRmFN6HJxtiC1IGkEYinCfFWPR6ogx9dTp5H0Q== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-05-26T17:23:41Z" - mac: ENC[AES256_GCM,data:Ez/79vUHs+9B/v2qlUiPQeuYHRdvjUg1jJOt3C6xEnncDQ2fH0CUxKEIfjgJR7eatwvZSznprv2wCD8Ik0SKunjRI1UGe5JmrVstqoSDbo+MxpdwrqA8zC5unpRUYenvyo9m8ZW/DnjKz0ArorYjA9vid878MdemkHtSjjZzik8=,iv:2CkmPRjYYt7q7HAdEjIbJHaSUG6Yr92pEkk+Dd3E7LE=,tag:S8LPb0mEjRZQqawX310SOg==,type:str] - pgp: - - created_at: "2025-06-05T09:49:11Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtRHh0S0o2RWh2azFpL0k3 + b3dPNjJmbzZwclkxVkxDdkJ6NWpTRGxycFZVCmtkNWVRZldKUXVTTFA4LzRxZita + QmNJV00wYVBOUGdlOEViVjRqRjFSSE0KLS0tIGtSYzMrQTFUREQ3all3N3VHTXZ1 + M251bnVseUdqcUFwek9SZ1FEbk9XWEEKs7g7qxFzmr5I56jPiLH2K06a4lZ59pxy + qQCXK3AIZZtz8ibLfgo058Om/36SIX7rddOVxab7QnagGwdKF4d6EQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age1dktk5glcuu34u9t6kp3g2vqyj7dy0elray38t8n75mwa6l0s0vdst2cy00 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkdjE0YUlKNW1WeHJ5YWZl + aGk3N250MHlHRTNaZDN4OExjVmRoaVhReFE0CmRTeDZleHR1RzZBMWJXV2U5YU1L + MklidG5lcm1sWlZIbDV2YzlmU1ZQNEkKLS0tIFZNL2o5RlpRdlhxMnhSV3p1Ukg5 + ZHJyalhzSWJhUk96TkxuM09aUWcwMjAKu6pzq11IDeOLR9C4GEf5VyLk6WJHxxAl + X1JUdl7IFfGLSpGfFRmFN6HJxtiC1IGkEYinCfFWPR6ogx9dTp5H0Q== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-05-26T17:23:41Z" + mac: ENC[AES256_GCM,data:Ez/79vUHs+9B/v2qlUiPQeuYHRdvjUg1jJOt3C6xEnncDQ2fH0CUxKEIfjgJR7eatwvZSznprv2wCD8Ik0SKunjRI1UGe5JmrVstqoSDbo+MxpdwrqA8zC5unpRUYenvyo9m8ZW/DnjKz0ArorYjA9vid878MdemkHtSjjZzik8=,iv:2CkmPRjYYt7q7HAdEjIbJHaSUG6Yr92pEkk+Dd3E7LE=,tag:S8LPb0mEjRZQqawX310SOg==,type:str] + pgp: + - created_at: "2025-06-05T09:49:11Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfAQ//fh09erpIbQiOxllj9U47PNkGNHQHiw1mrECpdjXUwVxz - 2KLJ2Sg0KLDcU5tDmr8s4Agm7pKluncJ9xPSNs1RriP6pZ/uJQrX4nc3tSRktgPv - haHBrwVSX+E1WDcxk9mpbS1jfpE2YsgtjLRMsHgequ2zf0JhSJiJJnI7IR3eur2Q - qewY3MfBE3jMGZoqt5r5P0pTFwZZhsdNlSc4UpYxNWKw+mCZd6jL9J1c9l/LkIZc - rn9hxqGTlouRw7pRrCD8HPD3g27PFcWfqRO18CBM+tHlj62q8PTZX+IfkLh7VbCG - Py1ByglXYvfT6y8NgFPjzaIl+ZLMcPuHkMW2sdOFGQ1L2+W3GaVaD0TFYlFUT1dD - A47/8yFFXYD/4MzcZK7W2fHdzQt1qtACoAPxgiM38uon237gNOSbuSmamfR66rI2 - L6+v7jlkt364Yt9D0bQCqNJQ6uhtFykaLqN6mLoj1IeoP9yQGaEni2pJzDfW4QYd - EiwigSxviiDnGRGaithMMexrLzcf7UhEZJgGrq+D3d2xPN4mJ9irT9MheFYwYLW4 - M/yDnA50GvwxHA7IzrR1fxneO6P44zi82stX+agFTmbiBKw2aelGJM+wwzCEVGfR - /ksU6xhLbL7aMZLBXkZ1ZV9tf0t5EbizapqNdILxSMgaKfGegJGZHLuvukv55ODS - XAFXaECdhLj92gxmtVAf9Ct/17J7fkD+qLHHmrVBTHJWZ40zDeA+7sw7LUeE0sPl - 0z3QLEk+szBOyo/07ZIVC9xA292Rt5VQJrMSTOIGcGw4g0m1nOzTtT3Q5DLL - =aStS - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.8.1 + hQIMAw+OdhfgD3wfAQ//fh09erpIbQiOxllj9U47PNkGNHQHiw1mrECpdjXUwVxz + 2KLJ2Sg0KLDcU5tDmr8s4Agm7pKluncJ9xPSNs1RriP6pZ/uJQrX4nc3tSRktgPv + haHBrwVSX+E1WDcxk9mpbS1jfpE2YsgtjLRMsHgequ2zf0JhSJiJJnI7IR3eur2Q + qewY3MfBE3jMGZoqt5r5P0pTFwZZhsdNlSc4UpYxNWKw+mCZd6jL9J1c9l/LkIZc + rn9hxqGTlouRw7pRrCD8HPD3g27PFcWfqRO18CBM+tHlj62q8PTZX+IfkLh7VbCG + Py1ByglXYvfT6y8NgFPjzaIl+ZLMcPuHkMW2sdOFGQ1L2+W3GaVaD0TFYlFUT1dD + A47/8yFFXYD/4MzcZK7W2fHdzQt1qtACoAPxgiM38uon237gNOSbuSmamfR66rI2 + L6+v7jlkt364Yt9D0bQCqNJQ6uhtFykaLqN6mLoj1IeoP9yQGaEni2pJzDfW4QYd + EiwigSxviiDnGRGaithMMexrLzcf7UhEZJgGrq+D3d2xPN4mJ9irT9MheFYwYLW4 + M/yDnA50GvwxHA7IzrR1fxneO6P44zi82stX+agFTmbiBKw2aelGJM+wwzCEVGfR + /ksU6xhLbL7aMZLBXkZ1ZV9tf0t5EbizapqNdILxSMgaKfGegJGZHLuvukv55ODS + XAFXaECdhLj92gxmtVAf9Ct/17J7fkD+qLHHmrVBTHJWZ40zDeA+7sw7LUeE0sPl + 0z3QLEk+szBOyo/07ZIVC9xA292Rt5VQJrMSTOIGcGw4g0m1nOzTtT3Q5DLL + =aStS + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.8.1 diff --git a/secrets/servers/dyndns.yaml b/secrets/servers/dyndns.yaml index 7ae2941..d01380b 100644 --- a/secrets/servers/dyndns.yaml +++ b/secrets/servers/dyndns.yaml @@ -1,47 +1,47 @@ dyndns_www.stefanjunker.de: ENC[AES256_GCM,data:xHpC/V9OWCMpTKs1,iv:gW6f6kQedbdxbz1zJAY6xceoeG/LqPG/Ss3DaBm/Ta0=,tag:v2V/hzRg+xgO8zpwyIBVXA==,type:str] dyndns_mailserver.svc.stefanjunker.de: ENC[AES256_GCM,data:auVHa5n4335mNXAy,iv:WZMOA+Z7/w+Jsu5193WwERXZrt/5JDiMUKIZo8ieT7w=,tag:YmEDp/0gjgPY2kg9GNKmxQ==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBTE1ZQXpZR2JWNXZyZG10 - NHhwbTZQZEVKQURZOS9BZ1BBbVgwdHpWMUNvCm9RNU1nbk1uT2VLTkVtSkFIQ3lh - OUZQSjZsK1Zvb3ZWVzZoTmVRQXpselkKLS0tIDJlanZpanZ5bDF2TUFLWWxSbytz - cEdYRnBHOERkWjZiWUFVQnZ0VU5EZEEKJD9EdW3iNVs9BdflLBsYgqRAQuJsWkVM - 7OdYSnB+aEULLRYcTpbCH/AJ3U5TDGFemj2ec9nq0H2qgUBCNOvicQ== - -----END AGE ENCRYPTED FILE----- - - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTSUxNQ1ZoeVBsR2VTRjNS - a3BJZ0pxU0JSYkgxWjNTdk01UzJ2SUJrUW1nCnczNGxBNVhBY2hLZ2c0UjludlBD - bGl1UFY4Ti9OSnIzK0hRb2dmdUY0T3MKLS0tIE5FT1BDYmsxRThhVXo0SVFjYlZi - TzVhN01zNTZkYk1jL1VYS2YwTkJIejgKLD9zpgrTV8ViOaV+WdXIdZXrd4eyRV20 - iNq3B+DF8Xzpu/cQJ2Id6ZXvuBNPVDvSn8N79FmO+Ad2a5XZl80Png== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-14T20:50:30Z" - mac: ENC[AES256_GCM,data:09EAhiFSNroQKelSHF0YdJl8INdYVcjK4BfiOktY+Nx1GK2BA6T8grvIHGB1UZaDvS/AzjcSIq+5ZnyfBU13Ks8zH5oQ11La48FheE3bL38KS+JNgqw3F53w/NUVFkYFp2YRuCqkg8/OBmT3OONLggF7ziuQEByW5NlOUdLejkA=,iv:qe4kBBxxpFdKNszbvZlIXjA2Ybc+NAU2GkMcSviZczE=,tag:98ABbbVh5qPnAzo0xkZ81w==,type:str] - pgp: - - created_at: "2025-06-05T09:49:10Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBTE1ZQXpZR2JWNXZyZG10 + NHhwbTZQZEVKQURZOS9BZ1BBbVgwdHpWMUNvCm9RNU1nbk1uT2VLTkVtSkFIQ3lh + OUZQSjZsK1Zvb3ZWVzZoTmVRQXpselkKLS0tIDJlanZpanZ5bDF2TUFLWWxSbytz + cEdYRnBHOERkWjZiWUFVQnZ0VU5EZEEKJD9EdW3iNVs9BdflLBsYgqRAQuJsWkVM + 7OdYSnB+aEULLRYcTpbCH/AJ3U5TDGFemj2ec9nq0H2qgUBCNOvicQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTSUxNQ1ZoeVBsR2VTRjNS + a3BJZ0pxU0JSYkgxWjNTdk01UzJ2SUJrUW1nCnczNGxBNVhBY2hLZ2c0UjludlBD + bGl1UFY4Ti9OSnIzK0hRb2dmdUY0T3MKLS0tIE5FT1BDYmsxRThhVXo0SVFjYlZi + TzVhN01zNTZkYk1jL1VYS2YwTkJIejgKLD9zpgrTV8ViOaV+WdXIdZXrd4eyRV20 + iNq3B+DF8Xzpu/cQJ2Id6ZXvuBNPVDvSn8N79FmO+Ad2a5XZl80Png== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-07-14T20:50:30Z" + mac: ENC[AES256_GCM,data:09EAhiFSNroQKelSHF0YdJl8INdYVcjK4BfiOktY+Nx1GK2BA6T8grvIHGB1UZaDvS/AzjcSIq+5ZnyfBU13Ks8zH5oQ11La48FheE3bL38KS+JNgqw3F53w/NUVFkYFp2YRuCqkg8/OBmT3OONLggF7ziuQEByW5NlOUdLejkA=,iv:qe4kBBxxpFdKNszbvZlIXjA2Ybc+NAU2GkMcSviZczE=,tag:98ABbbVh5qPnAzo0xkZ81w==,type:str] + pgp: + - created_at: "2025-06-05T09:49:10Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfAQ/9EgxX9o0GjO+n1fnAEeYYkhHyx3ITJKT2XQIwMSbAukhA - PgNSmojyAr2FUuScDZ4cZh4ACj4itPFVT1kDNEDyHZaaWmqcDIrx0SKgtUymDAiA - hXnB9IqzPJVqodo6+Eav+p6JEB3IoENQ6p/9BLN0o8P2RDYiKRV6i1pSQfDvHzfs - EnsQYHpDBNHSo/L+WwvsVmq60tmywBy7SF35B86JQPfbgYEVr0bxEHCkzfGAdilY - fYY92QH3YoXvc4mE4mF7BnWjOpyHsQ/UKSUrl2223r+dPSGthrGfvCOnpE4CN12o - 5yZ7T7oXZlIgvwNUn3BjQm/KXSYmLVhe1KWmkXA23wZ7NlmGL3WKLj++8P1GjpM9 - TGBHp96CBAl5NsC3tTovqtDLdsEV66nGXnVaF0e1avaeyt9396PCVw9GiEl/phH2 - Mw8UBwgBxJ1jx6WB+tnUdBXvlJRc4/ZLpfxTyUxAkYxDfYfiZ/Wago+sZZc1XBGR - 5BlHsGm4Fsu1DaQt3IrBcvzrladwtFaYv7OcwQccQRHmQ5jXh4qo2HE0qHUSK/PD - Rpjw9D1DhDjolfMVSJID0GgFyjEeya9MaKvzTTkBW0u5Hn7HayzePE7GfDrzDwJg - Ef5DcH+b1YOjtxoaU9dxcPMT0QHGK6f3CO7K+q6EzxMMo7Wx41Vv5K4KGBj3vjDS - XAGUt9b+GwugiS1A6bHnssDH0JVsHc2aitz5Q8N0l3h3J9d6DxVGew6S9+4pkq0B - gB9uwzJWME6Sgpa6xx2a2krlIlbUX9ehfmYB2LIvpp5U25nw13YVwTUjH5Yj - =hMaH - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.7.3 + hQIMAw+OdhfgD3wfAQ/9EgxX9o0GjO+n1fnAEeYYkhHyx3ITJKT2XQIwMSbAukhA + PgNSmojyAr2FUuScDZ4cZh4ACj4itPFVT1kDNEDyHZaaWmqcDIrx0SKgtUymDAiA + hXnB9IqzPJVqodo6+Eav+p6JEB3IoENQ6p/9BLN0o8P2RDYiKRV6i1pSQfDvHzfs + EnsQYHpDBNHSo/L+WwvsVmq60tmywBy7SF35B86JQPfbgYEVr0bxEHCkzfGAdilY + fYY92QH3YoXvc4mE4mF7BnWjOpyHsQ/UKSUrl2223r+dPSGthrGfvCOnpE4CN12o + 5yZ7T7oXZlIgvwNUn3BjQm/KXSYmLVhe1KWmkXA23wZ7NlmGL3WKLj++8P1GjpM9 + TGBHp96CBAl5NsC3tTovqtDLdsEV66nGXnVaF0e1avaeyt9396PCVw9GiEl/phH2 + Mw8UBwgBxJ1jx6WB+tnUdBXvlJRc4/ZLpfxTyUxAkYxDfYfiZ/Wago+sZZc1XBGR + 5BlHsGm4Fsu1DaQt3IrBcvzrladwtFaYv7OcwQccQRHmQ5jXh4qo2HE0qHUSK/PD + Rpjw9D1DhDjolfMVSJID0GgFyjEeya9MaKvzTTkBW0u5Hn7HayzePE7GfDrzDwJg + Ef5DcH+b1YOjtxoaU9dxcPMT0QHGK6f3CO7K+q6EzxMMo7Wx41Vv5K4KGBj3vjDS + XAGUt9b+GwugiS1A6bHnssDH0JVsHc2aitz5Q8N0l3h3J9d6DxVGew6S9+4pkq0B + gB9uwzJWME6Sgpa6xx2a2krlIlbUX9ehfmYB2LIvpp5U25nw13YVwTUjH5Yj + =hMaH + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/secrets/shared-users.yaml b/secrets/shared-users.yaml index 3219c3d..2596180 100644 --- a/secrets/shared-users.yaml +++ b/secrets/shared-users.yaml @@ -11,101 +11,101 @@ sharedUsers-radicale: ENC[AES256_GCM,data:Mn1QIwQDX0ZnZ0Jbk1RYY60k+XbbGPYYf+NG3x sharedUsers-elias: ENC[AES256_GCM,data:RsGDCguYkqegKhkO20lr8HjrTABAaNJmDiGK3DhhbX1sOLMweZwDtESvYjCfAOzWpiAaFh0BqevMkuUcEYQTBubSX+X0EZ0dFrdbVxIe7lq7Dosds98SqKLL4zWqe2y2qsphvj+oAz7Utg==,iv:JXIbyqAUt1OcB+bvgK6H2NU6Ip4nWRJ1/Hje75FfHC4=,tag:kPFALVkf1GbRj1J85SZm6Q==,type:str] sharedUsers-justyna: ENC[AES256_GCM,data:BGVp2QppWWaYHK3rwLlyy7SOWxSqKGsn7lemWe0KUzgiQc6D8ivYvXdGaAhJNvhgVTxlK6BZOacG4NESWf5hi7sN8AkwTT/6pa9WzhQQGNnwZIaVulXeddzFlebbh8pAt0WYV82DRejX3Q==,iv:RMysIp0pMnCLhWogWiGq4IpZA43sd0DPj3jeV0oRkY8=,tag:VvXPzyGAoATlSedvV2prJA==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArejJMdC9Xb1EvMlkvUk9Y - MW5LcnhTdktHVlNoMFpYWG0xUkRjZm1GbVVZCjJaNEN5ZHFSeC9YNVBmM0QxM3VK - c1NJRVlzWDQ0QS9XZFpWeEJwTTV2Q2sKLS0tIEcwZ1JjeHhNdXFId2YwQXMyMk52 - NVMzL2U0eUdISlQrLzYvSTlKQkUzancK2dmrpC6+Bl7DrHtx5mvF+c4BRv0HPzjU - aT6GbjP3uZ0/jrRM1REqfLQe0v/AP9yMIenZNLdkfoSELtXpHIIsNQ== - -----END AGE ENCRYPTED FILE----- - - recipient: age1y9urllccdcemlv7g5z4peuzeh5ah0a8nu6cnkvym8v2vfhqjd5jql483c6 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKalYrWUlmN1d5WXpDOEtM - Qmd0SXZMdXpJdVdtcW5lcHZoT3hTMGhTZldFCm5XcEJ4WWgrbW9YQ0lrRzFOYndZ - VE1QTzlMUmdEZkRzakRUOHVrcWZ0dWMKLS0tIHVyeEVtekRnTDY2c25idUpTMXhH - ak1jbnQ0dFBFM3c5TVJvcDlkR1VjcTAKUeMBhu4ZFBYLW9jB63JErQwCsAV3YCKG - kxJTfdaoS3X2QWGIp6s+oE/YYCikKiOR6UxoHoBBgklP8tOXG03cPg== - -----END AGE ENCRYPTED FILE----- - - recipient: age1pmznn2tjpelpmxjxqef48rse5ujggf9kcr8x5vewuadqcw03aavqwy54zm - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCSGpDSGZQVUExL2tXbFQ2 - MldVZGFQNlVULy9BVUYxVXlseTlKL0RhU1F3CnVSUXdoczRjYWJCMnpyWldUMU9R - blJwVXIwdmFRd1JlSURQTEZkTmRkSFkKLS0tIE9VcXRVZytWUTBUV1gzdytrbTla - MjBvNXdWU3Q5ZENraWIrYmlZUmNqRU0KfDDVeBKs9gm1oBufKfSvkNSbdlyjQt3q - is+5wfSgiV7vzvdh7MWqQhyYI3U+JJB2sq2dy8m65GLT5XMJdqm80w== - -----END AGE ENCRYPTED FILE----- - - recipient: age1qju6ms625tlgcjwc9p447seu2p8gu0cr63e5gv5y0wx9mvgmre9slxzzs0 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5SGJ0bTRXN2RSeEprZGtO - NTI5YXRhV3VXWHpsekNWY0N2Rm90WmpVM0JrCmw2dkczbDNwOHViM1B2eVNmMGRS - R2QvMEZIOXhXS2t2RGRDTU9yK3ZJV1EKLS0tIFNwMFJmWFFJMjFPNDVEbk5naGR5 - Q0txMjlPNStWY0RqcEZTS2VBbEF0NWsKS2nLfY2AcTmI3Jkd+xtEw+LCJ0RCXSfW - 9L0EO9VuoMcEXUtPmMBVWnfFRS9e7MuYrrFy66tNO29+088bYGOXvw== - -----END AGE ENCRYPTED FILE----- - - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZNnhSai9KMjh1RC83UjBm - K2dPZisvcTA3a0JqNzVwWWJkWmp4Mkt5bFE4Ck91TnpJR1dGcnNzNFk0bWJkZENB - elp5NWpGY2F4K052MXZaTzluUkc1NEkKLS0tIFBvbHBZNWlqNitDbmFwbWt4Y2o4 - OVdhWGJQb0hIYXJkbXNGVUlEanJPclEKkX9L1XTFP8euXXcBESc4vGZycYGRTj2e - 9xQW8ABndvyvz9hWXvjD8US9A26nxDyCAoFYluF/dvpt3M4gg4hhBA== - -----END AGE ENCRYPTED FILE----- - - recipient: age10xwq7a4y256yhv02j0u80te0vt4krgfjc68r0uw07t96z7ggmpwqtv38a0 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzd1U4MWNwYVA1WU51cXlJ - SVNkeTBPaTVJWjFKRFZDRWx4a08venB2MmhrCnJzRzFTR1YxS0hSQmp3T29IcUJW - YWVRQkpIRWsxL1FqaElZNEdDcXpxRUEKLS0tIDljL0FZN3VraE42SXg3V0o4cGFl - eDVCaXE5bGRTcW8yN3hpL3FiaHZaYXMK682pq4hOUq29PXvPyrgWlZnxmXlNLXIX - lP4zA+nOCeTn6Mj4ffCr1uwz6Z+KraNzr8cWne5XRod56E+/uYNddQ== - -----END AGE ENCRYPTED FILE----- - - recipient: age1dktk5glcuu34u9t6kp3g2vqyj7dy0elray38t8n75mwa6l0s0vdst2cy00 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhU0EvNmlJaFViNnFrNlJJ - Y1lRajh4cWVnUVRrcDV4QlZITGpqUERLZ2k0CnlOUVhPL2xMdGtMMHo5cExKVEFX - cWlQZGZ0ODRremRINGlFcU5tMUNmZkEKLS0tIHhhU0tHL3NFM1o0Wkw0aE9EanJB - eFAydDVGOTN0b2ZrMHYyMkR0SElHZncKx5oAailIVsgXi1ajrgkYkBIr8AJQtEj8 - YOBoaXBGppSUygMxWHSt4vzdtEBYcC9xaZ7zAKVYQbOODAlSRd58rw== - -----END AGE ENCRYPTED FILE----- - - recipient: age1v458x2q70yt0a6m6cq5ehemphtrzfzyhmeg3r872vsyyf65asgwstmqqk4 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxY1UwdUsvai8rRnd3bzAx - SUhKZ0RHWW1wWXpadWhQOHVYTGRoYXBsbDNJClRjaE5Vai8rbENBaEt2ZE5JNVZL - aUs4ZHVQL3JxTWhibVBmNnVicmM2SjgKLS0tIGkra2kybjRORmlzbUFYcG9zSTVU - MzJrSGdPaldlakloeU1HVHFSdWlUWFkKq2oHlI3o7cIb0NEtOu3q5n9t9jYQmQNe - gfUnJ0BxkE43otBEWU7ZqRsVvsXfJYreq1IRNz4KyLEi0/taTe4QyA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-06-05T09:27:48Z" - mac: ENC[AES256_GCM,data:XXj7KCnNkL0nX3aVz+20aNhOESyfX2O4fKVKyAA0lOwNLHyMb1K0dXyctUVofLd5YvWA2cRFBm33vodlkYeS3wXDhYapeUGI9RJ9CLgFpNS1J6OPureTfW3/a25XSKj7vVnLn9Ng+LVI94MriQlmjg7lCBdat0sBRKEVYktuQEM=,iv:1ptZZ9QjHhhbLn7qp1MDJMlgxrOxzQZqwR64bEM36dg=,tag:25lCi/KmRAUGx8QHRmlohw==,type:str] - pgp: - - created_at: "2025-06-05T09:49:12Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArejJMdC9Xb1EvMlkvUk9Y + MW5LcnhTdktHVlNoMFpYWG0xUkRjZm1GbVVZCjJaNEN5ZHFSeC9YNVBmM0QxM3VK + c1NJRVlzWDQ0QS9XZFpWeEJwTTV2Q2sKLS0tIEcwZ1JjeHhNdXFId2YwQXMyMk52 + NVMzL2U0eUdISlQrLzYvSTlKQkUzancK2dmrpC6+Bl7DrHtx5mvF+c4BRv0HPzjU + aT6GbjP3uZ0/jrRM1REqfLQe0v/AP9yMIenZNLdkfoSELtXpHIIsNQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age1y9urllccdcemlv7g5z4peuzeh5ah0a8nu6cnkvym8v2vfhqjd5jql483c6 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKalYrWUlmN1d5WXpDOEtM + Qmd0SXZMdXpJdVdtcW5lcHZoT3hTMGhTZldFCm5XcEJ4WWgrbW9YQ0lrRzFOYndZ + VE1QTzlMUmdEZkRzakRUOHVrcWZ0dWMKLS0tIHVyeEVtekRnTDY2c25idUpTMXhH + ak1jbnQ0dFBFM3c5TVJvcDlkR1VjcTAKUeMBhu4ZFBYLW9jB63JErQwCsAV3YCKG + kxJTfdaoS3X2QWGIp6s+oE/YYCikKiOR6UxoHoBBgklP8tOXG03cPg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1pmznn2tjpelpmxjxqef48rse5ujggf9kcr8x5vewuadqcw03aavqwy54zm + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCSGpDSGZQVUExL2tXbFQ2 + MldVZGFQNlVULy9BVUYxVXlseTlKL0RhU1F3CnVSUXdoczRjYWJCMnpyWldUMU9R + blJwVXIwdmFRd1JlSURQTEZkTmRkSFkKLS0tIE9VcXRVZytWUTBUV1gzdytrbTla + MjBvNXdWU3Q5ZENraWIrYmlZUmNqRU0KfDDVeBKs9gm1oBufKfSvkNSbdlyjQt3q + is+5wfSgiV7vzvdh7MWqQhyYI3U+JJB2sq2dy8m65GLT5XMJdqm80w== + -----END AGE ENCRYPTED FILE----- + - recipient: age1qju6ms625tlgcjwc9p447seu2p8gu0cr63e5gv5y0wx9mvgmre9slxzzs0 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5SGJ0bTRXN2RSeEprZGtO + NTI5YXRhV3VXWHpsekNWY0N2Rm90WmpVM0JrCmw2dkczbDNwOHViM1B2eVNmMGRS + R2QvMEZIOXhXS2t2RGRDTU9yK3ZJV1EKLS0tIFNwMFJmWFFJMjFPNDVEbk5naGR5 + Q0txMjlPNStWY0RqcEZTS2VBbEF0NWsKS2nLfY2AcTmI3Jkd+xtEw+LCJ0RCXSfW + 9L0EO9VuoMcEXUtPmMBVWnfFRS9e7MuYrrFy66tNO29+088bYGOXvw== + -----END AGE ENCRYPTED FILE----- + - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZNnhSai9KMjh1RC83UjBm + K2dPZisvcTA3a0JqNzVwWWJkWmp4Mkt5bFE4Ck91TnpJR1dGcnNzNFk0bWJkZENB + elp5NWpGY2F4K052MXZaTzluUkc1NEkKLS0tIFBvbHBZNWlqNitDbmFwbWt4Y2o4 + OVdhWGJQb0hIYXJkbXNGVUlEanJPclEKkX9L1XTFP8euXXcBESc4vGZycYGRTj2e + 9xQW8ABndvyvz9hWXvjD8US9A26nxDyCAoFYluF/dvpt3M4gg4hhBA== + -----END AGE ENCRYPTED FILE----- + - recipient: age10xwq7a4y256yhv02j0u80te0vt4krgfjc68r0uw07t96z7ggmpwqtv38a0 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzd1U4MWNwYVA1WU51cXlJ + SVNkeTBPaTVJWjFKRFZDRWx4a08venB2MmhrCnJzRzFTR1YxS0hSQmp3T29IcUJW + YWVRQkpIRWsxL1FqaElZNEdDcXpxRUEKLS0tIDljL0FZN3VraE42SXg3V0o4cGFl + eDVCaXE5bGRTcW8yN3hpL3FiaHZaYXMK682pq4hOUq29PXvPyrgWlZnxmXlNLXIX + lP4zA+nOCeTn6Mj4ffCr1uwz6Z+KraNzr8cWne5XRod56E+/uYNddQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age1dktk5glcuu34u9t6kp3g2vqyj7dy0elray38t8n75mwa6l0s0vdst2cy00 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhU0EvNmlJaFViNnFrNlJJ + Y1lRajh4cWVnUVRrcDV4QlZITGpqUERLZ2k0CnlOUVhPL2xMdGtMMHo5cExKVEFX + cWlQZGZ0ODRremRINGlFcU5tMUNmZkEKLS0tIHhhU0tHL3NFM1o0Wkw0aE9EanJB + eFAydDVGOTN0b2ZrMHYyMkR0SElHZncKx5oAailIVsgXi1ajrgkYkBIr8AJQtEj8 + YOBoaXBGppSUygMxWHSt4vzdtEBYcC9xaZ7zAKVYQbOODAlSRd58rw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1v458x2q70yt0a6m6cq5ehemphtrzfzyhmeg3r872vsyyf65asgwstmqqk4 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxY1UwdUsvai8rRnd3bzAx + SUhKZ0RHWW1wWXpadWhQOHVYTGRoYXBsbDNJClRjaE5Vai8rbENBaEt2ZE5JNVZL + aUs4ZHVQL3JxTWhibVBmNnVicmM2SjgKLS0tIGkra2kybjRORmlzbUFYcG9zSTVU + MzJrSGdPaldlakloeU1HVHFSdWlUWFkKq2oHlI3o7cIb0NEtOu3q5n9t9jYQmQNe + gfUnJ0BxkE43otBEWU7ZqRsVvsXfJYreq1IRNz4KyLEi0/taTe4QyA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2025-06-05T09:27:48Z" + mac: ENC[AES256_GCM,data:XXj7KCnNkL0nX3aVz+20aNhOESyfX2O4fKVKyAA0lOwNLHyMb1K0dXyctUVofLd5YvWA2cRFBm33vodlkYeS3wXDhYapeUGI9RJ9CLgFpNS1J6OPureTfW3/a25XSKj7vVnLn9Ng+LVI94MriQlmjg7lCBdat0sBRKEVYktuQEM=,iv:1ptZZ9QjHhhbLn7qp1MDJMlgxrOxzQZqwR64bEM36dg=,tag:25lCi/KmRAUGx8QHRmlohw==,type:str] + pgp: + - created_at: "2025-06-05T09:49:12Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfAQ/9ENt3lsKgc/XZJYMGHKhQa/kRJT7y12VfhvySitKBGOtr - 5eGQTwUo/4WXBwUb3fPDGC/4Y9MIVuARQzSgzULLy3HG5ESkx6UpOjz38NA6OQSb - fTB+ljVzLgxk5uxB3q3/TUp3nK3PFPlpHpBf/9oIMgGDdoRBqCJWjGQIDaVb1tba - I8l05XsjKv69a/Qo6OXhrScfU83dh136D5yrX65z53MlaVIbH7K4tKxQVLIBkbS7 - iW4uCZfL0GpG3AAEFQj8KXKbPb5ptAxsE7zNX+wml17o42Vzfu3Mtf5xY0zxpttu - oJYZHTq9MxaEMFKHE34QTARMTFeb8MgA+19Cc0V0rKa6ZoB+jKiwyIN+Hg5wiodD - xMT8dqYPnN7cEqB8mPQPojcra3yE8UAiQppAebLxFUXTFIi7H1ZyYR9DmpHJ7b+j - y2ao79gyzDa79PSE3Z3AITnUw+aVrdo+Fv/8tvjAa3VEtz/vVPmYHL1CuLd1huiC - ZwxWUoEcCOqjMq8vUkVb3MsU9+N/Unq+r+5hCwUPDzKfHhZgiyTR8fQLzyROol57 - +tS8OXeE6nbKYVIjGqIjkj+q22RThtMVRIzbouK+ByfhTbI5j8FMgGWapgrG92CL - e3TTINTKNDNH9wbtDlz2N+ywdMv33RuIjCHifnLIYloivt20YIeJeKphZN5F1tjS - XAG/8Ir5mJsgenNWB5kxR755VO556zu5jSvaBqoAltmPutmN4Uig8zKfT4Li9NfP - OHpqyIcg/DN5Un16BS8dxhmJYuG8PZTIE/gKjnDJlwVntsiaoxde3hO/mo8T - =JIPa - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.10.2 + hQIMAw+OdhfgD3wfAQ/9ENt3lsKgc/XZJYMGHKhQa/kRJT7y12VfhvySitKBGOtr + 5eGQTwUo/4WXBwUb3fPDGC/4Y9MIVuARQzSgzULLy3HG5ESkx6UpOjz38NA6OQSb + fTB+ljVzLgxk5uxB3q3/TUp3nK3PFPlpHpBf/9oIMgGDdoRBqCJWjGQIDaVb1tba + I8l05XsjKv69a/Qo6OXhrScfU83dh136D5yrX65z53MlaVIbH7K4tKxQVLIBkbS7 + iW4uCZfL0GpG3AAEFQj8KXKbPb5ptAxsE7zNX+wml17o42Vzfu3Mtf5xY0zxpttu + oJYZHTq9MxaEMFKHE34QTARMTFeb8MgA+19Cc0V0rKa6ZoB+jKiwyIN+Hg5wiodD + xMT8dqYPnN7cEqB8mPQPojcra3yE8UAiQppAebLxFUXTFIi7H1ZyYR9DmpHJ7b+j + y2ao79gyzDa79PSE3Z3AITnUw+aVrdo+Fv/8tvjAa3VEtz/vVPmYHL1CuLd1huiC + ZwxWUoEcCOqjMq8vUkVb3MsU9+N/Unq+r+5hCwUPDzKfHhZgiyTR8fQLzyROol57 + +tS8OXeE6nbKYVIjGqIjkj+q22RThtMVRIzbouK+ByfhTbI5j8FMgGWapgrG92CL + e3TTINTKNDNH9wbtDlz2N+ywdMv33RuIjCHifnLIYloivt20YIeJeKphZN5F1tjS + XAG/8Ir5mJsgenNWB5kxR755VO556zu5jSvaBqoAltmPutmN4Uig8zKfT4Li9NfP + OHpqyIcg/DN5Un16BS8dxhmJYuG8PZTIE/gKjnDJlwVntsiaoxde3hO/mo8T + =JIPa + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.10.2 diff --git a/secrets/sj-srv1/secrets.yaml b/secrets/sj-srv1/secrets.yaml index e876a54..9c563eb 100644 --- a/secrets/sj-srv1/secrets.yaml +++ b/secrets/sj-srv1/secrets.yaml @@ -2,47 +2,47 @@ passwords-root: ENC[AES256_GCM,data:mDQXWfH3zcvIifhmFdB5rfuiImHLX0Wb2WuR5Jb4lBII72AN9sEy436nHKLHdDHYDgzBkTHXDz63SfK28GEckJJKXHPcKuYl/g==,iv:M8tcUyUVuYAIesuGxQHQ/JRDlzeklTBAVgD1oBzsbVM=,tag:E8g5Qo1zAJkCvNPDeAv7pw==,type:str] restic-password: ENC[AES256_GCM,data:0cTVlqHCW/xCk7y3ikh0RtVk/5xFOrcrnQmMbIBtfOd7PYbiTUzwBtYXwOaXO4ob7/+KJUEwhl5TzX/Of1J+y7ML7JbpNPtLr8r0gzDYOvBPY5GlmkDGcorz7QTaomuDprJkoD06lJWme/L893u7rxwamF222D2JvGz5FfTuWfaRWb1PcehBkew89gjdAgqFJJwqlX1vwvQDPg6yj+vnk9ZqR/E967bbQeN/G/qGJ9xfVmeuOPYoZH2IrL0Zgif/FLqZWZtlJ1JnRUBXsVN6FZXfT1Q82euLPOpaUHrFJjAF26PuTwVreIjcBLX3wqc8vhAYWfc+RThS3ITwNdNTSA==,iv:KBqME0cqIIX15xPgKi5mBalk01tswj8xVd8rFETX9zU=,tag:V6KltIGVarWXP1R5lY2FAw==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4bjVmWnlmMSsvSlR3N1Js - ODhHc0RzRHFxK2xmbkM3ZFYyZHFOMkEzcFdrCnVVRGNIc3lLWUNPL0owUGZSZVpv - UjJOc1V1djRBUHA4cG83OEVWci9EbTgKLS0tIFFnV2srUGJ0UWlYMlJRdkc3citK - VUVuZkZPUW52ZjhBUXVzTmVINUkrL00K2I8yT9TQAHRnHpAVF2BvldPPXXnkzovu - 5E0+aVGLn59/LwUNKzDaEy+WHkpNvRID3fXWYLK1Uyl8YxuqfRrj6A== - -----END AGE ENCRYPTED FILE----- - - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLQ2JYaXhMcHhmc3F4dnBF - NWl5ditHeTBrcGJFTGUyM3NKUFNza0RYWFJjCkdkNDdTYmV1b3NNOXNWM3NIMGhB - bi9BVGFqOVgyb2F5dDF1bzI0eDh3VkUKLS0tIHZud2pYNzh5K1BhUHdaSU5jNC9S - ay9vd0dGYXpUUWFEbEtTK245UFV2V00KPXPEAhhL54Hz7m3YSk88hZtPm2WUrY7C - k7fC78uLtALlwnORr6aqj/1+sODaLF1ER/UXfYOGCiIcCZu85C46JQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-19T20:25:37Z" - mac: ENC[AES256_GCM,data:gAn4HAJRiejixDApIBZD87JjHLyOnC9LvYR0E4oDa0GVu6/BLVNbie0zG1TdnYl4LAuLa0rf4gkSDCLNvjkBGesGb7oez06WAHJd3VAK6wyFYxQSxKA8U5OZu8nozciuatTCvc/JL1ZjxxGlDFDSHSP2m1PsB6br2e0g8oL1vJw=,iv:7rOU6w+Ly+OYEnF5SikijEpauMp5lhTae74zDi2vF+U=,tag:EURfxNbEe4ZLFF4l19EzFA==,type:str] - pgp: - - created_at: "2025-06-05T09:49:10Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4bjVmWnlmMSsvSlR3N1Js + ODhHc0RzRHFxK2xmbkM3ZFYyZHFOMkEzcFdrCnVVRGNIc3lLWUNPL0owUGZSZVpv + UjJOc1V1djRBUHA4cG83OEVWci9EbTgKLS0tIFFnV2srUGJ0UWlYMlJRdkc3citK + VUVuZkZPUW52ZjhBUXVzTmVINUkrL00K2I8yT9TQAHRnHpAVF2BvldPPXXnkzovu + 5E0+aVGLn59/LwUNKzDaEy+WHkpNvRID3fXWYLK1Uyl8YxuqfRrj6A== + -----END AGE ENCRYPTED FILE----- + - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLQ2JYaXhMcHhmc3F4dnBF + NWl5ditHeTBrcGJFTGUyM3NKUFNza0RYWFJjCkdkNDdTYmV1b3NNOXNWM3NIMGhB + bi9BVGFqOVgyb2F5dDF1bzI0eDh3VkUKLS0tIHZud2pYNzh5K1BhUHdaSU5jNC9S + ay9vd0dGYXpUUWFEbEtTK245UFV2V00KPXPEAhhL54Hz7m3YSk88hZtPm2WUrY7C + k7fC78uLtALlwnORr6aqj/1+sODaLF1ER/UXfYOGCiIcCZu85C46JQ== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-01-19T20:25:37Z" + mac: ENC[AES256_GCM,data:gAn4HAJRiejixDApIBZD87JjHLyOnC9LvYR0E4oDa0GVu6/BLVNbie0zG1TdnYl4LAuLa0rf4gkSDCLNvjkBGesGb7oez06WAHJd3VAK6wyFYxQSxKA8U5OZu8nozciuatTCvc/JL1ZjxxGlDFDSHSP2m1PsB6br2e0g8oL1vJw=,iv:7rOU6w+Ly+OYEnF5SikijEpauMp5lhTae74zDi2vF+U=,tag:EURfxNbEe4ZLFF4l19EzFA==,type:str] + pgp: + - created_at: "2025-06-05T09:49:10Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfARAAmxdorYO1KLI5NpkQ8GF744tb7Pa37zTQ84At57905S8p - kBFKZW6OXEVFZaog5qQAGv8c4/hjWhRkFsGRlZlda7dUD/LomUG7bUSpZ2tXsbTp - tKvX0GFaqgehYI1UuRNcN0W54jeUq0+W5fqsOaQEwnt6x5qQSk2C8m63q8x0zRcf - fDGwXtGuChyqjUus7qBnLiacnq+XObPOEP5cE46y1Zgl7HjGkfv7dCWekgs1Aq4T - W6D1Hz/33vrudbwMhvcqqHVyL3JPtTVhNrip3Z+DCh7KGq54PmXzKwyIM4eK5OFA - es1SNhVplkX7NQv6539ifWv1ZYA2RMyOheK421yrRKqPyV9faq7kJ9ShRsGViUye - V7OXdlVIHWAYl1WWmIHJWoZ8v+MI44w31J3wBNlY6QsLpR+6T5t6y7j25p2Af1/Q - Mc7htobx2J4DwRZoVGewLYBRQPIoz4qLbKln/m/igsWqn1K/i6AUzRd91qXGII+v - 2cDNDLG5QspwXS02N143/gvk/9f2PZhONmoDGsdvqsTyhoQ4YAWEqCXtx4kqcBE2 - KptK/Ox5A9Z7+UkhE+5nJz5pDOQfCG8kCk8xp5qqwwttyDm1Y9iD+mhwNPCHoBhp - GI+WjJ9lD6KSx2vdMXUkgzma5y2SSQSxRAF8uscqCYjv6glX8tfET9gBW65jrW3S - XAFHYiaOZIDpI5g4XILPNbLIwyrngd+/sOb4aQa3/M4ztRGs7VuUpsiBjecsnamU - qx6qvkSh73AwE3MGrUbzyyCl06gwh/nYgV97NN+PXTkFtd0kr65VfX1W2RrJ - =n6yr - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.7.3 + hQIMAw+OdhfgD3wfARAAmxdorYO1KLI5NpkQ8GF744tb7Pa37zTQ84At57905S8p + kBFKZW6OXEVFZaog5qQAGv8c4/hjWhRkFsGRlZlda7dUD/LomUG7bUSpZ2tXsbTp + tKvX0GFaqgehYI1UuRNcN0W54jeUq0+W5fqsOaQEwnt6x5qQSk2C8m63q8x0zRcf + fDGwXtGuChyqjUus7qBnLiacnq+XObPOEP5cE46y1Zgl7HjGkfv7dCWekgs1Aq4T + W6D1Hz/33vrudbwMhvcqqHVyL3JPtTVhNrip3Z+DCh7KGq54PmXzKwyIM4eK5OFA + es1SNhVplkX7NQv6539ifWv1ZYA2RMyOheK421yrRKqPyV9faq7kJ9ShRsGViUye + V7OXdlVIHWAYl1WWmIHJWoZ8v+MI44w31J3wBNlY6QsLpR+6T5t6y7j25p2Af1/Q + Mc7htobx2J4DwRZoVGewLYBRQPIoz4qLbKln/m/igsWqn1K/i6AUzRd91qXGII+v + 2cDNDLG5QspwXS02N143/gvk/9f2PZhONmoDGsdvqsTyhoQ4YAWEqCXtx4kqcBE2 + KptK/Ox5A9Z7+UkhE+5nJz5pDOQfCG8kCk8xp5qqwwttyDm1Y9iD+mhwNPCHoBhp + GI+WjJ9lD6KSx2vdMXUkgzma5y2SSQSxRAF8uscqCYjv6glX8tfET9gBW65jrW3S + XAFHYiaOZIDpI5g4XILPNbLIwyrngd+/sOb4aQa3/M4ztRGs7VuUpsiBjecsnamU + qx6qvkSh73AwE3MGrUbzyyCl06gwh/nYgV97NN+PXTkFtd0kr65VfX1W2RrJ + =n6yr + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/secrets/sj-vps-htz0/secrets.yaml b/secrets/sj-vps-htz0/secrets.yaml index 873ed3e..a3d5191 100644 --- a/secrets/sj-vps-htz0/secrets.yaml +++ b/secrets/sj-vps-htz0/secrets.yaml @@ -5,47 +5,47 @@ wg0-public: ENC[AES256_GCM,data:AnEK0wlEIlVrz0nubLWr3lv7R1ddzA/RPjP0CosyEJzCJU6c wg0-psk-steveej-psk: ENC[AES256_GCM,data:Z5txIdXKVshlqMBLEnW/ulFiQSmMKj6m1vLE8fuL+zl+tJxh9EX/XvjLaC4=,iv:h4ypudvQAKPM7+5vQNAb69JntdZPNa8Km6wd14ovCHc=,tag:t7ZbbcpRCTAF7zP8vKPpJw==,type:str] wg0-psk-steveej-public: ENC[AES256_GCM,data:KU6aRVK06RkyvvYFzFZaCplz1HyirSfpjW+jjvHP+eTMs3hfhFUnPSZRCN4=,iv:2A019CQD2vjcOmX6PFpDaDCo8yN9oA9kdKxiW1e3Dss=,tag:kfRENOJY7RnwWGN1eOeEhQ==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjTjc1QUtRSWRwaGdOdE83 - WWxsVWpWMXZ2cjZ0RzBiMUVSUVp2dmRKb0c0ClRURUZmWXdHdkR3eVF0Y1ZqYWFR - b253TVhRQSswZGVCSjZoNFVldGhPaFkKLS0tIFJRcno4V0RNSlNoUFc4TzRpL2pG - eEpxZXdNTVBxd1FETWlxdGpZQ3BRdU0KJqQLuwyf8V7bPDLMvuryFrYTZoCmxUlR - mzvYKGQTFNaTcY8fvsSiYxTxXx+WXMLXtz0o2y5fX/1Rz4AW7hW0yg== - -----END AGE ENCRYPTED FILE----- - - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURk5aMnE4THNVVW0rSVRC - Z09lbUdzeHZlOEdmYUE3Qy9BckVNUGc2Sng0CnZRM3VTRXdKbXBDQlBxenFXa1FB - SXBwK0pvQjg5Z1R4djU1NjE5dUI1VEkKLS0tIFV1U2FpWGFFYk9pcVFFTHdrMzdM - RDM0OEFIUWh4SU5LRzJRSUlwcm5BeU0KA2RW/rYniJbIqRRiQfzE+ZZp+DgNODDg - +5xYpgegsBoBwcIkFemYwVXxKy4pzF57FR3oaf/0Gi1imXiKSAPdVg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-08-13T17:03:01Z" - mac: ENC[AES256_GCM,data:AtD2QZsLpOLQB7Jcb0Cn+zGUK/fMzuVhQ2r5f4jL3dttqfaDa4k+bUMP7wQ9RW6cUXm5ps+s1t9TkRUi2P7bkQjtEuyiTGAUiM8OnkJQ26npITWWs8giekKq01m2DlZufWRcrZrQU43EgVNDqRTVlMK1IoVS4zqNwqt4tXG6YWk=,iv:F+BbR5aGg+6/0LBxpC+AoNT4dLutvkgeUJszkMrV5xk=,tag:4Cvd4nG+h1+hXg/NzH0wRg==,type:str] - pgp: - - created_at: "2025-06-05T09:49:10Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjTjc1QUtRSWRwaGdOdE83 + WWxsVWpWMXZ2cjZ0RzBiMUVSUVp2dmRKb0c0ClRURUZmWXdHdkR3eVF0Y1ZqYWFR + b253TVhRQSswZGVCSjZoNFVldGhPaFkKLS0tIFJRcno4V0RNSlNoUFc4TzRpL2pG + eEpxZXdNTVBxd1FETWlxdGpZQ3BRdU0KJqQLuwyf8V7bPDLMvuryFrYTZoCmxUlR + mzvYKGQTFNaTcY8fvsSiYxTxXx+WXMLXtz0o2y5fX/1Rz4AW7hW0yg== + -----END AGE ENCRYPTED FILE----- + - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURk5aMnE4THNVVW0rSVRC + Z09lbUdzeHZlOEdmYUE3Qy9BckVNUGc2Sng0CnZRM3VTRXdKbXBDQlBxenFXa1FB + SXBwK0pvQjg5Z1R4djU1NjE5dUI1VEkKLS0tIFV1U2FpWGFFYk9pcVFFTHdrMzdM + RDM0OEFIUWh4SU5LRzJRSUlwcm5BeU0KA2RW/rYniJbIqRRiQfzE+ZZp+DgNODDg + +5xYpgegsBoBwcIkFemYwVXxKy4pzF57FR3oaf/0Gi1imXiKSAPdVg== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-08-13T17:03:01Z" + mac: ENC[AES256_GCM,data:AtD2QZsLpOLQB7Jcb0Cn+zGUK/fMzuVhQ2r5f4jL3dttqfaDa4k+bUMP7wQ9RW6cUXm5ps+s1t9TkRUi2P7bkQjtEuyiTGAUiM8OnkJQ26npITWWs8giekKq01m2DlZufWRcrZrQU43EgVNDqRTVlMK1IoVS4zqNwqt4tXG6YWk=,iv:F+BbR5aGg+6/0LBxpC+AoNT4dLutvkgeUJszkMrV5xk=,tag:4Cvd4nG+h1+hXg/NzH0wRg==,type:str] + pgp: + - created_at: "2025-06-05T09:49:10Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfARAApmxc/Ubnhh5F2uwxquqpWb/BBH57dS6+qZJ9KdGMcR86 - engG3qbFHZWK2yzCKXh9Sqs7o2Tw80HWSjzgI1+r7YBp6e0FNwaIRCsuxOzlNtKT - M8yVrtkRxoDJ2OnfaarKubpzGR69Zt9Zcvw3Zy8xDyuoDgAuh09q3n3ctVYeAkuV - E6xNSwAv9kPuOGUvjh+XAfB5ZUpOymmOBfKPoT1mdgZ0Q8Ye3oH27oGjfSfyMavB - BKJn8dQXDvTo/mX+7o7e7TPt9NstLoxmMctaE3MIyBX07nunFrdCSooODY7GqV6X - 5q0IyLI5Sy+hqetWRhLZxeF9nyxRhd3FohII8osf/l9WeqPZ6R5BcDJpsHmlOOEl - EOea4gRPWY8x0jJ3jZ6cVyVNINg8TOe2d5BIE6+INaoT2VpVowIPOI91i/0xNVuq - lWrzYJyDxk/7e4XId3GlM/SuEpjnL5cPQMmQRKqZ1lykwhF0ADQZgqzKp28sW1L3 - baq4hk1Gi19SRqaR2FnCioc7Ybxi6VJ6fesLGGGDvK8RAVCY+J1c1q6nUqazEqj2 - S2288c+mLpMyGlPHIaI3Qdyg8Fb27054EzGve2u/MmQpATAMj9hny65qVqcIsx7K - LQHBbdweDyHOZylO5ApGE9uf+0Q2zZjtX2LXN2S9wc8o2KMOfFYHkNEVjwqD4bLS - XAED066xz2GnHM1VdzaXPDw5Jokpp9wma2j9KxeOy0jOW+HNpO2bth3vhTsUwAcj - Dlq1UbIyf+4+My0LKopdCW5SJ8lhyysk4dMISu3m8XP0PVgJY7PzSC8/haty - =ykfJ - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.7.3 + hQIMAw+OdhfgD3wfARAApmxc/Ubnhh5F2uwxquqpWb/BBH57dS6+qZJ9KdGMcR86 + engG3qbFHZWK2yzCKXh9Sqs7o2Tw80HWSjzgI1+r7YBp6e0FNwaIRCsuxOzlNtKT + M8yVrtkRxoDJ2OnfaarKubpzGR69Zt9Zcvw3Zy8xDyuoDgAuh09q3n3ctVYeAkuV + E6xNSwAv9kPuOGUvjh+XAfB5ZUpOymmOBfKPoT1mdgZ0Q8Ye3oH27oGjfSfyMavB + BKJn8dQXDvTo/mX+7o7e7TPt9NstLoxmMctaE3MIyBX07nunFrdCSooODY7GqV6X + 5q0IyLI5Sy+hqetWRhLZxeF9nyxRhd3FohII8osf/l9WeqPZ6R5BcDJpsHmlOOEl + EOea4gRPWY8x0jJ3jZ6cVyVNINg8TOe2d5BIE6+INaoT2VpVowIPOI91i/0xNVuq + lWrzYJyDxk/7e4XId3GlM/SuEpjnL5cPQMmQRKqZ1lykwhF0ADQZgqzKp28sW1L3 + baq4hk1Gi19SRqaR2FnCioc7Ybxi6VJ6fesLGGGDvK8RAVCY+J1c1q6nUqazEqj2 + S2288c+mLpMyGlPHIaI3Qdyg8Fb27054EzGve2u/MmQpATAMj9hny65qVqcIsx7K + LQHBbdweDyHOZylO5ApGE9uf+0Q2zZjtX2LXN2S9wc8o2KMOfFYHkNEVjwqD4bLS + XAED066xz2GnHM1VdzaXPDw5Jokpp9wma2j9KxeOy0jOW+HNpO2bth3vhTsUwAcj + Dlq1UbIyf+4+My0LKopdCW5SJ8lhyysk4dMISu3m8XP0PVgJY7PzSC8/haty + =ykfJ + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/secrets/steveej-x13s/secrets.yaml b/secrets/steveej-x13s/secrets.yaml index ef1b54c..c7566c5 100644 --- a/secrets/steveej-x13s/secrets.yaml +++ b/secrets/steveej-x13s/secrets.yaml @@ -1,46 +1,46 @@ builder-private-key: ENC[AES256_GCM,data:KG5V86SDVM5LfFPZI5rjKGvYwqLZInEqpwdIJPAiF7fMdG3rTq3JgNJCQr0eOhfmLwT3KEN2Fv0mHZS4smMGdh0WCkza8CzRn/KFY8gqEWxxdff1Wqj7+2/5lSI8I7Qp2EW+eaAgU53PPOh/M3Cgm/Rraw2ARmIJNIgtuJC8ZeZlsh3sl0tacF9rgSrP8p4xAH3C/QUs1HW+10eL9F3STtAV+ZBruU68lNmCdiyqKjg3O3qdRFsjdGWAwHNHL42cEm3il4PofyS5fDDF4otQktZa5n8832ukF5Aj6RNgJwubrsxB9+1M9s7hD1UQyKo6oQKJr1GXNK+IPyXAvdxckZ8INhsxP4c4v8GzR0zJK4MfESx0r67ciGLOcYulNBDOMSbD57oW+wRvCI2eZlpB3ugBcUm/rsQbgFVEX8q6jD8WipJ+Q3hz1zWq45s66XooFmnwc2nBhT6cRmtGzTJCcDpiovgj5tKXSXrWfwYO7tWr7lYg8T4zhfplZBtQOaqTUrAOhW7IRT5Lo/310cMRcp1h44TSnpWXZN7l,iv:DOUijPr4wHmjNIniF2IRjinXZ6iyg8Z1Nt5EgFfX5Zw=,tag:VWxHpfpyphtu6XLR1yKugg==,type:str] sops: - age: - - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRMHdBc2dlNHNMRGNMVjQx - aEk0eFpEZVppMHpCQTJsM0JDNGJIOXdXODNrCmhqTnFCNTM3QWZjQm40YzVTS2pB - V29VY2RhcmN1RGR6bEhVU2FmakVFWUkKLS0tIG1GbENQdWF1S2pHWWtRZnRLL1dC - bXJGVTB1WmRJMVd4TFdtcXZxWnJTVHMKeLAbvyypDNUddigWYxmLSaqBK4jNpQyo - oGX/UnFchExIYIqsuasHEUbUsTOJmMj6JJYIb4reSNCUKfLpF81ONg== - -----END AGE ENCRYPTED FILE----- - - recipient: age1y9urllccdcemlv7g5z4peuzeh5ah0a8nu6cnkvym8v2vfhqjd5jql483c6 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwbEM3UDV5WU14RE1wZW5x - NFJDbklaeFNjem1oN3Znc3hVVG9PMEJPemlJCjY2aDFiS1d1bzIvSUFJOW42ZnRj - L3o5Tkx6TVFLRldMQzM3TXlJRnhYR3cKLS0tIFZPckwwZ3RXY0w2NXVSK1NMamJB - MFM1dUY2cWFWc3pJNlhNekovUEgwTG8K7XAKzsKqoUinTiGX9zgRtkLo8OD2WPfx - /jH6IECHhOjMLWOowEzyCcUd1Tmi44FzBytVRYUGfxlLESQmEydHzg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-05-01T16:50:35Z" - mac: ENC[AES256_GCM,data:wDnv7wZLks2EME+JqlBtagVaDZEo9ap3d6xFfnBy2/D4wrJhhYlo8vOYM8GFXEhfa0Jek+9ZlkmXYerLNWLMiUMKWIvk0cvHjxBaR2wcxt9FnynPT9W9hSX7UFhM/eTiJviksOESTI7pqNh9X7ggLSZ0c+O5mBxxEh/bcjz8vIU=,iv:vgvmyvUkZBapCpRbPU3cDgmHsc5NwHzCsMzjHvr/Xc0=,tag:FMI0YrwdCPIFe8tnLQr69w==,type:str] - pgp: - - created_at: "2025-06-05T09:49:10Z" - enc: |- - -----BEGIN PGP MESSAGE----- + age: + - recipient: age1tkvtkw62xy90xc5xdcq836wgyrwlwmdslh76cete5g98vvvhj34qvwdw0g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRMHdBc2dlNHNMRGNMVjQx + aEk0eFpEZVppMHpCQTJsM0JDNGJIOXdXODNrCmhqTnFCNTM3QWZjQm40YzVTS2pB + V29VY2RhcmN1RGR6bEhVU2FmakVFWUkKLS0tIG1GbENQdWF1S2pHWWtRZnRLL1dC + bXJGVTB1WmRJMVd4TFdtcXZxWnJTVHMKeLAbvyypDNUddigWYxmLSaqBK4jNpQyo + oGX/UnFchExIYIqsuasHEUbUsTOJmMj6JJYIb4reSNCUKfLpF81ONg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1y9urllccdcemlv7g5z4peuzeh5ah0a8nu6cnkvym8v2vfhqjd5jql483c6 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwbEM3UDV5WU14RE1wZW5x + NFJDbklaeFNjem1oN3Znc3hVVG9PMEJPemlJCjY2aDFiS1d1bzIvSUFJOW42ZnRj + L3o5Tkx6TVFLRldMQzM3TXlJRnhYR3cKLS0tIFZPckwwZ3RXY0w2NXVSK1NMamJB + MFM1dUY2cWFWc3pJNlhNekovUEgwTG8K7XAKzsKqoUinTiGX9zgRtkLo8OD2WPfx + /jH6IECHhOjMLWOowEzyCcUd1Tmi44FzBytVRYUGfxlLESQmEydHzg== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-05-01T16:50:35Z" + mac: ENC[AES256_GCM,data:wDnv7wZLks2EME+JqlBtagVaDZEo9ap3d6xFfnBy2/D4wrJhhYlo8vOYM8GFXEhfa0Jek+9ZlkmXYerLNWLMiUMKWIvk0cvHjxBaR2wcxt9FnynPT9W9hSX7UFhM/eTiJviksOESTI7pqNh9X7ggLSZ0c+O5mBxxEh/bcjz8vIU=,iv:vgvmyvUkZBapCpRbPU3cDgmHsc5NwHzCsMzjHvr/Xc0=,tag:FMI0YrwdCPIFe8tnLQr69w==,type:str] + pgp: + - created_at: "2025-06-05T09:49:10Z" + enc: |- + -----BEGIN PGP MESSAGE----- - hQIMAw+OdhfgD3wfAQ/9HkWJKy3V5aXqDRgS9O6vFq/AVtCSc5RzBB8SgrKxiSgy - UIGXX6y2k+Iw5sWMwyFanu2Wf+4/36N2HcGlIEDrJG/XvSrBVAteN1dcwYkY1r38 - L8PDrSdP9zBPqnq+R3+Tzp2L0djNA7MYgRD9gm78kRwW7TTSKID5QWhhkQ0X1xuN - mCIeUKVjPQhjJWkV3687QIzyrMGFUwxDz5DbG5lYdAZZXxYmLJpS+Gi88mMfF+bc - ShYLrH6JHYf1zLV0vrHHRUb8C8Nb6eOLX4PKIOC9agMlDdYdi1uH5zSqaxJhWT3j - 7N1APdt2YhODU/P9r+5JtfKML/nAWAlH+ztJy5h5f4uwb0qjlZsEAGEr3VDklC/R - 0Hqos1UQgWPX6KuMTKrtBZbuMg/kvaCjeqYGohhBWdMUOrf0F2uo/z2nUso9mRLF - 0whLeFtMnSdlX2IZG7meyUdD7IVGAbONRLGDAFP7607Bdufn2HXOenXRTebSa4Ei - whaaSVMa7nY57oFIBPW4Itwa6BSslx7PRaZv3ug52m85JZZ++PgBUUcwlz393GTX - Gr3EVKOaZIeeF3BMGApiungfI2sywbcTkUUgX5ULHSuFHNC/zVTOfTeVoTOvScJK - awyceOLGvtl7YuBJTUq2PoSID/RWJ6mj7l88jU3jIXXLmhXMUpCoQl04xJGshtbS - XgFvlmAIic7NjKtNL7lzVm9il+jTe8uqXcxqcgDGNbUdlzPxXfRs3wPoNUW9OOto - Bp8CFmVsnpSy14ss6Rj+qRfvSbZr/R9G/WJXDo5XphPBJJCad8smwGBK2tatwbc= - =O4hn - -----END PGP MESSAGE----- - fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B - unencrypted_suffix: _unencrypted - version: 3.8.1 + hQIMAw+OdhfgD3wfAQ/9HkWJKy3V5aXqDRgS9O6vFq/AVtCSc5RzBB8SgrKxiSgy + UIGXX6y2k+Iw5sWMwyFanu2Wf+4/36N2HcGlIEDrJG/XvSrBVAteN1dcwYkY1r38 + L8PDrSdP9zBPqnq+R3+Tzp2L0djNA7MYgRD9gm78kRwW7TTSKID5QWhhkQ0X1xuN + mCIeUKVjPQhjJWkV3687QIzyrMGFUwxDz5DbG5lYdAZZXxYmLJpS+Gi88mMfF+bc + ShYLrH6JHYf1zLV0vrHHRUb8C8Nb6eOLX4PKIOC9agMlDdYdi1uH5zSqaxJhWT3j + 7N1APdt2YhODU/P9r+5JtfKML/nAWAlH+ztJy5h5f4uwb0qjlZsEAGEr3VDklC/R + 0Hqos1UQgWPX6KuMTKrtBZbuMg/kvaCjeqYGohhBWdMUOrf0F2uo/z2nUso9mRLF + 0whLeFtMnSdlX2IZG7meyUdD7IVGAbONRLGDAFP7607Bdufn2HXOenXRTebSa4Ei + whaaSVMa7nY57oFIBPW4Itwa6BSslx7PRaZv3ug52m85JZZ++PgBUUcwlz393GTX + Gr3EVKOaZIeeF3BMGApiungfI2sywbcTkUUgX5ULHSuFHNC/zVTOfTeVoTOvScJK + awyceOLGvtl7YuBJTUq2PoSID/RWJ6mj7l88jU3jIXXLmhXMUpCoQl04xJGshtbS + XgFvlmAIic7NjKtNL7lzVm9il+jTe8uqXcxqcgDGNbUdlzPxXfRs3wPoNUW9OOto + Bp8CFmVsnpSy14ss6Rj+qRfvSbZr/R9G/WJXDo5XphPBJJCad8smwGBK2tatwbc= + =O4hn + -----END PGP MESSAGE----- + fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B + unencrypted_suffix: _unencrypted + version: 3.8.1