Update free software recommendations

content/resources.md

@@ -42,35 +42,79 @@ Lydia X. Z. Brown on Autistic Hoya
 
 ## Recommended software
 
-I rely on [free software](https://ethan.yoois.me/Open_source/) every day.
+I rely on [free software](https://ethan.yoois.me/Open_source/) every day. Described below are the ones I use most often, the majority of which I have used for multiple years.
 
-[Bitwarden](https://bitwarden.com/): Self-hostable password manager\
+[Bitwarden](https://bitwarden.com/) {{< icon "/icon/bitwarden.svg" >}}: Self-hostable password manager\
 Licensing: GNU Affero General Public License v3.0\
 *Replaces 1Password, Dashlane, and LastPass*
 
-[FreshRSS](https://freshrss.github.io/FreshRSS/en/): Self-hosted news aggregator\
+[Cryptomator](https://cryptomator.org/)  {{< icon "/icon/cryptomator.svg" >}}: Client-side file encryption solution that works well with cloud storage\
+Licensing: GNU General Public License v3.0\
+*Replaces Boxcryptor*
+
+[Firefly III](https://www.firefly-iii.org/) {{< icon "/icon/firefly-iii.svg" >}}: Self-hosted personal finance manager\
+Licensing: GNU Affero General Public License v3.0\
+*Replaces Mint and YNAB, albeit with a ["fundamentally different"](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/) [philosophy](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/personal-finances/)*
+
+[FreshRSS](https://freshrss.org/) {{< icon "/icon/freshrss.svg" >}}: Self-hosted news aggregator\
 Licensing: GNU Affero General Public License v3.0\
 *Replaces Feedly and Inoreader*
 
-[Joplin](https://joplinapp.org/): Note-taking and task management application with encryption and synchronization\
+[GnuPG](https://gnupg.org/) {{< icon "/icon/gnupg.svg" >}}: Used by Keyoxide's [decentralized identity verification](https://docs.keyoxide.org/) and mailbox.org's [encrypted inbox](https://mailbox.org/en/security), "GnuPG is a complete and free implementation of the OpenPGP standard as defined by RFC4880" \
+Licensing: GNU General Public License v2.0 or later\
+*See also [Git's "Signing Your Work"](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work) and [Keyoxide](https://keyoxide.org/)*
+
+[Joplin](https://joplinapp.org/) {{< icon "/icon/joplin.svg" >}}: Note-taking and task management application with encryption and synchronization\
 Licensing: MIT (Expat) License\
 *Replaces Google Keep and Microsoft OneNote*
 
-[mailbox.org](https://mailbox.org/en/): Secure mail service\
+[linkding](https://github.com/sissbruecker/linkding#readme) {{< icon "/icon/linkding.png" >}}: Simple bookmark tool that can automatically save bookmarked pages to the [Internet Archive's Wayback Machine](https://archive.org/web/)\
+Licensing: MIT (Expat) License\
+*See also [ArchiveBox](https://archivebox.io/)*
+
+[Logseq](https://logseq.com/) {{< icon "/icon/logseq.png" >}}: "Privacy-first" knowledge base for writing and organizing notes\
+Licensing: GNU Affero General Public License v3.0\
+*Replaces Notion and Obsidian*
+
+[mailbox.org](https://mailbox.org/en/) {{< icon "/icon/mailboxdotorg.svg" >}}: Secure mail service provider\
 Licensing: Based on [Open-Xchange, Postfix, and other free software](https://userforum-en.mailbox.org/topic/is-everything-at-mailbox-org-open-source)\
 *Replaces Gmail and Outlook*
 
-[Nextcloud](https://nextcloud.com/athome/): Self-hosted cloud storage and collaborative platform\
+[Mozilla Firefox](https://www.mozilla.org/en-US/firefox/browsers/) {{< icon "/icon/mozillafirefoxbrowser.svg" >}} and [Mozilla Thunderbird](https://www.thunderbird.net/en-US/) {{< icon "/icon/mozillathunderbird.svg" >}}: Web browser (desktop and mobile) and email client that can also manage contacts, calendars, and feeds (desktop)\
-Licensing: GNU Affero General Public License v3.0\
+Licensing: Mozilla Public License 2.0\
+*Firefox replaces Microsoft Edge, Google Chrome, etc. while Thunderbird replaces eM Client, Mailbird, and Microsoft Outlook. See [FairEmail](https://email.faircode.eu/) for a mobile email client*
+
+[Nextcloud](https://nextcloud.com/athome/) {{< icon "/icon/nextcloud.svg" >}}: Self-hosted cloud storage and collaboration platform\
+Licensing: GNU Affero General Public License v3.0 or later (server)\
 *Replaces Google Drive and Microsoft 365 -- CalDAV and CardDAV support also allow for synchronization of calendars and contacts, respectively*
 
-[wallabag](https://github.com/wallabag/wallabag#readme): Self-hostable read-it-later application\
+[ntfy](https://ntfy.sh/) {{< icon "/icon/ntfy.svg" >}}: Self-hostable HTTP-based push notification service\
+Licensing: Apache License 2.0 and GNU General Public License v2.0\
+*See also [Gotify](https://gotify.net/)*
+
+[Rclone](https://rclone.org/) {{< icon "/icon/rclone.svg" >}}: Cloud storage management tool (e.g., move files between different servers)\
 Licensing: MIT (Expat) License\
-*Replaces Instapaper and Pocket*
+*Replaces [a supported provider's](https://rclone.org/#providers) synchronization software (e.g., Google Drive or Microsoft OneDrive)*
 
-[Zooming Out](https://adikos.net/blog/zooming-out/): "A provisional list of Zoom replacements"
+[Shiori](hhttps://github.com/go-shiori/shiori#readme) {{< icon "/icon/shiori.png" >}}: Self-hosted read-it-later application\
+Licensing: MIT (Expat) License\
+*Replaces Instapaper and Pocket. See also [wallabag](https://wallabag.org/en), which I used until early December 2022*
 
-Please feel free to contact me (below) for further alternatives or public instances of each service!
+[Signal](https://www.signal.org/) {{< icon "/icon/signal.svg" >}}: Secure instant messaging\
+Licensing: GNU Affero General Public License v3.0 (server, desktop) and GNU General Public License v3.0 (mobile)\
+*Replaces text messages (SMS/MMS), Facebook Messenger, Telegram, and WhatsApp*
+
+[Syncthing](https://syncthing.net/) {{< icon "/icon/syncthing.svg" >}}: Continuous file synchronization program\
+Licensing: Mozilla Public License 2.0\
+*See also [Syncthing-Fork](https://github.com/Catfriend1/syncthing-android#readme) (Android) and [SyncTrayzor](https://github.com/canton7/SyncTrayzor#readme) (Windows)*
+
+[Vikunja](https://vikunja.io/) {{< icon "/icon/vikunja.svg" >}}: Self-hostable task management application\
+Licensing: GNU Affero General Public License v3.0\
+*Replaces Microsoft To Do, Todoist, etc.*
+
+[Zooming Out](https://web.archive.org/web/20210724054236/https://adikos.net/blog/zooming-out/): "A provisional list of Zoom replacements"
+
+Please feel free to contact me for further alternatives or public instances of self-hostable services!
 
 ## For more content
 

layouts/index.html

@@ -40,7 +40,7 @@ Examples for writing 'backward compatible' h-card markup available at https://mi
 		<a class="link-000" href="https://ForTheBadge.com/"><img src="/img/built-with-love.svg" alt="This site was built with love, using Git and Hugo." title="I also used Git and Hugo." /></a>
 		<a class="link-000" href="{{ .Site.Params.license }}"><img src="/img/CC-BY-SA.svg" alt="Original content by {{ .Site.Params.author }} is licensed under {{ .Site.Copyright }}" title="{{ .Site.Params.copyrightMessage }}" /></a>
 		<p><b><a class="u-email email" rel="me" href="mailto:{{ .Site.Params.authorEmail }}">Contact me</a>. <a href="/privacy/" >Privacy</a>. <a rel="pgpkey" href="/ethan.asc.txt">Public key</a> <a href="https://keyoxide.org/{{ .Site.Params.authorEmail }}">(Keyoxide)</a>.</b></p>
-		<a class="link-001" href="https://nextcloud.com/sharing#eyoo@share.mayfirst.org"><img src="/nextcloud.svg" class="nextcloud" alt="Share with me via Nextcloud!" title="Federated Cloud ID makes it possible to share across Nextcloud and other Open Cloud Mesh (OCM) compatible servers!" /> Share with me via Nextcloud!</a>
+		<a class="link-001" href="https://nextcloud.com/sharing#eyoo@share.mayfirst.org"><img src="/icon/nextcloud.svg" class="nextcloud" alt="Share with me via Nextcloud!" title="Federated Cloud ID makes it possible to share across Nextcloud and other Open Cloud Mesh (OCM) compatible servers!" /> Share with me via Nextcloud!</a>
 		<p>&#128421; <a href="/cloudflare/" ><i>Where is this website hosted?</i></a> &#128421;</p>
 		</div>
 	</footer>

layouts/shortcodes/icon.html

@@ -0,0 +1,3 @@
+{{$icon := .Get 0}}
+
+<img width="16px" src="{{ $icon }}"></img>