chore(website): update redirect maps for dev preview and keys page

Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.dev>

markdown/keys/index.md

@@ -1,31 +1,33 @@
 ---
 title: Cryptographic keys
 ---
-This page contains all the cryptographic public keys I use for different purposes, ranging from
+This page contains all the cryptographic public keys I use for different purposes,
-encryption and decryption to signing Git commits and even identity verification without requiring
+ranging from encryption and decryption to signing Git commits and even identity
-an government-issued ID.
+verification without requiring an government-issued ID.
 
 ## Keysigning ceremories
 
-_This is moved to [Encrypted communications](../user-manual/encrypted-communications.md#key-signing-ceremories)._
+_This is moved to [Encrypted communications](../user-manual/encrypted-communications.md#key-signing-ceremories) section of the personal user manual._
 
 ## GPG Keys
 
-You can get all the GPG keys I use publicly, including the 2021 key (as shown on Keybase) and
+You can get all the GPG keys I use publicly, including the old 2021 key (as shown on
-ProtonMail-specific encryption key in one file [here](./pgp.asc). Make sure to check the fingerpints
+Keybase) and ProtonMail-specific encryption key in one file [here](./pgp.asc). Make
-and/or key IDs against [this list](#keys-i-use) to ensure its the right key.
+sure to check the fingerpints and/or key IDs against [this list](#keys-i-use) to
+ensure its the right key.
 
 ```bash
 # one-liner import from my website (or via ajhalili2006.vern.cc and ctrl-c.club/~ajhalili2006)
-# For my eu.org domain, use either the regular suffix or uk.eu.org one.
+gpg --fetch-keys "https://andreijiroh.dev/keys/pgp.asc"
-gpg --fetch-keys "https://andreijiroh.eu.org/keys/pgp.asc"
 # sourcehut/gitlab, but it is advised to import latest keys and signatures from keyservers, listed below
 gpg --fetch-keys "https://meta.sr.ht/~ajhalili2006.pgp"
+gpg --fetch-keys "https://gitlab.com/ajhalili2006.gpg"
 gpg --fetch-keys "https://mau.dev/ajhalili2006.gpg"
 ```
 
-If you prefer to load it from a keyserver (let say you're an Ubuntu/Debian developer snooping around my
+If you prefer to load it from a keyserver (let say you're an Ubuntu/Debian developer
-[Launchpad.net profile](https://launchpad.net/~ajhalili2006)), you can do so with these command below:
+snooping around my [Launchpad.net profile](https://launchpad.net/~ajhalili2006)),
+you can do so with these command below:
 
 ```bash
 # Other keyservers: pgp.mit.edu, keys.openpgp.org, keys.mailvelope.com
@@ -38,21 +40,21 @@ gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys \
 
 ### Keys I use
 
-* `4D5E631758CB9CC45941B1CE67BFC91B3DA12BE8` - the December 2022 PGP key used for commits and encryption
+* `4D5E631758CB9CC45941B1CE67BFC91B3DA12BE8` - the December 2022 PGP key used for
-(primary email: `ajhalili2006@gmail.com`)
+commits and encryption (primary email: `ajhalili2006@andreijiroh.dev`)
-* `0527234A430387EA5695D824A30EBE40AD856D88` - the Feburary 2021 PGP key, as shown on my Keybase profile
+* `0527234A430387EA5695D824A30EBE40AD856D88` - the Feburary 2021 PGP key, as shown on
-(primary email: `andreijiroheugeniohalili24680@gmail.com`)
+my old Keybase profile (primary email: `andreijiroheugeniohalili24680@gmail.com`)
 * `A715100E58CF60500EE159652F384539C700B263` - Recap Time Squad specific key
-* `EA957E7086E934F8DB9CAD21940047813E9D641C` - spare signing key for software release, especially on my own
+* `EA957E7086E934F8DB9CAD21940047813E9D641C` - spare signing key for software
-Debian package repos/Launchpad PPAs.
+release, especially on my own Debian package repos/Launchpad PPAs.
 * `5D69E717C5BC95731C2AD8BD120C218ED2291996` - ProtonMail specific encryption key (`ajhalili2006@proton.me`)
 
 ## SSH Keys
 
 You can also get all the keys in one file (and its signers file) at the following URLs:
 
-* Website as its deployed via CI: <https://andreijiroh.eu.org/keys/ssh-trustfile.txt>
+* Website as its deployed via CI: <https://andreijiroh.dev/keys/ssh-trustfile.txt>
-* As pushed via Git: <https://mau.dev/ajhalili2006/tildeverse-web/-/blob/main/markdown/keys/ssh-trustfile.txt>
+* As pushed via Git: <https://mau.dev/andreijiroh-dev/website/-/blob/main/markdown/keys/ssh-trustfile.txt>
 
 These SSH keys are used for signing Git commits and tags occassionally, as well for signing checksums file and identity verification on
 account recovery for sr.ht and Miraheze.

mkdocs.yml

@@ -115,14 +115,18 @@ plugins:
   - redirects:
       redirect_maps:
         "user-manual/portfolio.md": "portfolio/index.md"
-        "dni.md": "user-manual/dni.md"
+        "dni.md": "https://wiki.andreijiroh.dev/garden/user-manual/dni/"
         "resume.md": "user-manual/resume.md"
         "blog.md": "https://blog.andreijiroh.dev"
         "socials.md": "links.md#socials"
         "communities.md": "portfolio/communities.md"
         "tildes.md": "portfolio/tildes.md"
         "projects.md": "portfolio/projects.md"
-        #"contact.md": "contact/index.md"
+        "user-manual/index.md": "https://wiki.andreijiroh.dev/garden/user-manual/"
+        "user-manual/boundaries.md": "https://wiki.andreijiroh.dev/garden/user-manual/boundaries/"
+        "user-manual/communications.md": "https://wiki.andreijiroh.dev/garden/user-manual/communications/"
+        "user-manual/dni.md": "https://wiki.andreijiroh.dev/garden/user-manual/dni/"
+        "user-manual/encrypted-communications.md": "https://wiki.andreijiroh.dev/garden/user-manual/encrypted-communications"
   # debugging/bug reporting purposes only, proceed with caution
   #- info
   - git-revision-date-localized:

overrides/main.html

@@ -18,21 +18,21 @@ For updates follow <strong>@ajhalili2006</strong> on
   <span class="twemoji mastodon">
       {% include ".icons/fontawesome/brands/mastodon.svg" %}
   </span>
-<strong>the tildeverse</strong>
+  <strong>the tildeverse</strong>,
-</a>,
+</a>
 <a rel="me" href="https://bsky.app/profile/andreijiroh.dev">
   <span class="twemoji bluesky">
     {% include ".icons/simple/bluesky.svg" %}
   </span>
-  <strong>Bluesky</strong>
+  <strong>Bluesky</strong>,
 </a>
 and
 <a href="https://substack.com/@ajhalili2006">
   <span class="twemoji substack">
     {% include ".icons/simple/substack.svg" %}
   </span>
-  <strong>Substack</strong>
+  <strong>Substack</strong>.
-</a>
+</a> (<a href="https://recaptime.dev">Looking for Recap Time Squad?</a>)
 {% endblock %}
 {% block container %}
 <div class="md-content" data-md-component="content">