diff --git a/flake.nix b/flake.nix index 2fb5106..745d5a0 100644 --- a/flake.nix +++ b/flake.nix @@ -209,10 +209,13 @@ ./instances/baldur/configuration.nix "${nixpkgs}/nixos/modules/virtualisation/digital-ocean-config.nix" ./modules/nixos/digitalocean.nix + ./modules/nixos/garage.nix - ] ++ homeManagerModules ++ [ - { home-manager.users.bertof = import ./instances/baldur/hm.nix; } - ]; + ./modules/nixos/users/tiziano.nix + ] ++ homeManagerModules ++ [{ + home-manager.users.bertof = import ./instances/baldur/hm.nix; + home-manager.users.tiziano = import ./instances/baldur/hm_tiziano.nix; + }]; }; }; }; @@ -230,12 +233,11 @@ ./instances/loki/configuration.nix ./modules/nixos/garage.nix - ] ++ homeManagerModules ++ [ - { - home-manager.users.bertof = import ./instances/loki/hm.nix; - home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix; - } - ]; + ./modules/nixos/users/tiziano.nix + ] ++ homeManagerModules ++ [{ + home-manager.users.bertof = import ./instances/loki/hm.nix; + home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix; + }]; }; }; }; diff --git a/instances/baldur/configuration.nix b/instances/baldur/configuration.nix index 082ddc7..977c68d 100644 --- a/instances/baldur/configuration.nix +++ b/instances/baldur/configuration.nix @@ -1,4 +1,10 @@ { pkgs, config, ... }: { + + age.secrets = { + garage_bertof_baldur_key = { file = ../../secrets/garage_bertof_baldur_key.age; owner = "bertof"; }; + garage_tiziano_baldur_key = { file = ../../secrets/garage_tiziano_baldur_key.age; owner = "tiziano"; }; + }; + boot = { growPartition = true; kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; diff --git a/instances/baldur/hm.nix b/instances/baldur/hm.nix index 62583f5..5cba2f2 100644 --- a/instances/baldur/hm.nix +++ b/instances/baldur/hm.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ pkgs, nixosConfig, ... }: { home = { language.base = "it_IT.UTF-8"; keyboard = { @@ -26,5 +26,23 @@ # ../../modules/hm/noti.nix ]; + systemd.user.services.garage-home-s3 = { + Unit = { + After = [ "network.target" "network-online.target" "local-fs.target" ]; + AssertPathIsDirectory = "/home/bertof/s3"; + AssertPathIsReadWrite = "/home/bertof/s3"; + Description = "Mount S3 bucket in bertof's home"; + Wants = [ "network.target" "network-online.target" ]; + }; + Service = { + ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_baldur_key.path},use_path_request_style,url=http://localhost:3900"; + Type = "exec"; + }; + Install = { + WantedBy = [ "default.target" ]; + }; + }; + + home.stateVersion = "22.05"; } diff --git a/instances/baldur/hm_tiziano.nix b/instances/baldur/hm_tiziano.nix new file mode 100644 index 0000000..b66552b --- /dev/null +++ b/instances/baldur/hm_tiziano.nix @@ -0,0 +1,35 @@ +{ pkgs, nixosConfig, ... }: { + home = { + language.base = "it_IT.UTF-8"; + keyboard = { + layout = "it"; + options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; + }; + }; + + systemd.user.services.garage-home-s3 = { + Unit = { + After = [ "network.target" "network-online.target" "local-fs.target" ]; + AssertPathIsDirectory = "/home/tiziano/s3"; + AssertPathIsReadWrite = "/home/tiziano/s3"; + Description = "Mount S3 bucket in tiziano's home"; + Wants = [ "network.target" "network-online.target" ]; + }; + Service = { + ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d tiziano /home/tiziano/s3 -o passwd_file=${nixosConfig.age.secrets.garage_tiziano_baldur_key.path},use_path_request_style,url=http://localhost:3900"; + Type = "exec"; + }; + Install = { + WantedBy = [ "default.target" ]; + }; + }; + + imports = [ + ../../modules/hm/__basic.nix + + ../../modules/hm/lf.nix + ../../modules/hm/shell_aliases.nix + ]; + + home.stateVersion = "23.05"; +} diff --git a/instances/freya/configuration.nix b/instances/freya/configuration.nix index 6934d17..5b1f39f 100644 --- a/instances/freya/configuration.nix +++ b/instances/freya/configuration.nix @@ -1,5 +1,11 @@ { pkgs, ... }: { + age.secrets = { + garage_bertof_freya_key = { file = ../../secrets/garage_bertof_freya_key.age; owner = "bertof"; }; + # garage_tiziano_loki_key = { file = ../../secrets/garage_tiziano_loki_key.age; owner = "tiziano"; }; + }; + + console = { font = "Lat2-Terminus16"; keyMap = "it"; }; environment = { diff --git a/instances/freya/hm.nix b/instances/freya/hm.nix index a91fb93..49cc0c6 100644 --- a/instances/freya/hm.nix +++ b/instances/freya/hm.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ pkgs, nixosConfig, ... }: { home = { language.base = "it_IT.UTF-8"; keyboard = { @@ -10,6 +10,24 @@ cava gallery-dl procps wireguard-tools httpie; }; }; + + systemd.user.services.garage-home-s3 = { + Unit = { + After = [ "network.target" "network-online.target" "local-fs.target" ]; + AssertPathIsDirectory = "/home/bertof/s3"; + AssertPathIsReadWrite = "/home/bertof/s3"; + Description = "Mount S3 bucket in bertof's home"; + Wants = [ "network.target" "network-online.target" ]; + }; + Service = { + ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_freya_key.path},use_path_request_style,url=http://localhost:3900"; + Type = "exec"; + }; + Install = { + WantedBy = [ "default.target" ]; + }; + }; + imports = [ ../../modules/hm/__basic.nix @@ -18,7 +36,7 @@ ../../modules/hm/helix.nix ../../modules/hm/kitty.nix ../../modules/hm/lf.nix - ../../modules/hm/spotifyd.nix + # ../../modules/hm/spotifyd.nix ../../modules/hm/syncthing.nix # ../../modules/hm/xidlehook.nix ]; diff --git a/instances/loki/configuration.nix b/instances/loki/configuration.nix index f144415..3d309a2 100644 --- a/instances/loki/configuration.nix +++ b/instances/loki/configuration.nix @@ -1,5 +1,11 @@ { pkgs, lib, ... }: with lib; { + + age.secrets = { + garage_bertof_loki_key = { file = ../../secrets/garage_bertof_loki_key.age; owner = "bertof"; }; + garage_tiziano_loki_key = { file = ../../secrets/garage_tiziano_loki_key.age; owner = "tiziano"; }; + }; + boot = { binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; # kernelPackages = pkgs.linuxPackages_latest; diff --git a/instances/loki/hm.nix b/instances/loki/hm.nix index 3cc6ead..6c0d809 100644 --- a/instances/loki/hm.nix +++ b/instances/loki/hm.nix @@ -1,4 +1,4 @@ -{ +{ pkgs, nixosConfig, ... }: { home = { language.base = "it_IT.UTF-8"; keyboard = { @@ -6,6 +6,24 @@ options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; }; }; + + systemd.user.services.garage-home-s3 = { + Unit = { + After = [ "network.target" "network-online.target" "local-fs.target" ]; + AssertPathIsDirectory = "/home/bertof/s3"; + AssertPathIsReadWrite = "/home/bertof/s3"; + Description = "Mount S3 bucket in bertof's home"; + Wants = [ "network.target" "network-online.target" ]; + }; + Service = { + ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_loki_key.path},use_path_request_style,url=http://localhost:3900"; + Type = "exec"; + }; + Install = { + WantedBy = [ "default.target" ]; + }; + }; + imports = [ ../../modules/hm/__basic.nix diff --git a/instances/loki/hm_tiziano.nix b/instances/loki/hm_tiziano.nix index c8bfaed..e6548b2 100644 --- a/instances/loki/hm_tiziano.nix +++ b/instances/loki/hm_tiziano.nix @@ -1,4 +1,4 @@ -{ +{ pkgs, nixosConfig, ... }: { home = { language.base = "it_IT.UTF-8"; keyboard = { @@ -6,18 +6,30 @@ options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; }; }; + + systemd.user.services.garage-home-s3 = { + Unit = { + After = [ "network.target" "network-online.target" "local-fs.target" ]; + AssertPathIsDirectory = "/home/tiziano/s3"; + AssertPathIsReadWrite = "/home/tiziano/s3"; + Description = "Mount S3 bucket in tiziano's home"; + Wants = [ "network.target" "network-online.target" ]; + }; + Service = { + ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d tiziano /home/tiziano/s3 -o passwd_file=${nixosConfig.age.secrets.garage_tiziano_loki_key.path},use_path_request_style,url=http://localhost:3900"; + Type = "exec"; + }; + Install = { + WantedBy = [ "default.target" ]; + }; + }; + imports = [ ../../modules/hm/__basic.nix - ../../modules/hm/helix.nix - ../../modules/hm/kakoune.nix - ../../modules/hm/kitty.nix ../../modules/hm/lf.nix - ../../modules/hm/megasync.nix - ../../modules/hm/syncthing_tiziano.nix - ../../modules/hm/shell_aliases.nix ]; - home.stateVersion = "21.11"; + home.stateVersion = "23.05"; } diff --git a/modules/nixos/users/tiziano.nix b/modules/nixos/users/tiziano.nix new file mode 100644 index 0000000..f21ee0c --- /dev/null +++ b/modules/nixos/users/tiziano.nix @@ -0,0 +1,10 @@ +{ + users.users.tiziano = { + isNormalUser = true; + extraGroups = [ ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDUZQHsId/If3Gyp3ReUixOHTISHHKR8qIyZw3cg6NXr tiziano@loki" + ]; + }; +} + diff --git a/secrets/baldur_wg_priv.age b/secrets/baldur_wg_priv.age index 0587277..d20e86d 100644 Binary files a/secrets/baldur_wg_priv.age and b/secrets/baldur_wg_priv.age differ diff --git a/secrets/garage_bertof_baldur_key.age b/secrets/garage_bertof_baldur_key.age new file mode 100644 index 0000000..88bacbd --- /dev/null +++ b/secrets/garage_bertof_baldur_key.age @@ -0,0 +1,15 @@ +age-encryption.org/v1 +-> ssh-ed25519 13iwjQ AsFx8iVJwpx7t3htNgiPc74w2++4FZ8UrJSyaMaVdlU +v41S7kr+/WIGlLxk3tEr6IpooM2bj7+UyPepVhY7ihE +-> ssh-ed25519 7MB20A 5nyl9Umzk5URnAthzRRCJPcIShwy/ynj9H3IkZpSh0A ++G4vRBVZpnQGRf1/VT5mDfUhB2v0KdtBEGyXPpxddPc +-> ssh-ed25519 lC44xg OdlP1WQGlZDQVtEC6za2UHhWoIPz/sR4I9TSxaTb0Fc +u+f1yZnS+jbREuUURDde9L0vanN8pS8Hvnjp4WVfFSI +-> ssh-ed25519 Wzv8ew GSIrfubcum6SK4CDNLuIpLgW3X4TUCEJLWziqIdaWHY +kyYDL9F66WluXH+mOMGnT9/83V7u6EN61hjGDSSfzSo +-> kZ-grease y.L$ 9QDf (R*Pxx9 +NlZEacht3TV5rt9IxENTi7y2k/jemBQrE60awqe/rzLXWdNBDD/jnV/Qv4l9WB1B +mr5KLsuB8Vpp +--- 61dt4t7qo7XW5sSqBsgiKEf8KokOvnxaL5N5PKn+Few +{1S8M + ;< U|#u[-fuJ1SV͟zP6 C2ouăTg}:50`V,5l4|W \zj\{xW \ No newline at end of file diff --git a/secrets/garage_bertof_freya_key.age b/secrets/garage_bertof_freya_key.age new file mode 100644 index 0000000..db8ea51 --- /dev/null +++ b/secrets/garage_bertof_freya_key.age @@ -0,0 +1,12 @@ +age-encryption.org/v1 +-> ssh-ed25519 13iwjQ 3w/GW7RQIHZvak9OyXlY1GSUyH4gyxOBqRgUImmhwTI +Ifh3rsSNOcqjqGVVcVoMrZA8LY66xH7n5akhKfATdt4 +-> ssh-ed25519 7MB20A 8ipntDka//l03L1k5D4aDMmTxL9uAgFeeC4EpE/9J2c +Bhrd399nDffvcDHlu3XbmsgumEV0F4r7H0nQ4gWTX3g +-> ssh-ed25519 l795CA vHiFdjDV3D7t5RWBueblz4PCsOb2MkDeBdsYa6aBaSM +yVwFMNpmsLxbCqRZbF9KbYrxf+E9f+uR03l87kOBMR4 +-> MmBCEMT-grease V`LHi]NN +J38l81qUEQzSX3rcZcllXkGbiB6AYP113tXVNEwU5uTvG62okuA59XyK9RykGND5 +S192DM5xRaC6dLeBaBSJJMB4rWquVItPEEIMJg +--- tSg4NbptOX9FxYd+bpNWAyXr/e6pyQipmDpQuwmY4W0 +)#&k-С`(Kr? F1:M۰4yLZJ*g҉[Aj-CW`x*@ɺM{6u-'ϥ능a \ No newline at end of file diff --git a/secrets/garage_bertof_loki_key.age b/secrets/garage_bertof_loki_key.age new file mode 100644 index 0000000..36260c5 --- /dev/null +++ b/secrets/garage_bertof_loki_key.age @@ -0,0 +1,12 @@ +age-encryption.org/v1 +-> ssh-ed25519 13iwjQ WqHEkuTeoiBV3D2V2cq/FkVOPcRr6VPfzrBPKTTxqXI +Q0gaMJBkdxlR4RpGpNDMgzaKLG2g6HN9c6dHe9ROpwM +-> ssh-ed25519 7MB20A ZW9RX2rY9ke40QMp5wnPypY2KrB6KvNlN2+QscXwEU0 +bLYZ5lZsOTW20mLxWjC/CqnNP8CtFT194XyqInXVPqE +-> ssh-ed25519 XgC3XA 6cuA/TI3lUpLYYZX8bqDAVJszMpUmoe+rSat04TiRxs +TIrap0RGvhN8aqflKWxc3FTv/eiBIG+cLW6CpLNOxvM +-> c-grease +zOfAvZb+7LI57UKojcfYknW4lTIcTcTSIQVDmieMDeHrFCw +--- OejDSP2CGGz9D7iBbgOcjbheSf9f3wIP0HosGfUmdx8 +t85@m5f~,m~D.vаo\YW7"PTO"38rQ )H +8 O(y:C2ߨzdy1y:?^?j \ No newline at end of file diff --git a/secrets/garage_rpc_secret.age b/secrets/garage_rpc_secret.age index 884f70b..49c0a5d 100644 --- a/secrets/garage_rpc_secret.age +++ b/secrets/garage_rpc_secret.age @@ -1,27 +1,25 @@ age-encryption.org/v1 --> ssh-ed25519 lC44xg /UYG7u+9GFWJVHK9xIR36ojPwdQ/5t6JnWwafWVc7VE -9Yyvy06yRtz7/z7QfiTHQTSzmKXC8LHr8vGv/yb0S44 --> ssh-ed25519 2L7QNA XiLh3aAiXQdg0uAX3bci6VMWhreI+lX4gQUx/zvmTB0 -OQEIUfCTrpMqNQ+oVD6RE9lBuEruk6nzOWsC+OV23eU --> ssh-ed25519 sNAOqA JrJtnIxQwAUqQkHxP4rTiz0xONP1o1uPv5mlQTgAVTk -uWRMZSBM9TRWI/m0jdYT58B8gYrnMipHcm/i5nB0BUM --> ssh-ed25519 13iwjQ M1g0Jjr95gAVUdBLHnbOzxENuRBYCqUDwog8eYM7tSM -Cum4unjPDvFAnT91zKWFQ8ZC25LDTYnrW/9yXmpUn1I --> ssh-ed25519 7MB20A oNrLYjWR/5ZXxg34n7VUhDovIYopdUreaSuBIsqIlD8 -HamVCxIw/9oiCtuBfQy30K8aqeEzYHNFA2auWXacH8U --> ssh-ed25519 IvyYug p4Z0dz2ytOeBDEAy7gxgkI9g3BGRRFJIrRvaS6sFNSo -rYCrktdZsB0K/pG3DWVCTCGeax+DHPjVAFFJzxFkGFQ --> ssh-ed25519 v7O/FA FoXL/ImaMuC9E7lEo7Q/ZIjba3tFKjPWozWoHGHL6zk -GDM3HIDlQ480qCao7zqsYf7mJLPbQg8zKq4zIeYOiFo --> ssh-ed25519 Wzv8ew YMKFwQpRpFI4hZrT1f/FU6xxVjs7LFeqeZ++N3VDQmU -2jJ0aHqa7cW7q20qfER3ZOObfNy/PmJENOnTXtyxN/4 --> ssh-ed25519 XgC3XA iL2OFvsMeeoxRzbEUAsCzZzi2DsbkHzfydMTMCLUND8 -hZ9eQap4E4LnDHRkoKr9b1kK1cBFxnJ1fn4IhYrQIFs --> ssh-ed25519 l795CA NzhJjnqIkMG2k5LpJ8d1BDkbpjCs9I+06+8Iaa7InEU -f2acQIZC47Ac2DCXpu+rbN6kwrI/FdA06xPVwgroI78 --> rFS^8t&-grease @b]c * -5SG2PV7mP0oTK5EhggwtG4tWJk7jFa5OV7BI0V88P85VlSD2vpsJ05iQLlO4F/JK -+GrSi9P5WihwadCPEjRbIiB+cS7XHw ---- mI29Vmv8Yc5V6eXf3YRuEE9/aXkLXTmhGiJfyFUIKyg -6ά:=Ni!xdV8f`\.~_Lr -T,) ga;͝仉 \i"^%jȊ":'JD[H|C \ No newline at end of file +-> ssh-ed25519 lC44xg fKyNeYZnnNKy/1Hmf4frglrlqrFSPku0vAYZ0/hxYXI +T5bjQxc3jm01AjuARKOgiYu0Ck7h424I/Q1zLhGhaE0 +-> ssh-ed25519 2L7QNA SXSzd7kQOitQXTXrfwcVigtRqpdHWZwlZ+G70byV/GU +fI6QqsCaAHGQN8jbsJcqG0s3Sh7OPkZs/YPS3YZWzGE +-> ssh-ed25519 sNAOqA zkgDsCbB5b3zVenagMaSFnxr0f3FaBOfw1laFlOYJBw +tzqsifABhTv1OF7xVv0poGRWdYqay8ty4FjYcoXLwwY +-> ssh-ed25519 13iwjQ ED7yulwhFPtOZYAMxSozRUypw6aVsqWE9Rc4ad0cDFU +gcMIJRp/DEfzKva+NMvYbj5LAeZSaYraTjh6eosg9E8 +-> ssh-ed25519 7MB20A mucwg2+WnbMFnicIIkAYM1UOWZE0OccQ03snt7tVmUA +j9so4fhphMNBbj+kORoWw3JM/ZrM2CAvUC6reT7N6MU +-> ssh-ed25519 IvyYug bc/VbryQDecnpGtlt9YpyZCNktx2dm+XQNyptfHu8DE ++cRrIhAZaqkRLtG98kyy2pqyQlflgpJZ19rbFoJoqtQ +-> ssh-ed25519 v7O/FA uYq5QLU4M/Pi+Bu/+vGeBkyEoMH/pLeqMBq+Mvya9iA +YJBzCOPOT+WIy6BPeDgkN4ExjDk2WtsjeSRS3f9X+YI +-> ssh-ed25519 Wzv8ew zwqtSvjgHphlpRnmqYy2gs5KSMEtn7aQrDetkC9lTGM +jcVn0IjzTAuRKDbHq8cdYMAuXX6qga9oTggpki3MG0g +-> ssh-ed25519 XgC3XA xyLaja8ncnQQR+Z73G4qHzTrlfGJlP8CJ5GMm+c0omU +y9DeY4mUP1SMp81alyCQwnFaQfypNEE8tx1zoODsJyI +-> ssh-ed25519 l795CA QGlPHj/dKYR7yyORYgzKevpBG6wFoMQHF/Cyb0KapgI +KkGuLDrO+3WA004EWfH9Ra0pjcpM0/UzGZgvZM8K7uY +-> .Of$nhc*-grease ,A)rI +dk3SQxenqoAqoasEp8k18sz3AlyWEg9MD71l+/fx7r2/cO/afydjTIsK7FBbWkY +--- zvRZwmvELEgCGqU6KNxSP4/LCxHPUOQe3hCkCHWBKms +OwOe)@yJi'mYG2]z@T}~Shxݗ6 vvͥ/ G#9iߟ< \ No newline at end of file diff --git a/secrets/garage_tiziano_baldur_key.age b/secrets/garage_tiziano_baldur_key.age new file mode 100644 index 0000000..1fc79c5 Binary files /dev/null and b/secrets/garage_tiziano_baldur_key.age differ diff --git a/secrets/garage_tiziano_loki_key.age b/secrets/garage_tiziano_loki_key.age new file mode 100644 index 0000000..2a6f6af --- /dev/null +++ b/secrets/garage_tiziano_loki_key.age @@ -0,0 +1,12 @@ +age-encryption.org/v1 +-> ssh-ed25519 13iwjQ tgcZo6mfeBiQCVkqofFIZSoaB86pHERYRqdMA2eP2Rk +deRIJdAJCYu8fBlPx9uWSOzNkIPN1EHynZ1VFB4c/ck +-> ssh-ed25519 7MB20A oeuR1oIEifi0Yk++8rwY8fRiBzJy/hwC86d/wB70omM +vPLPbcAWajAW/RLBmF3V/7DKybjnUVRQ4E5UxvjxWHo +-> ssh-ed25519 XgC3XA EcFTg33p5+UUkUPgZ0mNfkuGnttHdIig4xV9W+Mjp3U +u2pGxult8jQW5clMaC2UjwD3mSH0QUUBMEjA1fsjFCQ +-> ^w-grease N\%W}\F fZ16dF +58BH+YEPeDzilIHWnes +--- aYofZjhgBjPu7IpOQH11RMuqZ7UomqlxksYgdFPM0PA + N}ĮߎXk Dܠ[s`w}ðN*og\ 4N=),N̫msp1 +^!1N=̅٤43I#-CVMupF \ No newline at end of file diff --git a/secrets/odin_wg_priv.age b/secrets/odin_wg_priv.age index 94589d0..23b9db2 100644 --- a/secrets/odin_wg_priv.age +++ b/secrets/odin_wg_priv.age @@ -1,27 +1,26 @@ age-encryption.org/v1 --> ssh-ed25519 lC44xg MQOsnpwTj1qMh2mYU0SKSbrX+D5yrEB3RjnTK9pl/l4 -y+0/2TiVPgveza5lbflri6/8n+s8OEtfoQLmSDlwNFU --> ssh-ed25519 2L7QNA GBZzqpw/DDQN01URH5UBLco3c1LYBuBA/uv0s0vq8QM -G/kGJxiOxjIvk+0gxMZ+bmopN6uMtOi671MULcz4YBE --> ssh-ed25519 sNAOqA J3bGC42GTQEovkcsP3tyBtMsVpvYpLJ+x26zlstfJn0 -TH/bCHWUEoiz9IQtUOmA+5QuWkb1J7NxgWWd0fKRYQE --> ssh-ed25519 13iwjQ cpX4DdsrdCx56Z4CqIND7pYBMLLVOhBrzVF1lpZ3XgM -2OCwQnizFNcap8jlFD48QdvvMzoIG4UNDjfAJMFLCJU --> ssh-ed25519 7MB20A ZgyRYgvcfbMwBsQfVjdUdcqDJMKWuwSu09zIM7JoqTk -I4/gwmZ6uMFQhoIUTgED8SATnHYGB9xvxoROk47mGOA --> ssh-ed25519 IvyYug Cnykk336sx8Dn+KbXAwnI3JRgwUjG66HTof83VMzq1g -JUVqnqYCBmHJ4bGDjE4GeuwU2tDTM4sk/PpfnCXcrj4 --> ssh-ed25519 v7O/FA FH+WPPW9aJQ+qnyE+kDen/4lGHZnLH9B0wr08gWdoC4 -atJrku1qtjLamkgvI0UsifecXjl3TFMdGBofg9FH3lc --> ssh-ed25519 Wzv8ew 1DXBPxM8g3ViQ3Mdl9L2wilwKw8gJ5lu1Go2X0Pth08 -BzX1coCBC3Y0PuG8bHQYyD/8ar4on5yUxSmBS+uJC4c --> ssh-ed25519 XgC3XA l8kARj4iXN4l1mWurpVpAqigZMDTLEeWYTbnetwEMxs -IjvcDy1LanWuk8omRquKnWlpUrUnuwUE8hfSeyLuOzw --> ssh-ed25519 l795CA lBhql23V/kfiXB6nuUBKr9VhaVbXfDyvdj2DvTTFLCk -y9a9/GoaxLWqhjvn0Gay9uNVnCLGvkBC2x2AalM/A1A --> d:^:jK^+-grease P -GWeO1heBd0Tp3oH0bQ095xdg7rgxGiGez4VBCW5q+2HJLvTZv484oOQRq+CN+B4F -qA1LoCsela9RzhoCHtkvfQ76jzem9565zC1MyZlmOnpE8LFxPf/vhziCaMrmQIWi -V4k ---- m4x7hE/0As8ZYp0RtCNKJw4g3QEBllAQFLAjXLt7Ze0 -w{>8\s2~EmjlCVIm4__a\  3/ -4Jʗ50 [ \ No newline at end of file +-> ssh-ed25519 lC44xg jrCrsp/zThYrVpwyYBCMkftxp+fdwc8z9ByKibAXllM +Al3phJ69XqGZkQWFITKu2pD86q1XH63/8TvgGJP5vrs +-> ssh-ed25519 2L7QNA /1vnM/rCxSS85e+1h50Y1qtUob/fXcmktpl8V/ysvRk +jY0Wwvp0ZrfZiuTfxVN+0ueTv9NBcjzj6L8xx48nhx4 +-> ssh-ed25519 sNAOqA 5eUZqoikOM1QyvZX+O2c57QrFUCsy0e8yLAt6c++xRM +xUt5TMkkA5Xwp34S3D+Vi0Mtw7Fnw5nvOvuzy9wG2Pg +-> ssh-ed25519 13iwjQ kDugU8ffXnf7juO3o9dvjq0s5Y0AFhVikH3idNai7C8 +8rvLUeAwJOO67jH/7LW4SkPnjR08P7bdHxy7yygvv9Y +-> ssh-ed25519 7MB20A Yl9pf/9E0Omte1OGCJV1Wm0L9jpO9Y3t9NCy7+Ep6hw +NTzsgcdfEtaVBRIK7/e+hKvKEB0H6Qb8Bf6p5qCIDpY +-> ssh-ed25519 IvyYug +a6NcWulDI7EOiVWSDUe7EL/3IsYw7o3Ti8FkHW6lSU +qb5OdO1HOr0WFpjF/fwIpNmcX2vyz6e16/xDP1DPvEs +-> ssh-ed25519 v7O/FA yLODTfXdvNs4rN13IBrVEbry9m7pdmaH3TCuuM5b5CI +Pn0zVooul/lFVa1pZ+y2yuJDxnGFEKYbwo0pD7ffZ8c +-> ssh-ed25519 Wzv8ew FkXEPndwnPV7fAbaFSMlUdHh31y6mA+t7c8mjykRmBk +oRAeGMDePoh3l8XHoiv2bkqY+EkAdcyPYJnsz7/fnTU +-> ssh-ed25519 XgC3XA GZyXppFUSuOkavDW/fC1iYSSqNg1hfS8JDBszRhCtTw +dwpi4Ma0XweQHOznWU5iHi943Vc2aIqyQM5dDzI6Jh0 +-> ssh-ed25519 l795CA 5XCUXoQBkSppSTcwCsErhtDieOngr+lwBnrx6IO9Mm4 +D3McBHTAu1OBwmncHHMlLQyRs8XW0HmXArx0UJxki3w +-> ,}Fr-grease .YX4w$ 0}zV(Hl +avNDwslMoUvEi35Bm3czaQ2cjtU5D3qbRxc0WPMJ2vyCaGokcyKcnB4SiR/aSMqG +0MaRMWU1uM6C+1TsbstR+BUv+SKCKwuIucIZGVS/nTAfvHfGuA +--- fZMyYHG6U6B56X36WnVmSZa+DGYUpLjUYYlZCytE9sI +T**[SeFw4Vt\SlD׿\H*pqh8RbqH2^'J,O \ No newline at end of file diff --git a/secrets/oppo_wg_priv.age b/secrets/oppo_wg_priv.age index 864c4c6..aa3bff9 100644 --- a/secrets/oppo_wg_priv.age +++ b/secrets/oppo_wg_priv.age @@ -1,26 +1,28 @@ age-encryption.org/v1 --> ssh-ed25519 lC44xg Z9RaDb0JbVBLG7+KpVlmh5mi/oOz2cMSP/ITL66SOWY -aALSGRpf1IODsqzc4arKp+YrUud6v3oGeqVsThZ5wtQ --> ssh-ed25519 2L7QNA gqNAVQUGZtzKFxJCmxA/DKJ/ZEM4tZB3wL+dpVw6X0Q -nr8mkJ1WqTAyOEea9WitMRJxYnqecV5+oGmb6YFuH3U --> ssh-ed25519 sNAOqA QB0rbnb35HyyN44jwxb2u5u8aWfan9ktNPEgdVIk52g -TCU7phnf/DMyhZ4E5ZXc3LCqwEWbC5C1S98g88ZjFUM --> ssh-ed25519 13iwjQ ypYebKQM2OsgpoCdVQq3QNKSNZ/+oTDYEdMhwHtwsDA -Eh9s3kC6dFjF7NvtcAmwt/zIBK5kXn+LqLGtknqVoGM --> ssh-ed25519 7MB20A If2LXQVdYMJpok0hjUU1GYmNX4VNJ8bhHfzkwX2n3kw -6UEF27+gBhrZcLaBe5scN0QVkCKSUtja598zTAxmCqg --> ssh-ed25519 IvyYug SZGon3MLj789yMGfyZiIDcVwfzZC0BLFZYPma3gWIFs -wQHTpASfufnGc+QPDuA56ECoYigESL/wVo/kbUxtBpc --> ssh-ed25519 v7O/FA P+VHlrU9rxL3GNbMWfq0J5BgSxeSFSoyZTwG9FhXRRs -eTWRUf0In4uoi0PMX+3TpTBJbU8V8wa5XMTnD33rdVE --> ssh-ed25519 Wzv8ew kRo+OIwnSyoVNmsh4sskkJttJ8fpeHdjh480Xmt7wR0 -77vNZj942WVVx3qFN/NZqI+KHHFaT/145CfmMjC6LpI --> ssh-ed25519 XgC3XA dy3A48uxqMna0hD9TS1YmOyCeJpL1JZti9f7y1Isiik -ZAAHRutLgNEiOj+7kS6DtqQpNSk5CwTa32wLc5rBhPY --> ssh-ed25519 l795CA ZgcVl+Ea0nZpHNQNvLgBTD+DHzz5odN3Pw6xAT8BQhQ -DmB3Yl19+taWk2r7HvDB+oFXmyNJYKFbu4rJIGvYnCs --> nr:n[-grease *z #R=tf 3! TR@,U(% -710uDuet/sVD1mEV+OuQGNZQTtfPSF2R5zSZI3cMPbsoJO/tNbzcpqy6BC7YCAuz -UlaGBNdBrERq ---- ZS8S8G4uTjw6PwljoDWkNyTQ3XgJEj5ujm0aFCeMkKg -5[0BxzzZ?IX)=DU N*`=qzmw> ssh-ed25519 lC44xg rc27sS+HohWGggjhdmy2UqtrYL3uz13ci93ZP/KXwgY +/koXh3zylNDXtkOoSVyxVLO2hd3pCNXJm0v181ehZKo +-> ssh-ed25519 2L7QNA Wjj75d+0C2BVl75lLmMGeiU0X+G4ECnSzJZ0WWKon2M +IJk2WiOOacPqXRrcMOY1wvEbP9bgwvFSeW5HR27uWi0 +-> ssh-ed25519 sNAOqA d7vZIRPE+Puj0QIascQxiUYuTrObztccQlGSSrIp80M +28L1ws5tEbt/fbZlAoCDL7RErd+NimbHp3Gc4tGEYwk +-> ssh-ed25519 13iwjQ 3gTeleNrstbA8Le8+spe8AvtAAbmwx90q0TRELuFTGk +PvBThPUu3Rld5QQ/nBd0skWWhr+X81oDou+BA3DRF4k +-> ssh-ed25519 7MB20A 2+QFTmy6gbDgElO4XlabrJ2sCaWBLKd4mzN5ixRjUGk +lBqK0tWr+rtSx2IhqatoevbCshF88qQ5XVtIk2THu2Y +-> ssh-ed25519 IvyYug EW1GXV+sSHjTaxCaSHjdnk0vEcg8VyRFhLlru7s2NWc +36f5dmU0kiQlGCXYhEIcQVVfi6BPWWE80HW594uFxik +-> ssh-ed25519 v7O/FA rRSLr8PzVFugNs18M2jpJsfakShCxoNI71aWyp8s+jc +Dy4SQ3w13yFrBsBxCk8ACl9GaF5VptIU2KimLyaZkjY +-> ssh-ed25519 Wzv8ew 0bLnph/HPDlQk8IcP95KsjhhaGOY+CPYtTTmM0l8nFY +XIWDMu4YbkxEUQsoZ6SPuPqRy0qCQotFlzetE20awDk +-> ssh-ed25519 XgC3XA vSjXRw//VhqNUDZBwNCAA/Lucy2SeKnqEnHdK9/IPCE +L6Xzjfn0z4cMhpac+n199J/EmX1AHcKGl2Bh3C6VYfw +-> ssh-ed25519 l795CA TPIC2cxXUbZU0K9YRgP/X5OrATm6N54mrwmK4UoisD0 +HB6HMnIQhpNBl0ui39BvyzohanF065YfoE4t6csR8zU +-> ./[|8K*5-grease K}qT[ JaptZ^gG nQm R$vG +I2+u/rBKEzU0nJq3PXl+gX81gSQ8zjLu8T0UXOmE0Pr+SQ/vJWPvWQ+HoRke18J5 +rfGhxc8Ecxum548KAHjC7LW7CdvQrNSpwBLmQDI+vp4/+Zkhd7g47r2DUDsjhihl + +--- NYlZxIKZ+d/yVcRbZloWf+6DZ5c+6RsRlQkrvA61dvY +EFIlSb)TEr? M ssh-ed25519 lC44xg NIQkDcUuZvOwjoYDeS6nazRZRMEZzuBaMBkoFYP13hY -bI2U06gidJOPQlF/vEmUjAGPaYeNWhLb+yCh+sTitWU --> ssh-ed25519 2L7QNA B/sm9v1N86NOsxLnhc+RVod7F/x4XG4XeDNZxDjfaUI -jbt3F/EK+cT457WIfPRK9YZHDFnUd9ZRAMmBJ35eQjk --> ssh-ed25519 sNAOqA dHO1dOYZdSerazDq+QaS+SWHR4To47v/h2fcUC0oxXM -WOvcuwo+RzcwBa5dQu9IOk0aGcPxRK/FCb/mTuQoKxY --> ssh-ed25519 13iwjQ GLj8P8yN9QazLvtTeV4uJOPY9m6G3IKZgLSz4qriaHg -BPQeyR2LG2Jrj4Rhmt1H2MAQR1VtYfQdouu2RX3+CZ8 --> ssh-ed25519 7MB20A NOZeTcMvJXd65aKyl/kj3E9AzEmzrJgehIw6ubNMmiA -RCPIwXmO4Li+YTZ6dSpqZrYWuMwMwTT/6cRlX+Pirpo --> ssh-ed25519 IvyYug /+DfO93aLrySU004zFMIOjy+DOIjf8iP8rExspblCD4 -RFHPk4sgHRrE047JQKR4ccBRx3ZfzvG9YrFg01EBcr4 --> ssh-ed25519 v7O/FA 2vmbVPa4ZVZ5JXYt9pnNPpqLYf5kLHfW76MLsSOUGCs -uVCAaF3O9DIr7JUR8UN9LIZ1s2cva50BiokWbpiVYSI --> ssh-ed25519 Wzv8ew v2MKEJwgcpNwDh9ppwaUck8tXpksr3QyLmwumwrfrx0 -3HB+QGjjQNAgT53Ft6QiiI1mimruZodu9LccT/Rf9hE --> ssh-ed25519 XgC3XA agOnAlZ4mCfdE5OatNel1Htxioq6PZAWC2VLhLbuIzI -yYCMrxTgjtt/aXMbhwNlRRm/XWj8FnznWe/lwfvK3eo --> ssh-ed25519 l795CA Zefi4AYzfEdbBFne59wKi8zS8R5j0BS9711UTp/AmVs -JbUX01jBByQihptYhcbT9Swg2pmj8rxuCJO0pQzvQaw --> -3=CGi4-grease F SeK([U fUNnx-A nv -nSRW0O5NweyggNFkjRBItvvmfnL5e2AkYGgxfUTebQsayYlgRQp3h58LnQxcvxxs -utxluLJHJw ---- +DEy9ZdW46fBBq6B9BQyNt+cMaAD9xvoc5Z+HX2D4V0 -BG 1-T[XXavW#rIf3#qjj7 \ No newline at end of file +-> ssh-ed25519 lC44xg 0gHB58Ad2AC3kYdeg43RdoSC2hEt1LwUhTPTx8GgmHM +sf9FmtzNC2rGLpxP9QNoi7EvAczWr3hovN52zrsURcY +-> ssh-ed25519 2L7QNA 6k0aa6a9mQk0kYVz5p0haLJ/kQdAR5KtyPLB2qm8U3U +EM+Sunppb1757KPnyypCqVPBGVsm7GlNjvQ7HH9j8xs +-> ssh-ed25519 sNAOqA Qk0FISRfW2xXoh4z7sa8pbF8gJe1l9c34F5XpsxVyUk +IGdJLVVrjwKJBaAf5V13r5XLTCLBrA1eDglwrjvbUyI +-> ssh-ed25519 13iwjQ nN7aCTShNzcHOEtKsWkePqWV4tFOzYnA3kaDRVjI9nY +9YKk3pREj1VQ7XX8sNR0Xd/7JzlX2hE8VKROyZABjRI +-> ssh-ed25519 7MB20A 121SOWhTrmpxstHY8Yu0eR40NTcMdjbgI7642xdJQSE +pUl6zCzDU1rxK3liXjwXSvZd/F2dvJkCPxwcMBIJp7M +-> ssh-ed25519 IvyYug yurKVq3uwNdZMmwJ5uNfHzJrwvNf68RxGZPlEp6s60w +XMYIR3uKSVPZRgXOuJIkErKsiX1wX4QDF5hP1boV3Xc +-> ssh-ed25519 v7O/FA /Fs7bJSyfHKhptGu/qlKPlIT2lFzR0bIOor6WTPfrRo +XtscTFxHQTGpp6/N0BZbsA64szD1ILhrDKsFedRP1x8 +-> ssh-ed25519 Wzv8ew NXEsLFb07nHtjXGX4Bq2Lkthiju+JgXN/rn5iglN2hY +MJnDsrU5FzpxjslIyzZkcUPsZgquQDuNEw87dZmRwmc +-> ssh-ed25519 XgC3XA /UznqHwNPo83Ja26Q0u+AuDzxoNZGjczBbiBPNRivyw +xW17MVnL9F0AJQ3csNQD86qiEawj2u73jk6R0qo9vnE +-> ssh-ed25519 l795CA 8o481BVS6quTkeTuJ1pyEV/rl0jHfeBaCSPrmaXnq1k +8gVSYNDZmW95SzxqnLPa+IBKuUs5oTaCxNoWdPLrszk +-> e-grease +r92PuQivcdnFHzHT6wJc+5SHVCQ4oKFzobktKyt79QflZpPVwGFTU6AlGA/tBj9W +K5ISbKwoMf0GDaVCRmaPLeJhRIKrnF8fJJhLoSVOmpeLaaTrMB8ddrHIdPnFiG9C +pg8 +--- 4z7qEW2K/a/tOHUzYq/xzc4RUorilqdszes6bFMuQ6U +7%3 EїC=-swM $c铿L{ \ No newline at end of file diff --git a/secrets/thor_wg_priv.age b/secrets/thor_wg_priv.age index 864c4c6..6fbb724 100644 --- a/secrets/thor_wg_priv.age +++ b/secrets/thor_wg_priv.age @@ -1,26 +1,25 @@ age-encryption.org/v1 --> ssh-ed25519 lC44xg Z9RaDb0JbVBLG7+KpVlmh5mi/oOz2cMSP/ITL66SOWY -aALSGRpf1IODsqzc4arKp+YrUud6v3oGeqVsThZ5wtQ --> ssh-ed25519 2L7QNA gqNAVQUGZtzKFxJCmxA/DKJ/ZEM4tZB3wL+dpVw6X0Q -nr8mkJ1WqTAyOEea9WitMRJxYnqecV5+oGmb6YFuH3U --> ssh-ed25519 sNAOqA QB0rbnb35HyyN44jwxb2u5u8aWfan9ktNPEgdVIk52g -TCU7phnf/DMyhZ4E5ZXc3LCqwEWbC5C1S98g88ZjFUM --> ssh-ed25519 13iwjQ ypYebKQM2OsgpoCdVQq3QNKSNZ/+oTDYEdMhwHtwsDA -Eh9s3kC6dFjF7NvtcAmwt/zIBK5kXn+LqLGtknqVoGM --> ssh-ed25519 7MB20A If2LXQVdYMJpok0hjUU1GYmNX4VNJ8bhHfzkwX2n3kw -6UEF27+gBhrZcLaBe5scN0QVkCKSUtja598zTAxmCqg --> ssh-ed25519 IvyYug SZGon3MLj789yMGfyZiIDcVwfzZC0BLFZYPma3gWIFs -wQHTpASfufnGc+QPDuA56ECoYigESL/wVo/kbUxtBpc --> ssh-ed25519 v7O/FA P+VHlrU9rxL3GNbMWfq0J5BgSxeSFSoyZTwG9FhXRRs -eTWRUf0In4uoi0PMX+3TpTBJbU8V8wa5XMTnD33rdVE --> ssh-ed25519 Wzv8ew kRo+OIwnSyoVNmsh4sskkJttJ8fpeHdjh480Xmt7wR0 -77vNZj942WVVx3qFN/NZqI+KHHFaT/145CfmMjC6LpI --> ssh-ed25519 XgC3XA dy3A48uxqMna0hD9TS1YmOyCeJpL1JZti9f7y1Isiik -ZAAHRutLgNEiOj+7kS6DtqQpNSk5CwTa32wLc5rBhPY --> ssh-ed25519 l795CA ZgcVl+Ea0nZpHNQNvLgBTD+DHzz5odN3Pw6xAT8BQhQ -DmB3Yl19+taWk2r7HvDB+oFXmyNJYKFbu4rJIGvYnCs --> nr:n[-grease *z #R=tf 3! TR@,U(% -710uDuet/sVD1mEV+OuQGNZQTtfPSF2R5zSZI3cMPbsoJO/tNbzcpqy6BC7YCAuz -UlaGBNdBrERq ---- ZS8S8G4uTjw6PwljoDWkNyTQ3XgJEj5ujm0aFCeMkKg -5[0BxzzZ?IX)=DU N*`=qzmw> ssh-ed25519 lC44xg de1Sc658D8ei+fBg6GglHeiHJcY6z2ehBU8mukeaYio +/k472CZ1pdrQM7sZXVU9cY3ncN8s8y/tc/4cTJHiYLw +-> ssh-ed25519 2L7QNA /SZETOcl4h555aIuzorIIA0S1FwEwEdk/Pe3IzHyx3I +SswI9WFERLjYqlLvDglJ+5OPX8MOF3l09JzrppPkU0M +-> ssh-ed25519 sNAOqA nOJL9VV6Ggdys5nXI18yuTaQ14cJKWwrlbdgyWJQ+1w +iX+gfjIA7t0WZv+HUTwdhyp8bPVPL0xNgY1GzGv64H8 +-> ssh-ed25519 13iwjQ MXYOLjRpRrvzQOMBGHG/PxbR18ByF6k3MKB1cVjbWho +7swYV73PEDQyHvpx1qcTnM8i310neG4qBX7xxWk6vuo +-> ssh-ed25519 7MB20A VDjE3VK42iOklyXNQiHKMGP4qUWSG/jjheWGpP+bFDg +wcFhptV4Tdz/BXX+XmSfysXUdoSJ+NtXArieYcWEwzI +-> ssh-ed25519 IvyYug yV8LDUPG5WoWDYjOJvqsSbO/op93zC17huYyeWMt2GE +Btwpdu9ueFt/RDT4Qhjp5lpNVnF48Kalqp3mysaSrU8 +-> ssh-ed25519 v7O/FA UacGTcDsLlPSGWdeR5AlDCvJLc4zHJV0wYHj5ey4qkI +F1WzlwNafvy97uAze+l5slMmj8C/yxczHDIFfnM/QiE +-> ssh-ed25519 Wzv8ew kwkUXUYPyeYd4nCyZZyw+V8pKgz72BerKGpUnbC+Uj8 +nObTUaBdCa1FKWBULPzWHt24SdJE2oovsLIao/mPeg8 +-> ssh-ed25519 XgC3XA nuR8Kxz156U/iwQIezvJhRp7jZSn78XKKjj05ElmTzY +P1m/sdV6ayfYUN0u1wa9iKjYOvdImhdFIxce5emXKJI +-> ssh-ed25519 l795CA KsxUDmmcPFwr01QDA7IkM06nlehO1KzS4X7+RvY9v0M +T1otcPaj8isdkBmIiTKVRP7mBtOMPJcK4kT4kBPFmlc +-> s?rrHr-grease 05 1Y&9x(4x 6Q +4u6CIYjKdKIHU81L0pXPLkfa0Q +--- +hRThvjEc2wUhfTMLyo7wrkSOVjltaIZ8WQJyK04H2Q +ryY@BG @Q[;ռ Z