diff --git a/docs/makerFLOSS_house_rules.md b/docs/makerFLOSS_house_rules.md index 3ae7f0c..9aff218 100644 --- a/docs/makerFLOSS_house_rules.md +++ b/docs/makerFLOSS_house_rules.md @@ -1,4 +1,9 @@ -## makerFLOSS – Working Norms (v0.1) +--- +marp: true +pagination: true +--- + +# makerFLOSS – Working Norms (v0.1) We aim to experiment, learn together and have fun. MakerFLOSS is not the same as the Orange Makers IT setup - but we try to help out where we can. diff --git a/docs/møder/2026-05-xx-messaging-presentation.md b/docs/møder/2026-05-11_messaging-presentation.md similarity index 80% rename from docs/møder/2026-05-xx-messaging-presentation.md rename to docs/møder/2026-05-11_messaging-presentation.md index 02964d9..fea5573 100644 --- a/docs/møder/2026-05-xx-messaging-presentation.md +++ b/docs/møder/2026-05-11_messaging-presentation.md @@ -138,11 +138,29 @@ We could run our own homeserver at `matrix.makerfloss.eu`. - A playground for learning about self-hosted infrastructure - Federated — members can also use matrix.org or their personal servers -**Resources needed:** +--- -- A VPS (we already have one at `88.99.32.236`) -- ~500 MB RAM for Conduit (lighter than Synapse) -- A subdomain + TLS (Traefik already handles this) +## Matrix Bridges — Stay Connected During the Transition + +A bridge connects Matrix to another network — messages flow both ways. + +``` +[WhatsApp contact] ←──── WhatsApp servers ────▶ [mautrix-whatsapp bridge] ←──── Matrix ────▶ [You] +``` + +**You keep your existing accounts. Your contacts don't need to switch.** + +| Bridge | Network | Notes | +| ----------------------- | -------- | ------------------------------------------ | +| `mautrix-whatsapp` | WhatsApp | Puppeting — uses your real WA account | +| `mautrix-telegram` | Telegram | Puppeting — very stable | +| `mautrix-signal` | Signal | Fragile — Signal actively breaks 3rd-party | +| `matrix-appservice-irc` | IRC | Mature, widely used | +| `heisenbridge` | IRC | Simpler alternative | + +**The pitch:** Use Matrix as your single inbox — WhatsApp, Telegram, IRC all in one place. + +**The catch:** Puppeting bridges need server access to your account credentials. WhatsApp's ToS prohibits it — occasional bans occur. --- @@ -167,41 +185,6 @@ Peer-to-peer messaging — _no server at all_. --- -## Participation — Let's Talk - -**Round 1: Your current situation** _(2 min, pairs)_ - -- What messenger do you use most, and why? -- Is there anything about it that bothers you? - -**Round 2: Barriers** _(group discussion)_ - -- What's the hardest part of switching or convincing others to switch? -- "But all my friends are on WhatsApp" — how do you handle it? - ---- - -## Participation — Hands-On Options - -Pick one to try _right now_: - -**Option A — Signal** - -1. Install Signal on your phone -2. Register with your phone number -3. Send a message to the person next to you - -**Option B — Matrix (web)** - -1. Open [app.element.io](https://app.element.io) in your browser -2. Create a free account on matrix.org -3. Join the room `#makerfloss:matrix.org` (if it exists — let's create it!) - -**Option C — Discussion** -Should MakerFLOSS set up a Matrix homeserver? What would it take? - ---- - ## Resources | Resource | Link | @@ -214,20 +197,3 @@ Should MakerFLOSS set up a Matrix homeserver? What would it take? | Briar | briarproject.org | | Privacy Guides (comparison) | privacyguides.org/en/real-time-communication | | EFF Surveillance Self-Defense | ssd.eff.org | - ---- - -## Summary - -- **Signal**: easiest switch, best UX, E2EE by default — but centralized and requires a phone number -- **Matrix**: most aligned with FLOSS values, self-hostable, federated — but more complex -- **XMPP**: the old guard, still solid for the technically inclined -- **Briar**: for extreme scenarios — no infrastructure needed - -**The best alternative is the one people will actually use.** - ---- - -# Questions? - -_Slides made with [Marp](https://marp.app) — open source markdown slide tool_ diff --git a/docs/test-slide.md b/docs/test-slide.md deleted file mode 100644 index b922eea..0000000 --- a/docs/test-slide.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -marp: true -theme: gaia -_class: lead -paginate: true -backgroundColor: #fff -backgroundImage: url('https://marp.app/assets/hero-background.svg') ---- - -![bg left:40% 80%](https://marp.app/assets/marp.svg) - -# **Marp** - -Markdown Presentation Ecosystem - -https://marp.app/ - ---- - -# How to write slides - -Split pages by horizontal ruler (`---`). It's very simple! :satisfied: - -```markdown -# Slide 1 - -foobar - ---- - -# Slide 2 - -foobar -``` diff --git a/docs/test-slide2.md b/docs/test-slide2.md deleted file mode 100644 index dca6ebd..0000000 --- a/docs/test-slide2.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -marp: true ---- - -# test - ---- - -## test 2