diff --git a/src/routes/blog/site2sitewireguard/+page.md b/src/routes/blog/site2sitewireguard/+page.md index 09ac191..ccba317 100644 --- a/src/routes/blog/site2sitewireguard/+page.md +++ b/src/routes/blog/site2sitewireguard/+page.md @@ -1,6 +1,6 @@ --- created: '2022-09-27' -title: 'Site 2 Site Wireguard VPN with a Mikrotik Router and a Cloud' +title: 'Site 2 Site Wireguard VPN with a Mikrotik Router and a Cloud VM' description: '' keywords: - cloud diff --git a/src/routes/blog/software-recommendations/+page.svx b/src/routes/blog/software-recommendations/+page.md similarity index 54% rename from src/routes/blog/software-recommendations/+page.svx rename to src/routes/blog/software-recommendations/+page.md index ffe1333..aef6caf 100644 --- a/src/routes/blog/software-recommendations/+page.svx +++ b/src/routes/blog/software-recommendations/+page.md @@ -12,40 +12,40 @@ Moving away from BigTech is not an easy task. However, in these days, there are alternatives out there. Over the years I tried out many different services and software. I will present what worked best for me here. -A very encompassing resource I am recommending is [PrivacyGuides](https://www.privacyguides.org/). +An encompassing resource I am recommending is [PrivacyGuides](https://www.privacyguides.org/). However, their recommendations are at times rather purist. Everyone should use whatever works best for them. Privacy is not a black-and-white game. ## Utilities -| Name | Description | Cost | Selfhostable | -| --------------------------------------------------------- | -------------------------------------------- | :---------------: | :----------: | -| [Bitwarden](https://bitwarden.com/) | Password manager | free | :white_check_mark: | -| [SimpleLogin](https://simplelogin.io/) | Email aliases | free for students | :white_check_mark: | -| [Mailbox.org](https://mailbox.org/en/) | Email hosting | 1 € / m | :x: | -| [Element](https://element.io/) | Instant messenging | free | :white_check_mark: | -| [OpenStreetMap](https://www.openstreetmap.org/) | Global map | free | :x: | -| [Baïkal](https://sabre.io/baikal/) | Lightweight calendar synchronisation | free | :white_check_mark: | -| [Filebrowser](https://github.com/filebrowser/filebrowser) | Lightweight file organisation in the browser | free | :white_check_mark: | -| [xBrowserSync](https://www.xbrowsersync.org/) | Bookmark sync | free | :white_check_mark: | +| Name | Description | Cost | Selfhostable | +| --------------------------------------------------------- | -------------------------------------------- | :---------------: | :----------------: | +| [Bitwarden](https://bitwarden.com/) | Password manager | free | :white_check_mark: | +| [SimpleLogin](https://simplelogin.io/) | Email aliases | free for students | :white_check_mark: | +| [Mailbox.org](https://mailbox.org/en/) | Email hosting | 1 € / m | :x: | +| [Element](https://element.io/) | Instant messenging | free | :white_check_mark: | +| [OpenStreetMap](https://www.openstreetmap.org/) | Global map | free | :x: | +| [Baïkal](https://sabre.io/baikal/) | Lightweight calendar synchronisation | free | :white_check_mark: | +| [Filebrowser](https://github.com/filebrowser/filebrowser) | Lightweight file organisation in the browser | free | :white_check_mark: | +| [xBrowserSync](https://www.xbrowsersync.org/) | Bookmark sync | free | :white_check_mark: | ## PC Software | Name | Description | Cost | Selfhostable | -| --------------------------------------------------------- | -------------------------------------------- | :---------------: | :----------: | -| [Ungoogled Chromium](https://github.com/ungoogled-software/ungoogled-chromium) | Browser | free | - | -| [KDE Software Suite](https://kde.org/) | Desktop environment | free | - | -| [i3wm](https://i3wm.org/) | Desktop environment | free | - | -| [VSCodium](https://vscodium.com/) | No telemetry VSCode | free | - | -| [Xournal++](https://xournalpp.github.io/) | PDF annotation and creation | free | - | +| ------------------------------------------------------------------------------ | --------------------------- | :--: | :----------: | +| [Ungoogled Chromium](https://github.com/ungoogled-software/ungoogled-chromium) | Browser | free | - | +| [KDE Software Suite](https://kde.org/) | Desktop environment | free | - | +| [i3wm](https://i3wm.org/) | Desktop environment | free | - | +| [VSCodium](https://vscodium.com/) | No telemetry VSCode | free | - | +| [Xournal++](https://xournalpp.github.io/) | PDF annotation and creation | free | - | ## Android Apps -| Name | Description | Cost | Selfhostable | -| --------------------------------------------------------- | -------------------------------------------- | :---------------: | :----------: | -| [Infinity](https://f-droid.org/packages/ml.docilealligator.infinityforreddit/) | Reddit client | free | - | -| [Aegis](https://f-droid.org/en/packages/com.beemdevelopment.aegis) | 2FA Manager | free | - | -| [FindMyDevice](https://f-droid.org/en/packages/de.nulide.findmydevice/) | Remote phone control | free | :white_check_mark: | -| [AdAway](https://f-droid.org/en/packages/org.adaway/) | Adblocking with hosts file | free | - | -| [OsmAnd+](https://f-droid.org/en/packages/net.osmand.plus/) | Global map | free | :x: | -| [StreetComplete](https://f-droid.org/en/packages/de.westnordost.streetcomplete/) | Improve OpenStreetMap | free | - | +| Name | Description | Cost | Selfhostable | +| -------------------------------------------------------------------------------- | -------------------------- | :--: | :----------------: | +| [Infinity](https://f-droid.org/packages/ml.docilealligator.infinityforreddit/) | Reddit client | free | - | +| [Aegis](https://f-droid.org/en/packages/com.beemdevelopment.aegis) | 2FA Manager | free | - | +| [FindMyDevice](https://f-droid.org/en/packages/de.nulide.findmydevice/) | Remote phone control | free | :white_check_mark: | +| [AdAway](https://f-droid.org/en/packages/org.adaway/) | Adblocking with hosts file | free | - | +| [OsmAnd+](https://f-droid.org/en/packages/net.osmand.plus/) | Global map | free | :x: | +| [StreetComplete](https://f-droid.org/en/packages/de.westnordost.streetcomplete/) | Improve OpenStreetMap | free | - |