From 84f090d0ec460f15fc26ada67cd36c4bd1fe0137 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Sat, 12 Oct 2024 19:37:10 +0000 Subject: [PATCH] docs(global): update content and broken scripts Signed-off-by: Andrei Jiroh Halili --- bin/deploy.sh | 3 +- markdown/contact/details.md | 48 ++++++++++++++----- markdown/contact/else.md | 8 ++-- .../user-manual/encrypted-communications.md | 11 ++++- overrides/main.html | 3 +- overrides/partials/content.html | 10 ++-- 6 files changed, 60 insertions(+), 23 deletions(-) diff --git a/bin/deploy.sh b/bin/deploy.sh index 4c2ab77..ca8f8d8 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -18,7 +18,6 @@ info() { echo "info: $*" } -if [[ $CI == "true" ]] && [[ $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web" ]] - && [[ $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ]]; then +if [[ $CI == "true" ]] && [[ $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web" ]] && [[ $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ]]; then npx wrangler pages publish ${_root_directory_git}/public --project-name ${CF_PAGES_PROJECT_NAME} --branch main fi \ No newline at end of file diff --git a/markdown/contact/details.md b/markdown/contact/details.md index cf4668f..61aa1e6 100644 --- a/markdown/contact/details.md +++ b/markdown/contact/details.md @@ -8,33 +8,59 @@ This page contains all of Andrei Jiroh's contact details for convenience, though you should not abuse them (or else get blocked). -## Email +## πŸ“§ Email !!! info "Please just use one email address when sending messages privately." Don't send your email to multiple addresses (even as BCC or CC), it might cause duplication. -The most preferred address to use is either [:e-mail: **ajhalili2006@andreijiroh.xyz**](mailto:ajhalili2006@andreijiroh.xyz) or [:e-mail: **ajhalili2006@crew.recaptime.dev**](mailto:ajhalili2006@crew.recaptime.dev), -although if VK WorkMail has flagged your mail as spam and you don't want to fill up not-spam forms, -[use this Tally form](https://tally.so/r/nrB4o2) as an alternative. +The most preferred address to use is either [:e-mail: **ajhalili2006@andreijiroh.dev**](mailto:ajhalili2006@andreijiroh.dev) +(my personal address) or [:e-mail: **ajhalili2006@crew.recaptime.dev**](mailto:ajhalili2006@crew.recaptime.dev), +(my RecapTime.dev staff address) although if Uberspace or VK WorkMail has flagged your mail as spam and you don't +want to fill up not-spam forms, [use this Tally form](https://tally.so/r/nrB4o2) as an alternative. * **Gmail user?** You could try sending mail to [:e-mail: ajhalili2006@gmail.com](mailto:ajhalili2006@gmail.com) (sharing docs and files over Google Drive are fun but please no spam). * If you're using Microsoft 365 (personally), you may also try sending (or sharing OneDrive files) to [:e-mail: ajhalili2006@outlook.ph](mailto:ajhalili2006@outlook.ph). -For work-related file sharing, please use my `@crew.recaptime.dev` or `@andreijiroh.xyz` email address instead. +For work-related file sharing, please use my `@crew.recaptime.dev` or `@andreijiroh.dev` email address instead. -## Over at socials +## πŸ’¬ Chat -For the full list, see [this page](../links.md). -You can obviously ping/tag me, but please be careful, especially when replying to others' posts. +### :simple-telegram: Telegram + +### πŸ€– Discord + +My Discord username (`ajhalili2006`) is pretty much the same across my socials. If we are in in any common +Discord servers, please contact me in an appropriate channel within the server. Direct messages are probably +fine too, but I rarely check them on Discord. I am often looking at these Discord servers: + +* lounfe.andreijiroh.dev ([invite link](https://discord.gg/TBD)) +* Gildedguy's Gilded Guild + +## πŸ‘₯ Over at socials + +For the full list, see [this page](../links.md). You can obviously ping/tag me, but please be careful, +especially when replying to others' posts. If you want to slide into DMs, only slide via my main account and not any of my alternate accounts (although -I may look into them but reply on my main). -The following are my main accounts across the internet, in order of preference: +I may look into them but reply on my main). The following are my main accounts across the internet, +in order of preference: * :openweb-icons-fediverse: [@ajhalili2006@tilde.zone](https://tilde.zone/@ajhalili2006) or [@ajhalili2006@verified.coop](https://verified.coop/@ajhalili2006) -* :material-twitter: [@ajhalili2006@twitter.com](https://twitter.com/@ajhalili2006) (or `@ajhalili2006@x.com` if you're pedantic) * :simple-tumblr: [@ajhalili2006@tumblr.com](https://tumblr.com/ajhalili2006) ([askbox](https://www.tumblr.com/new/ask/ajhalili2006)) +* :material-twitter: [@ajhalili2006@twitter.com](https://twitter.com/@ajhalili2006) (or `@ajhalili2006@x.com` if you're pedantic) * :simple-linkedin: [@ajhalili2006@linkedin.com](https://linkedin.com/in/ajhalili2006) * :simple-messenger: [@ajhalili2006](https://m.me/ajhalili2006) [^1] +## πŸ”’ Encryption + +See [this personal user manual page](../user-manual/encrypted-communications.md) for the full +details, but tl;dr: + +* If you're using Signal or even E2EE Matrix, send me an encrypted/unencrypted-but-signed email +first to confirm your identity. +* Use your GPG key to encrypt your message over email. I will download them from your website or +GitHub/GitLab profile rather than relying on keyservers. +* My main GPG key is `4d5e631758cb9cc45941b1ce67bfc91b3da12be8` while my GPG key for `@crew.recaptime.dev` +address is `a715100e58cf60500ee159652f384539c700b263`. + [^1]: Only used at school and for IRL friends and family members diff --git a/markdown/contact/else.md b/markdown/contact/else.md index 09f0f24..9c9932b 100644 --- a/markdown/contact/else.md +++ b/markdown/contact/else.md @@ -15,12 +15,12 @@ and [community moderation](../community-management.md), although if you're a company, [consider hiring me full-time](./work.md) for maintaining your OSS projects (not open-core or anything under non-OSI approved ones like the BUSL). If your inquiry isn't answered anywhere in this site or not covered on the main contact page, -I'm reachable at the following contact methods (also on [:simple-buffer: my Buffer start.page](https://ajhalili2006.start.page)): +I'm reachable at the following contact methods (also on [all-the-links page](../links.md)): -* :mailbox: personally via [:e-mail: **ajhalili2006@andreijiroh.eu.org**](mailto:ajhalili2006@andreijiroh.eu.org) or via my -Recap Time Squad staff address at [:e-mail: **ajhalili2006@crew.recaptime.eu.org**](mailto:ajhalili2006@crew.recaptime.eu.org) +* :mailbox: personally via [:e-mail: **ajhalili2006@andreijiroh.dev**](mailto:ajhalili2006@andreijiroh.dev) or via my +Recap Time Squad staff address at [:e-mail: **ajhalili2006@crew.recaptime.dev**](mailto:ajhalili2006@crew.recaptimedev) * :speech_balloon: over at Matrix at [:simple-matrix: @ajhalili2006 on ~environments](https://matrix.to/#/@ajhalili2006:envs.net) -or on [:simple-zulip: our Zulip chat (or via DMs)](https://recaptime-dev.zulipchat.com/#streams/405458/ajhalili2006) +or on [:simple-zulip: our Zulip Cloud organization (or via DMs)](https://recaptime-dev.zulipchat.com/#streams/405458/ajhalili2006) * :information_source: If you want all the contact details, please see [this page](./details.md). Please don't use this to stalk or even spam me. I do try to reply to messages if we can, but unfortunately workload and time limitations mean that it’s diff --git a/markdown/user-manual/encrypted-communications.md b/markdown/user-manual/encrypted-communications.md index 76c4784..3ef5c0c 100644 --- a/markdown/user-manual/encrypted-communications.md +++ b/markdown/user-manual/encrypted-communications.md @@ -1,6 +1,15 @@ # Encrypted communications -## Key-signing ceremories +## GPG + +### Active keys + +| Key ID | Primary address | Description | Expiration date | +| --- | --- | --- | --- | +| `4d5e631758cb9cc45941b1ce67bfc91b3da12be8` | `ajhalili2006@andreijiroh.dev` | My main GPG key for signing git commits, as well as for encrypted mails | N/A | +| `a715100e58cf60500ee159652f384539c700b263` | `ajhalili2006@crew.recaptime.dev` | My GPG key for Recap Time Squad | N/A | + +## Key-signing ceremories / Web of Trust If you would like to build your web of trust with me (and probably with your friends), let me know (via [my meeting booking form](https://calendar.app.google/P8dvgAsvrtqi8mPR9) ([alternative link](https://coda.io/form/Schedule-a-meeting-with-ajhalili2006_deaLq2my-OX)), diff --git a/overrides/main.html b/overrides/main.html index 5b0a34f..6d30fbc 100644 --- a/overrides/main.html +++ b/overrides/main.html @@ -8,7 +8,8 @@ SPDX-License-Identifier: MIT {% block extrahead %} - + + {% endblock %} {% block announce %} diff --git a/overrides/partials/content.html b/overrides/partials/content.html index fe562fb..a8d67b8 100644 --- a/overrides/partials/content.html +++ b/overrides/partials/content.html @@ -2,16 +2,18 @@
{% if config.extra.deployment == "staging" %}

- You're previewing the staging build of @ajhalili2006's website on RTD Community. + You're previewing the staging build of @ajhalili2006's website on + RTD Community.

- Deploys might be a bit faster there, but it may contain content not yet ready for production deployment or - we might skipped GitLab CI for the latest commit. + Deploys might be a bit faster there, but it may contain content not yet ready for + production deployment or we might skipped GitLab CI for the latest commit.

{% elif config.extra.deployment == "tilde" %}

You're viewing ~ajhalili2006's website from the tildeverse.

- This site build's content might be outdated due to failing CI, delayed synchorizations and local cache, among other reasons. + This site build's content might be outdated due to failing CI, delayed synchorizations and + local cache, among other reasons.

{% endif %} Go back to production