Update config

2021-05-02 11:27:39 +02:00 · 2021-05-02 11:27:39 +02:00 · 71a0c2601d
commit 71a0c2601d
parent 500ec4bd54
18 changed files with 1086 additions and 946 deletions
--- a/android.org
+++ b/android.org
@ -2,71 +2,94 @@
 #+SETUPFILE: ./setup/org-setup-file.org

 * Install
+** Unlock the bootloader
+Tutorial: https://www.youtube.com/watch?v=_MKtOMiUWdM

-ROM: https://lineage.microg.org/ (https://download.lineage.microg.org/instantnoodle/)
-https://github.com/topjohnwu/Magisk
-https://github.com/ukanth/afwall
-https://f-droid.org/packages/com.oF2pks.classyshark3xodus/
+** Flash ROM
+Tutorial: https://www.youtube.com/watch?v=3pxOeiIBrHI
+
+** Root
+- Root: https://github.com/topjohnwu/Magisk https://forum.xda-developers.com/t/guide-magisk-for-oxygenos-11.4160833/
+- https://www.youtube.com/watch?v=hTFK1OZ4DaU
+
+** Further work
+- ROM: https://lineage.microg.org/ (https://download.lineage.microg.org/instantnoodle/)
+- Setup SSH: https://binfalse.de/2018/09/06/native-ssh-server-on-linageos/

 * Favorite Apps

 #+name: tab:open_source_apps
 #+caption: Open Source Apps
-| Name            | Description                                                    |
-|-----------------+----------------------------------------------------------------|
-| [[https://f-droid.org/fr/packages/com.artifex.mupdf.viewer.app/][F-droid]]         | Open Source application store                                  |
-| [[https://github.com/moezbhatti/qksms][QKSMS]]           | SMS                                                            |
-| [[https://github.com/mozilla-mobile/fenix][Fenix]]           | Firefox for android                                            |
-| [[https://github.com/syncthing/syncthing-android][Syncthing]]       | Continuous File Synchronization                                |
-| [[https://github.com/termux/termux-app][Termux]]          | Terminal                                                       |
-| [[https://github.com/k0shk0sh/FastHub][FastHub]]         | Github client                                                  |
-| [[https://github.com/dkanada/gelli][Gelli]]           | Music app for Jellyfin                                         |
-| [[https://github.com/k9mail/k-9][K-9 Mail]]        | Mail client                                                    |
-| [[https://github.com/SimpleMobileTools/Simple-Gallery][Simple Gallery]]  | Minimalist gallery app                                         |
-| [[https://github.com/SimpleMobileTools/Simple-Contacts][Simple Contacts]] | Minimalist contact app                                         |
-| [[https://github.com/SimpleMobileTools/Simple-Calendar][Simple Calendar]] | Minimalist calendar app (alternative: Etar)                    |
-| [[https://f-droid.org/fr/packages/com.artifex.mupdf.viewer.app/][muPDF]]           | PDF minimalist viewer                                          |
-| [[https://github.com/mpv-android/mpv-android][MPV]]             | Video player                                                   |
-| [[https://github.com/orgzly/orgzly-android][Orgzly]]          | OrgMode application                                            |
-| [[https://github.com/vector-im/element-android][Element]]         | Matrix client                                                  |
-| [[https://github.com/machiav3lli/oandbackupx][OAndBackupX]]     | Backup Manager (Requires root)                                 |
-| [[https://github.com/iSoron/uhabits][uhabits]]         | Habit Tracker                                                  |
-| [[https://github.com/devgianlu/Aria2App][Aria2App]]        | Download manager                                               |
-| [[https://www.davx5.com/][DAVx5]]           | Used to synchronize contacts and calendars with calDAC/carddav |
-| [[https://gitlab.com/AuroraOSS/AuroraStore][Aurora Store]]    | Play Store alternative                                         |
-| [[https://github.com/bromite/bromite][Bromite]]         | Chromium fork with ad blocking and privacy enhancements        |
-| [[https://github.com/martykan/forecastie][Forcastie]]       | Weather application                                            |
-| [[https://gitnex.com/][GitNex]]          | Gitea client                                                   |
-| [[https://github.com/home-assistant/android][Home Assistant]]  | Home Assistant client                                          |
-| [[https://github.com/jellyfin/jellyfin-android][Jellyfin]]        | Jellyfin client                                                |
-| [[https://github.com/KDE/kdeconnect-kde][KDE Connect]]     | Connect to linux desktop                                       |
-| [[https://github.com/DocMarty84/miniflutt][Miniflutt]]       | Miniflux client                                                |
-| [[https://github.com/TeamNewPipe/NewPipe][NewPipe]]         | Frontend for Youtube                                           |
-| [[https://github.com/osmandapp/OsmAnd][OsmAnd~]]         | Open Street Map application                                    |
-| [[https://github.com/android-password-store/Android-Password-Store][Password Store]]  | Password manager                                               |
-| [[https://github.com/y20k/transistor][Transistor]]      | Radio application                                              |
-| [[https://f-droid.org/en/packages/com.google.zxing.client.android/][Barcode Scanner]] | Barcode Scanner                                                |
-| [[https://github.com/Bubu/android-calculatorpp][Calculator++]]    | Nice calculator app                                            |
-| [[https://github.com/zhanghai/MaterialFiles][MaterialFiles]]   | File Manager                                                   |
-| [[https://github.com/equeim/tremotesf-android][Tremotesf]]       | Transmission client                                            |
-| [[https://github.com/brianhorn/Tunerly][Tunerly]]         | Pitch tuning app                                               |
-| [[https://github.com/Docile-Alligator/Infinity-For-Reddit][Infinity]]        | Reddit client                                                  |
-| [[https://github.com/Jays2Kings/tachiyomiJ2K][tachiyomiJ2K]]    | Manga reader                                                   |
-| [[https://github.com/AnySoftKeyboard/AnySoftKeyboard][AnySoftKeyboard]] | Keyboard                                                       |
-| Wireguard       |                                                                |
-| [[https://github.com/SimpleMobileTools/Simple-CLock][Simple Clock]]    |                                                                |
+| Name            |                                                                             | Description                                                    |
+|-----------------+-----------------------------------------------------------------------------+----------------------------------------------------------------|
+| [[https://f-droid.org/fr/packages/com.artifex.mupdf.viewer.app/][F-droid]]         |                                                                             | Open Source application store                                  |
+| [[https://github.com/moezbhatti/qksms][QKSMS]]           | https://f-droid.org/en/packages/com.moez.QKSMS/                             | SMS                                                            |
+| [[https://github.com/mozilla-mobile/fenix][Fenix]]           | https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/                  | Firefox for android                                            |
+| [[https://github.com/syncthing/syncthing-android][Syncthing]]       | https://f-droid.org/en/packages/com.nutomic.syncthingandroid/               | Continuous File Synchronization                                |
+| [[https://github.com/termux/termux-app][Termux]]          | https://f-droid.org/en/packages/com.termux/                                 | Terminal                                                       |
+| [[https://github.com/k0shk0sh/FastHub][FastHub]]         | https://f-droid.org/en/packages/com.fastaccess.github.libre/                | Github client                                                  |
+| [[https://github.com/dkanada/gelli][Gelli]]           | https://f-droid.org/en/packages/com.dkanada.gramophone/                     | Music app for Jellyfin                                         |
+| [[https://github.com/k9mail/k-9][K-9 Mail]]        | https://f-droid.org/en/packages/com.fsck.k9/                                | Mail client                                                    |
+| [[https://github.com/SimpleMobileTools/Simple-Dialer][Simple Dialer]]   | https://f-droid.org/en/packages/com.simplemobiletools.dialer/               | Minimalist dialing app                                         |
+| [[https://github.com/SimpleMobileTools/Simple-Gallery][Simple Gallery]]  | https://f-droid.org/en/packages/com.simplemobiletools.gallery.pro/          | Minimalist gallery app                                         |
+| [[https://github.com/SimpleMobileTools/Simple-Contacts][Simple Contacts]] | https://f-droid.org/en/packages/com.simplemobiletools.contacts.pro/         | Minimalist contact app                                         |
+| [[https://github.com/SimpleMobileTools/Simple-Calendar][Simple Calendar]] | https://f-droid.org/en/packages/com.simplemobiletools.calendar.pro/         | Minimalist calendar app                                        |
+| [[https://f-droid.org/fr/packages/com.artifex.mupdf.viewer.app/][muPDF]]           | https://f-droid.org/en/packages/com.artifex.mupdf.viewer.app/               | PDF minimalist viewer                                          |
+| [[https://github.com/mpv-android/mpv-android][MPV]]             | https://f-droid.org/en/packages/is.xyz.mpv/                                 | Video player                                                   |
+| [[https://github.com/orgzly/orgzly-android][Orgzly]]          | https://f-droid.org/en/packages/com.orgzly/                                 | OrgMode application                                            |
+| [[https://github.com/vector-im/element-android][Element]]         | https://f-droid.org/en/packages/im.vector.app/                              | Matrix client                                                  |
+| [[https://www.davx5.com/][DAVx5]]           | https://f-droid.org/en/packages/at.bitfire.davdroid/                        | Used to synchronize contacts and calendars with calDAC/carddav |
+| [[https://gitlab.com/AuroraOSS/AuroraStore][Aurora Store]]    | https://f-droid.org/en/packages/com.aurora.store/                           | Play Store alternative                                         |
+| [[https://github.com/martykan/forecastie][Forcastie]]       | https://f-droid.org/en/packages/cz.martykan.forecastie/                     | Weather application                                            |
+| [[https://gitnex.com/][GitNex]]          | https://f-droid.org/en/packages/org.mian.gitnex/                            | Gitea client                                                   |
+| [[https://github.com/home-assistant/android][Home Assistant]]  | https://f-droid.org/en/packages/io.homeassistant.companion.android.minimal/ | Home Assistant client                                          |
+| [[https://github.com/jellyfin/jellyfin-android][Jellyfin]]        | https://f-droid.org/en/packages/org.jellyfin.mobile/                        | Jellyfin client                                                |
+| [[https://github.com/KDE/kdeconnect-kde][KDE Connect]]     | https://f-droid.org/en/packages/org.kde.kdeconnect_tp/                      | Connect to linux desktop                                       |
+| [[https://github.com/TeamNewPipe/NewPipe][NewPipe]]         | https://f-droid.org/en/packages/org.schabi.newpipe/                         | Frontend for Youtube                                           |
+| [[https://github.com/osmandapp/OsmAnd][OsmAnd~]]         | https://f-droid.org/en/packages/net.osmand.plus/                            | Open Street Map application                                    |
+| [[https://github.com/android-password-store/Android-Password-Store][Password Store]]  | https://f-droid.org/en/packages/dev.msfjarvis.aps/                          | Password manager                                               |
+| [[https://github.com/y20k/transistor][Transistor]]      | https://f-droid.org/en/packages/org.y20k.transistor/                        | Radio application                                              |
+| [[https://f-droid.org/en/packages/com.google.zxing.client.android/][Barcode Scanner]] | https://f-droid.org/en/packages/com.google.zxing.client.android/            | Barcode Scanner                                                |
+| [[https://github.com/Bubu/android-calculatorpp][Calculator++]]    | https://f-droid.org/en/packages/org.solovyev.android.calculator/            | Nice calculator app                                            |
+| [[https://github.com/zhanghai/MaterialFiles][MaterialFiles]]   | https://f-droid.org/en/packages/me.zhanghai.android.files/                  | File Manager                                                   |
+| [[https://github.com/brianhorn/Tunerly][Tunerly]]         | https://f-droid.org/en/packages/com.tunerly/                                | Pitch tuning app                                               |
+| [[https://github.com/Docile-Alligator/Infinity-For-Reddit][Infinity]]        | https://f-droid.org/en/packages/ml.docilealligator.infinityforreddit/       | Reddit client                                                  |
+| [[https://github.com/dslul/openboard][OpenBoard]]       | https://f-droid.org/en/packages/org.dslul.openboard.inputmethod.latin/      | Keyboard                                                       |
+| [[https://github.com/SimpleMobileTools/Simple-CLock][Simple Clock]]    | https://f-droid.org/en/packages/com.simplemobiletools.clock/                | Simple clock                                                   |
+| [[https://github.com/WireGuard/wireguard-android][Wireguard]]       | https://f-droid.org/en/packages/com.wireguard.android/                      | Modern VPN                                                     |
+| [[https://github.com/iSoron/uhabits][uhabits]]         | https://f-droid.org/packages/org.isoron.uhabits/                            | Habit Tracker                                                  |
+| [[https://f-droid.org/packages/org.sufficientlysecure.keychain/][OpenKeychain]]    | https://f-droid.org/packages/org.sufficientlysecure.keychain/               | PGP Manager                                                    |
+| [[https://github.com/billthefarmer/editor][Editor]]          | https://f-droid.org/packages/org.billthefarmer.editor/                      | Text Editor                                                    |
+| [[https://github.com/erickok/transdroid][Transdroid]]      | https://f-droid.org/en/packages/org.transdroid.full/                        | Transmission and Aria2 clients                                 |
+| [[https://github.com/AntennaPod/AntennaPod][AntennaPod]]      | https://f-droid.org/packages/de.danoeh.antennapod/                          | Podcast manager                                                |
+| [[https://github.com/bromite/bromite][Bromite]]         |                                                                             | Chromium fork with ad blocking and privacy enhancements        |
+| [[https://github.com/Jays2Kings/tachiyomiJ2K][TachiyomiJ2K]]    |                                                                             | Manga reader                                                   |
+| [[https://github.com/DocMarty84/miniflutt][Miniflutt]]       |                                                                             | Miniflux client                                                |


 #+name: tab:close_source_apps
 #+caption: Close Source Apps
 | Name                | Description         | Open Source Alternative |
-|------------------+---------------------+-------------------------|
-| [[https://printoid.net/][Printoid]]         | Octoprint client    | Web client?             |
+|---------------------+---------------------+-------------------------|
 | [[https://www.waze.com/][Waze]]                | GPS navigation app  |                         |
-| [[https://boostforreddit.com/][Boost for Reddit]] | Reddit client       |                         |
-| [[https://vancedapp.com/][Youtube Vanced]]   | Youtube without ads |                         |
+| [[https://printoid.net/][Printoid]]            | Octoprint client    | Web client?             |
+| [[https://vancedapp.com/][Youtube Vanced]]      | Youtube without ads | NewPipe                 |
 | [[https://play.google.com/store/apps/details?id=com.nordvpn.android&hl=en&gl=US][NordVPN]]             |                     |                         |
 | Spotify             |                     |                         |
 | Banking             |                     |                         |
 | Trainline           |                     |                         |
-| Tricount         |                     |                         |
+| Tricount            |                     | [[https://github.com/cowbell/splittypie][Splittypie]]              |
+
+
+#+name: tab:root_apps
+#+caption: Apps requiring Root
+| Name                | Description | Open Source Alternative |
+|---------------------+-------------+-------------------------|
+| [[https://github.com/ukanth/afwall][Afwall]]              |             |                         |
+| Titanium Backup PRO |             | [[https://github.com/machiav3lli/oandbackupx][OAndBackupX]]             |
+
+* Tutorials
+** Connect to the phone by SSH
+https://wiki.termux.com/wiki/Bypassing_NAT
+
+An other option would be to use Wireguard and shen to =ssh=.
--- a/binaries-private.org
+++ b/binaries-private.org
@ -108,8 +108,8 @@ fi
 :CUSTOM_ID: torrent-add
 :END:

-#+begin_src bash :tangle ~/.local/bin/torrent-add
-transmission-remote ***REMOVED***:9091 --auth tdehaeze:$(pass nas/transmission | sed -n 1p) -a $1 && \
+#+begin_src bash :tangle ~/.local/bin/torrent-add :noweb yes
+transmission-remote <<get-password(passname="ip/grenoble")>>:9091 --auth tdehaeze:$(pass nas/transmission | sed -n 1p) -a $1 && \
    dunstify 'Torrent' 'Successfully added' || \
    dunstify 'Torrent' 'Error'
 #+end_src
--- a/calendar-contact.org
+++ b/calendar-contact.org
@ -84,6 +84,11 @@ color = "#FB4934" # Red
 path = ~/.calendars/esrf/calendar/
 color = "#83A598" # Blue

+[[Birthdays]]
+path = ~/.contacts/98ee5e2c-afcf-70e0-c4a2-9fb9de2e97b7/
+color = "#D3869B" # aqua
+type = birthdays
+
 [highlight_days]
 multiple = "#FABD2F" # Yellow

--- a/config.org
+++ b/config.org
@ -7,37 +7,18 @@
 :header-args+: :comments none :mkdirp yes
 :END:

-#+begin_src conf
+#+begin_src conf :noweb yes
 AddKeysToAgent  yes

 Host grenoble
-    hostname ***REMOVED***
-    Port 10022
-    user tdehaeze
-    IdentityFile ~/.ssh/id_rsa
-
-Host wingaudio
-    hostname 207.154.251.241
+    hostname <<get-password(passname="ip/grenoble")>>
    Port 22
-    user tdehaeze
+    user thomas
    IdentityFile ~/.ssh/id_rsa

-Host octoprint
-    hostname 192.168.1.56
-    Port 22
-    user pi
-    IdentityFile ~/.ssh/id_rsa
-
-Host hassio
-    hostname 192.168.1.101
-    Port 10022
-    user root
-    IdentityFile ~/.ssh/id_rsa
-
-Host nas
-    hostname 192.168.1.50
-    Port 10022
-    user tdehaeze
+Host oneplus
+    hostname 192.168.1.58
+    Port 8022
    IdentityFile ~/.ssh/id_rsa
 #+end_src

--- a/docs/android.html
+++ b/docs/android.html
@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2021-04-26 lun. 11:01 -->
+<!-- 2021-05-02 dim. 11:26 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>Android Phone</title>
 <meta name="author" content="Dehaeze Thomas" />
@ -22,8 +22,20 @@
 <h2>Table of Contents</h2>
 <div id="text-table-of-contents">
 <ul>
-<li><a href="#org9b15080">Install</a></li>
+<li><a href="#org9b15080">Install</a>
+<ul>
+<li><a href="#org31c1d8d">Unlock the bootloader</a></li>
+<li><a href="#org39426ca">Flash ROM</a></li>
+<li><a href="#org966f711">Root</a></li>
+<li><a href="#org6e288cc">Further work</a></li>
+</ul>
+</li>
 <li><a href="#org41948b1">Favorite Apps</a></li>
+<li><a href="#orgb68380c">Tutorials</a>
+<ul>
+<li><a href="#org895b996">Connect to the phone by SSH</a></li>
+</ul>
+</li>
 </ul>
 </div>
 </div>
@ -31,15 +43,46 @@
 <div id="outline-container-org9b15080" class="outline-2">
 <h2 id="org9b15080">Install</h2>
 <div class="outline-text-2" id="text-org9b15080">
+</div>
+<div id="outline-container-org31c1d8d" class="outline-3">
+<h3 id="org31c1d8d">Unlock the bootloader</h3>
+<div class="outline-text-3" id="text-org31c1d8d">
 <p>
-ROM: <a href="https://lineage.microg.org/">https://lineage.microg.org/</a> (<a href="https://download.lineage.microg.org/instantnoodle/">https://download.lineage.microg.org/instantnoodle/</a>)
-<a href="https://github.com/topjohnwu/Magisk">https://github.com/topjohnwu/Magisk</a>
-<a href="https://github.com/ukanth/afwall">https://github.com/ukanth/afwall</a>
-<a href="https://f-droid.org/packages/com.oF2pks.classyshark3xodus/">https://f-droid.org/packages/com.oF2pks.classyshark3xodus/</a>
+Tutorial: <a href="https://www.youtube.com/watch?v=_MKtOMiUWdM">https://www.youtube.com/watch?v=_MKtOMiUWdM</a>
 </p>
 </div>
 </div>

+<div id="outline-container-org39426ca" class="outline-3">
+<h3 id="org39426ca">Flash ROM</h3>
+<div class="outline-text-3" id="text-org39426ca">
+<p>
+Tutorial: <a href="https://www.youtube.com/watch?v=3pxOeiIBrHI">https://www.youtube.com/watch?v=3pxOeiIBrHI</a>
+</p>
+</div>
+</div>
+
+<div id="outline-container-org966f711" class="outline-3">
+<h3 id="org966f711">Root</h3>
+<div class="outline-text-3" id="text-org966f711">
+<ul class="org-ul">
+<li>Root: <a href="https://github.com/topjohnwu/Magisk">https://github.com/topjohnwu/Magisk</a> <a href="https://forum.xda-developers.com/t/guide-magisk-for-oxygenos-11.4160833/">https://forum.xda-developers.com/t/guide-magisk-for-oxygenos-11.4160833/</a></li>
+<li><a href="https://www.youtube.com/watch?v=hTFK1OZ4DaU">https://www.youtube.com/watch?v=hTFK1OZ4DaU</a></li>
+</ul>
+</div>
+</div>
+
+<div id="outline-container-org6e288cc" class="outline-3">
+<h3 id="org6e288cc">Further work</h3>
+<div class="outline-text-3" id="text-org6e288cc">
+<ul class="org-ul">
+<li>ROM: <a href="https://lineage.microg.org/">https://lineage.microg.org/</a> (<a href="https://download.lineage.microg.org/instantnoodle/">https://download.lineage.microg.org/instantnoodle/</a>)</li>
+<li>Setup SSH: <a href="https://binfalse.de/2018/09/06/native-ssh-server-on-linageos/">https://binfalse.de/2018/09/06/native-ssh-server-on-linageos/</a></li>
+</ul>
+</div>
+</div>
+</div>
+
 <div id="outline-container-org41948b1" class="outline-2">
 <h2 id="org41948b1">Favorite Apps</h2>
 <div class="outline-text-2" id="text-org41948b1">
@ -49,218 +92,274 @@ ROM: <a href="https://lineage.microg.org/">https://lineage.microg.org/</a> (<a h
 <colgroup>
 <col  class="org-left" />

+<col  class="org-left" />
+
 <col  class="org-left" />
 </colgroup>
 <thead>
 <tr>
 <th scope="col" class="org-left">Name</th>
+<th scope="col" class="org-left">&#xa0;</th>
 <th scope="col" class="org-left">Description</th>
 </tr>
 </thead>
 <tbody>
 <tr>
 <td class="org-left"><a href="https://f-droid.org/fr/packages/com.artifex.mupdf.viewer.app/">F-droid</a></td>
+<td class="org-left">&#xa0;</td>
 <td class="org-left">Open Source application store</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/moezbhatti/qksms">QKSMS</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.moez.QKSMS/">https://f-droid.org/en/packages/com.moez.QKSMS/</a></td>
 <td class="org-left">SMS</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/mozilla-mobile/fenix">Fenix</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/">https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/</a></td>
 <td class="org-left">Firefox for android</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/syncthing/syncthing-android">Syncthing</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.nutomic.syncthingandroid/">https://f-droid.org/en/packages/com.nutomic.syncthingandroid/</a></td>
 <td class="org-left">Continuous File Synchronization</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/termux/termux-app">Termux</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.termux/">https://f-droid.org/en/packages/com.termux/</a></td>
 <td class="org-left">Terminal</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/k0shk0sh/FastHub">FastHub</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.fastaccess.github.libre/">https://f-droid.org/en/packages/com.fastaccess.github.libre/</a></td>
 <td class="org-left">Github client</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/dkanada/gelli">Gelli</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.dkanada.gramophone/">https://f-droid.org/en/packages/com.dkanada.gramophone/</a></td>
 <td class="org-left">Music app for Jellyfin</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/k9mail/k-9">K-9 Mail</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.fsck.k9/">https://f-droid.org/en/packages/com.fsck.k9/</a></td>
 <td class="org-left">Mail client</td>
 </tr>

+<tr>
+<td class="org-left"><a href="https://github.com/SimpleMobileTools/Simple-Dialer">Simple Dialer</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.simplemobiletools.dialer/">https://f-droid.org/en/packages/com.simplemobiletools.dialer/</a></td>
+<td class="org-left">Minimalist dialing app</td>
+</tr>
+
 <tr>
 <td class="org-left"><a href="https://github.com/SimpleMobileTools/Simple-Gallery">Simple Gallery</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.simplemobiletools.gallery.pro/">https://f-droid.org/en/packages/com.simplemobiletools.gallery.pro/</a></td>
 <td class="org-left">Minimalist gallery app</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/SimpleMobileTools/Simple-Contacts">Simple Contacts</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.simplemobiletools.contacts.pro/">https://f-droid.org/en/packages/com.simplemobiletools.contacts.pro/</a></td>
 <td class="org-left">Minimalist contact app</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/SimpleMobileTools/Simple-Calendar">Simple Calendar</a></td>
-<td class="org-left">Minimalist calendar app (alternative: Etar)</td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.simplemobiletools.calendar.pro/">https://f-droid.org/en/packages/com.simplemobiletools.calendar.pro/</a></td>
+<td class="org-left">Minimalist calendar app</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://f-droid.org/fr/packages/com.artifex.mupdf.viewer.app/">muPDF</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.artifex.mupdf.viewer.app/">https://f-droid.org/en/packages/com.artifex.mupdf.viewer.app/</a></td>
 <td class="org-left">PDF minimalist viewer</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/mpv-android/mpv-android">MPV</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/is.xyz.mpv/">https://f-droid.org/en/packages/is.xyz.mpv/</a></td>
 <td class="org-left">Video player</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/orgzly/orgzly-android">Orgzly</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.orgzly/">https://f-droid.org/en/packages/com.orgzly/</a></td>
 <td class="org-left">OrgMode application</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/vector-im/element-android">Element</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/im.vector.app/">https://f-droid.org/en/packages/im.vector.app/</a></td>
 <td class="org-left">Matrix client</td>
 </tr>

-<tr>
-<td class="org-left"><a href="https://github.com/machiav3lli/oandbackupx">OAndBackupX</a></td>
-<td class="org-left">Backup Manager (Requires root)</td>
-</tr>
-
-<tr>
-<td class="org-left"><a href="https://github.com/iSoron/uhabits">uhabits</a></td>
-<td class="org-left">Habit Tracker</td>
-</tr>
-
-<tr>
-<td class="org-left"><a href="https://github.com/devgianlu/Aria2App">Aria2App</a></td>
-<td class="org-left">Download manager</td>
-</tr>
-
 <tr>
 <td class="org-left"><a href="https://www.davx5.com/">DAVx5</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/at.bitfire.davdroid/">https://f-droid.org/en/packages/at.bitfire.davdroid/</a></td>
 <td class="org-left">Used to synchronize contacts and calendars with calDAC/carddav</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://gitlab.com/AuroraOSS/AuroraStore">Aurora Store</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.aurora.store/">https://f-droid.org/en/packages/com.aurora.store/</a></td>
 <td class="org-left">Play Store alternative</td>
 </tr>

-<tr>
-<td class="org-left"><a href="https://github.com/bromite/bromite">Bromite</a></td>
-<td class="org-left">Chromium fork with ad blocking and privacy enhancements</td>
-</tr>
-
 <tr>
 <td class="org-left"><a href="https://github.com/martykan/forecastie">Forcastie</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/cz.martykan.forecastie/">https://f-droid.org/en/packages/cz.martykan.forecastie/</a></td>
 <td class="org-left">Weather application</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://gitnex.com/">GitNex</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/org.mian.gitnex/">https://f-droid.org/en/packages/org.mian.gitnex/</a></td>
 <td class="org-left">Gitea client</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/home-assistant/android">Home Assistant</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/io.homeassistant.companion.android.minimal/">https://f-droid.org/en/packages/io.homeassistant.companion.android.minimal/</a></td>
 <td class="org-left">Home Assistant client</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/jellyfin/jellyfin-android">Jellyfin</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/org.jellyfin.mobile/">https://f-droid.org/en/packages/org.jellyfin.mobile/</a></td>
 <td class="org-left">Jellyfin client</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/KDE/kdeconnect-kde">KDE Connect</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/org.kde.kdeconnect_tp/">https://f-droid.org/en/packages/org.kde.kdeconnect_tp/</a></td>
 <td class="org-left">Connect to linux desktop</td>
 </tr>

-<tr>
-<td class="org-left"><a href="https://github.com/DocMarty84/miniflutt">Miniflutt</a></td>
-<td class="org-left">Miniflux client</td>
-</tr>
-
 <tr>
 <td class="org-left"><a href="https://github.com/TeamNewPipe/NewPipe">NewPipe</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/org.schabi.newpipe/">https://f-droid.org/en/packages/org.schabi.newpipe/</a></td>
 <td class="org-left">Frontend for Youtube</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/osmandapp/OsmAnd">OsmAnd~</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/net.osmand.plus/">https://f-droid.org/en/packages/net.osmand.plus/</a></td>
 <td class="org-left">Open Street Map application</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/android-password-store/Android-Password-Store">Password Store</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/dev.msfjarvis.aps/">https://f-droid.org/en/packages/dev.msfjarvis.aps/</a></td>
 <td class="org-left">Password manager</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/y20k/transistor">Transistor</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/org.y20k.transistor/">https://f-droid.org/en/packages/org.y20k.transistor/</a></td>
 <td class="org-left">Radio application</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://f-droid.org/en/packages/com.google.zxing.client.android/">Barcode Scanner</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.google.zxing.client.android/">https://f-droid.org/en/packages/com.google.zxing.client.android/</a></td>
 <td class="org-left">Barcode Scanner</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/Bubu/android-calculatorpp">Calculator++</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/org.solovyev.android.calculator/">https://f-droid.org/en/packages/org.solovyev.android.calculator/</a></td>
 <td class="org-left">Nice calculator app</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/zhanghai/MaterialFiles">MaterialFiles</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/me.zhanghai.android.files/">https://f-droid.org/en/packages/me.zhanghai.android.files/</a></td>
 <td class="org-left">File Manager</td>
 </tr>

-<tr>
-<td class="org-left"><a href="https://github.com/equeim/tremotesf-android">Tremotesf</a></td>
-<td class="org-left">Transmission client</td>
-</tr>
-
 <tr>
 <td class="org-left"><a href="https://github.com/brianhorn/Tunerly">Tunerly</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.tunerly/">https://f-droid.org/en/packages/com.tunerly/</a></td>
 <td class="org-left">Pitch tuning app</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://github.com/Docile-Alligator/Infinity-For-Reddit">Infinity</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/ml.docilealligator.infinityforreddit/">https://f-droid.org/en/packages/ml.docilealligator.infinityforreddit/</a></td>
 <td class="org-left">Reddit client</td>
 </tr>

 <tr>
-<td class="org-left"><a href="https://github.com/Jays2Kings/tachiyomiJ2K">tachiyomiJ2K</a></td>
-<td class="org-left">Manga reader</td>
-</tr>
-
-<tr>
-<td class="org-left"><a href="https://github.com/AnySoftKeyboard/AnySoftKeyboard">AnySoftKeyboard</a></td>
+<td class="org-left"><a href="https://github.com/dslul/openboard">OpenBoard</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/org.dslul.openboard.inputmethod.latin/">https://f-droid.org/en/packages/org.dslul.openboard.inputmethod.latin/</a></td>
 <td class="org-left">Keyboard</td>
 </tr>

 <tr>
-<td class="org-left">Wireguard</td>
-<td class="org-left">&#xa0;</td>
+<td class="org-left"><a href="https://github.com/SimpleMobileTools/Simple-CLock">Simple Clock</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.simplemobiletools.clock/">https://f-droid.org/en/packages/com.simplemobiletools.clock/</a></td>
+<td class="org-left">Simple clock</td>
 </tr>

 <tr>
-<td class="org-left"><a href="https://github.com/SimpleMobileTools/Simple-CLock">Simple Clock</a></td>
+<td class="org-left"><a href="https://github.com/WireGuard/wireguard-android">Wireguard</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/com.wireguard.android/">https://f-droid.org/en/packages/com.wireguard.android/</a></td>
+<td class="org-left">Modern VPN</td>
+</tr>
+
+<tr>
+<td class="org-left"><a href="https://github.com/iSoron/uhabits">uhabits</a></td>
+<td class="org-left"><a href="https://f-droid.org/packages/org.isoron.uhabits/">https://f-droid.org/packages/org.isoron.uhabits/</a></td>
+<td class="org-left">Habit Tracker</td>
+</tr>
+
+<tr>
+<td class="org-left"><a href="https://f-droid.org/packages/org.sufficientlysecure.keychain/">OpenKeychain</a></td>
+<td class="org-left"><a href="https://f-droid.org/packages/org.sufficientlysecure.keychain/">https://f-droid.org/packages/org.sufficientlysecure.keychain/</a></td>
+<td class="org-left">PGP Manager</td>
+</tr>
+
+<tr>
+<td class="org-left"><a href="https://github.com/billthefarmer/editor">Editor</a></td>
+<td class="org-left"><a href="https://f-droid.org/packages/org.billthefarmer.editor/">https://f-droid.org/packages/org.billthefarmer.editor/</a></td>
+<td class="org-left">Text Editor</td>
+</tr>
+
+<tr>
+<td class="org-left"><a href="https://github.com/erickok/transdroid">Transdroid</a></td>
+<td class="org-left"><a href="https://f-droid.org/en/packages/org.transdroid.full/">https://f-droid.org/en/packages/org.transdroid.full/</a></td>
+<td class="org-left">Transmission and Aria2 clients</td>
+</tr>
+
+<tr>
+<td class="org-left"><a href="https://github.com/AntennaPod/AntennaPod">AntennaPod</a></td>
+<td class="org-left"><a href="https://f-droid.org/packages/de.danoeh.antennapod/">https://f-droid.org/packages/de.danoeh.antennapod/</a></td>
+<td class="org-left">Podcast manager</td>
+</tr>
+
+<tr>
+<td class="org-left"><a href="https://github.com/bromite/bromite">Bromite</a></td>
 <td class="org-left">&#xa0;</td>
+<td class="org-left">Chromium fork with ad blocking and privacy enhancements</td>
+</tr>
+
+<tr>
+<td class="org-left"><a href="https://github.com/Jays2Kings/tachiyomiJ2K">TachiyomiJ2K</a></td>
+<td class="org-left">&#xa0;</td>
+<td class="org-left">Manga reader</td>
+</tr>
+
+<tr>
+<td class="org-left"><a href="https://github.com/DocMarty84/miniflutt">Miniflutt</a></td>
+<td class="org-left">&#xa0;</td>
+<td class="org-left">Miniflux client</td>
 </tr>
 </tbody>
 </table>
@ -284,12 +383,6 @@ ROM: <a href="https://lineage.microg.org/">https://lineage.microg.org/</a> (<a h
 </tr>
 </thead>
 <tbody>
-<tr>
-<td class="org-left"><a href="https://printoid.net/">Printoid</a></td>
-<td class="org-left">Octoprint client</td>
-<td class="org-left">Web client?</td>
-</tr>
-
 <tr>
 <td class="org-left"><a href="https://www.waze.com/">Waze</a></td>
 <td class="org-left">GPS navigation app</td>
@ -297,15 +390,15 @@ ROM: <a href="https://lineage.microg.org/">https://lineage.microg.org/</a> (<a h
 </tr>

 <tr>
-<td class="org-left"><a href="https://boostforreddit.com/">Boost for Reddit</a></td>
-<td class="org-left">Reddit client</td>
-<td class="org-left">&#xa0;</td>
+<td class="org-left"><a href="https://printoid.net/">Printoid</a></td>
+<td class="org-left">Octoprint client</td>
+<td class="org-left">Web client?</td>
 </tr>

 <tr>
 <td class="org-left"><a href="https://vancedapp.com/">Youtube Vanced</a></td>
 <td class="org-left">Youtube without ads</td>
-<td class="org-left">&#xa0;</td>
+<td class="org-left">NewPipe</td>
 </tr>

 <tr>
@ -335,16 +428,67 @@ ROM: <a href="https://lineage.microg.org/">https://lineage.microg.org/</a> (<a h
 <tr>
 <td class="org-left">Tricount</td>
 <td class="org-left">&#xa0;</td>
+<td class="org-left"><a href="https://github.com/cowbell/splittypie">Splittypie</a></td>
+</tr>
+</tbody>
+</table>
+
+
+<table id="org2549731" border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<caption class="t-above"><span class="table-number">Table 3:</span> Apps requiring Root</caption>
+
+<colgroup>
+<col  class="org-left" />
+
+<col  class="org-left" />
+
+<col  class="org-left" />
+</colgroup>
+<thead>
+<tr>
+<th scope="col" class="org-left">Name</th>
+<th scope="col" class="org-left">Description</th>
+<th scope="col" class="org-left">Open Source Alternative</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="org-left"><a href="https://github.com/ukanth/afwall">Afwall</a></td>
 <td class="org-left">&#xa0;</td>
+<td class="org-left">&#xa0;</td>
+</tr>
+
+<tr>
+<td class="org-left">Titanium Backup PRO</td>
+<td class="org-left">&#xa0;</td>
+<td class="org-left"><a href="https://github.com/machiav3lli/oandbackupx">OAndBackupX</a></td>
 </tr>
 </tbody>
 </table>
 </div>
 </div>
+
+<div id="outline-container-orgb68380c" class="outline-2">
+<h2 id="orgb68380c">Tutorials</h2>
+<div class="outline-text-2" id="text-orgb68380c">
+</div>
+<div id="outline-container-org895b996" class="outline-3">
+<h3 id="org895b996">Connect to the phone by SSH</h3>
+<div class="outline-text-3" id="text-org895b996">
+<p>
+<a href="https://wiki.termux.com/wiki/Bypassing_NAT">https://wiki.termux.com/wiki/Bypassing_NAT</a>
+</p>
+
+<p>
+An other option would be to use Wireguard and shen to <code>ssh</code>.
+</p>
+</div>
+</div>
+</div>
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Dehaeze Thomas</p>
-<p class="date">Created: 2021-04-26 lun. 11:01</p>
+<p class="date">Created: 2021-05-02 dim. 11:26</p>
 </div>
 </body>
 </html>
--- a/docs/binaries-private.html
+++ b/docs/binaries-private.html
@ -3,11 +3,11 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2021-02-10 mer. 17:57 -->
+<!-- 2021-05-02 dim. 11:26 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>My own specific binaries</title>
-<meta name="generator" content="Org mode" />
 <meta name="author" content="Dehaeze Thomas" />
+<meta name="generator" content="Org Mode" />
 <link rel="stylesheet" type="text/css" href="./dist/style.css"/>
 <script type="text/javascript" src="./dist/script.js"></script>
 </head>
@ -147,7 +147,7 @@ As an alternative, <code>sshfs</code> can be used:
 <h2 id="torrent-add"><code>torrent-add</code> - Download Torrent</h2>
 <div class="outline-text-2" id="text-torrent-add">
 <div class="org-src-container">
-<pre class="src src-bash">transmission-remote ***REMOVED***:9091 --auth tdehaeze:$<span class="org-rainbow-delimiters-depth-1">(</span><span class="org-sh-quoted-exec">pass</span> nas/transmission | sed -n 1p<span class="org-rainbow-delimiters-depth-1">)</span> -a $<span class="org-highlight-numbers-number">1</span> &amp;&amp; <span class="org-sh-escaped-newline">\</span>
+<pre class="src src-bash">transmission-remote &lt;&lt;get-password<span class="org-rainbow-delimiters-depth-1">(</span><span class="org-variable-name">passname</span>=<span class="org-string">"ip/grenoble"</span><span class="org-rainbow-delimiters-depth-1">)</span>&gt;&gt;:9091 --auth tdehaeze:$<span class="org-rainbow-delimiters-depth-1">(</span><span class="org-sh-quoted-exec">pass</span> nas/transmission | sed -n 1p<span class="org-rainbow-delimiters-depth-1">)</span> -a $<span class="org-highlight-numbers-number">1</span> &amp;&amp; <span class="org-sh-escaped-newline">\</span>
    dunstify <span class="org-string">'Torrent'</span> <span class="org-string">'Successfully added'</span> || <span class="org-sh-escaped-newline">\</span>
    dunstify <span class="org-string">'Torrent'</span> <span class="org-string">'Error'</span>
 </pre>
@ -271,7 +271,7 @@ List all <code>pdf</code> files and open selected one with zathura.
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Dehaeze Thomas</p>
-<p class="date">Created: 2021-02-10 mer. 17:57</p>
+<p class="date">Created: 2021-05-02 dim. 11:26</p>
 </div>
 </body>
 </html>
--- a/docs/calendar-contact.html
+++ b/docs/calendar-contact.html
@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2021-04-25 dim. 19:10 -->
+<!-- 2021-05-02 dim. 11:26 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>Calendar and Contact Configuration</title>
 <meta name="author" content="Dehaeze Thomas" />
@ -53,6 +53,22 @@
 <span class="org-variable-name">path</span> = <span class="org-string">"~/.calendars/radicale/"</span>
 <span class="org-variable-name">fileext</span> = <span class="org-string">".ics"</span>

+[<span class="org-type">pair esrf_calendar</span>]
+<span class="org-variable-name">a</span> = <span class="org-string">"esrf_calendar_remote"</span>
+<span class="org-variable-name">b</span> = <span class="org-string">"esrf_calendar_local"</span>
+<span class="org-variable-name">collections</span> = [<span class="org-string">"calendar"</span>]
+<span class="org-variable-name">conflict_resolution</span> = <span class="org-string">"a wins"</span>
+
+[<span class="org-type">storage esrf_calendar_remote</span>]
+<span class="org-variable-name">type</span> = <span class="org-string">"caldav"</span>
+<span class="org-variable-name">url</span> = <span class="org-string">"https://calendar.esrf.fr/egroupware/groupdav.php/calendar"</span>
+<span class="org-variable-name">username</span> = <span class="org-string">"dehaeze"</span>
+<span class="org-variable-name">password</span> = <span class="org-string">"&lt;&lt;get-password(passname="</span>ce-esrf.fr/dehaeze<span class="org-string">")&gt;&gt;"</span>
+
+[<span class="org-type">storage esrf_calendar_local</span>]
+<span class="org-variable-name">type</span> = <span class="org-string">"filesystem"</span>
+<span class="org-variable-name">path</span> = <span class="org-string">"~/.calendars/esrf/"</span>
+<span class="org-variable-name">fileext</span> = <span class="org-string">".ics"</span>

 [<span class="org-type">pair radicale_contacts</span>]
 <span class="org-variable-name">a</span> = <span class="org-string">"radicale_contacts_remote"</span>
@ -83,14 +99,23 @@

 [<span class="org-type">[Home]</span>]
 <span class="org-variable-name">path</span> = ~/.calendars/radicale/76bfc802-3186-e3af-f688-7e165115b4f8/
-<span class="org-variable-name">color</span> = <span class="org-string">"#B8BB26"</span>
+<span class="org-variable-name">color</span> = <span class="org-string">"#B8BB26"</span> <span class="org-comment-delimiter"># </span><span class="org-comment">Green</span>

 [<span class="org-type">[Thesis]</span>]
 <span class="org-variable-name">path</span> = ~/.calendars/radicale/f78f1649-b54e-7bfe-488d-6a7005a5aa2f/
-<span class="org-variable-name">color</span> = <span class="org-string">"#FB4934"</span>
+<span class="org-variable-name">color</span> = <span class="org-string">"#FB4934"</span> <span class="org-comment-delimiter"># </span><span class="org-comment">Red</span>
+
+[<span class="org-type">[ESRF]</span>]
+<span class="org-variable-name">path</span> = ~/.calendars/esrf/calendar/
+<span class="org-variable-name">color</span> = <span class="org-string">"#83A598"</span> <span class="org-comment-delimiter"># </span><span class="org-comment">Blue</span>
+
+[<span class="org-type">[Birthdays]</span>]
+<span class="org-variable-name">path</span> = ~/.contacts/98ee5e2c-afcf-70e0-c4a2-9fb9de2e97b7/
+<span class="org-variable-name">color</span> = <span class="org-string">"#D3869B"</span> <span class="org-comment-delimiter"># </span><span class="org-comment">aqua</span>
+<span class="org-variable-name">type</span> = birthdays

 [<span class="org-type">highlight_days</span>]
-<span class="org-variable-name">multiple</span> = <span class="org-string">"#FABD2F"</span>
+<span class="org-variable-name">multiple</span> = <span class="org-string">"#FABD2F"</span> <span class="org-comment-delimiter"># </span><span class="org-comment">Yellow</span>

 [<span class="org-type">default</span>]
 <span class="org-variable-name">highlight_event_days</span> = True
@ -169,7 +194,7 @@
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Dehaeze Thomas</p>
-<p class="date">Created: 2021-04-25 dim. 19:10</p>
+<p class="date">Created: 2021-05-02 dim. 11:26</p>
 </div>
 </body>
 </html>
--- a/docs/config.html
+++ b/docs/config.html
@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2021-04-25 dim. 19:10 -->
+<!-- 2021-05-02 dim. 11:26 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>Configuration Files</title>
 <meta name="author" content="Dehaeze Thomas" />
@ -42,33 +42,14 @@
 <pre class="src src-conf">AddKeysToAgent  yes

 Host grenoble
-    hostname ***REMOVED***
-    Port <span class="org-highlight-numbers-number">10022</span>
-    user tdehaeze
-    IdentityFile ~/.ssh/id_rsa
-
-Host wingaudio
-    hostname 207.154.251.241
+    <span class="org-variable-name">hostname &lt;&lt;get-password(passname</span>=<span class="org-string">"ip/grenoble"</span>)&gt;&gt;
    Port <span class="org-highlight-numbers-number">22</span>
-    user tdehaeze
+    user thomas
    IdentityFile ~/.ssh/id_rsa

-Host octoprint
-    hostname 192.168.1.56
-    Port <span class="org-highlight-numbers-number">22</span>
-    user pi
-    IdentityFile ~/.ssh/id_rsa
-
-Host hassio
-    hostname 192.168.1.101
-    Port <span class="org-highlight-numbers-number">10022</span>
-    user root
-    IdentityFile ~/.ssh/id_rsa
-
-Host nas
-    hostname 192.168.1.50
-    Port <span class="org-highlight-numbers-number">10022</span>
-    user tdehaeze
+Host oneplus
+    hostname 192.168.1.58
+    Port <span class="org-highlight-numbers-number">8022</span>
    IdentityFile ~/.ssh/id_rsa
 </pre>
 </div>
@ -857,7 +838,7 @@ Colors
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Dehaeze Thomas</p>
-<p class="date">Created: 2021-04-25 dim. 19:10</p>
+<p class="date">Created: 2021-05-02 dim. 11:26</p>
 </div>
 </body>
 </html>
--- a/docs/doom.html
+++ b/docs/doom.html
@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2021-04-25 dim. 19:10 -->
+<!-- 2021-05-02 dim. 11:26 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>Doom Emacs Configuration</title>
 <meta name="author" content="Dehaeze Thomas" />
@ -56,7 +56,7 @@
 <ul>
 <li><a href="#org9a192de">Org General Config</a></li>
 <li><a href="#org9c78e0f">Org Inline Images</a></li>
-<li><a href="#orge34498a">Org Links</a></li>
+<li><a href="#orgecc2892">Org Links</a></li>
 <li><a href="#org06d5c9f">Org Tagging</a></li>
 <li><a href="#org82e8603">Org Refile</a></li>
 <li><a href="#org4e35a03">Org TODO</a></li>
@ -104,7 +104,7 @@
 <li><a href="#org90e8b2b">Render Tables</a></li>
 <li><a href="#orgab67420">Org Special Block Extras</a></li>
 <li><a href="#org7adfc1c">Org Inline Task</a></li>
-<li><a href="#orgecc2892">Org Links</a>
+<li><a href="#org776db03">Org Links</a>
 <ul>
 <li><a href="#orgd172897">Youtube Links</a></li>
 </ul>
@ -160,7 +160,7 @@
 </li>
 <li><a href="#org5722bd7">LaTeX</a>
 <ul>
-<li><a href="#org1b07702">Basic Config</a></li>
+<li><a href="#orgf94becc">Basic Config</a></li>
 <li><a href="#orge71a16b">Bibtex</a></li>
 </ul>
 </li>
@ -179,7 +179,7 @@
 <li><a href="#orgafab721">Resources</a></li>
 <li><a href="#org2b8b75f">Cheatsheet</a></li>
 <li><a href="#orgebf9129">Helping function</a></li>
-<li><a href="#orgf94becc">Basic Config</a></li>
+<li><a href="#org9526657">Basic Config</a></li>
 <li><a href="#org7c3d72b">Additional config</a></li>
 <li><a href="#org716f5e2">Provide Information</a></li>
 <li><a href="#org48a7840">Receiving emails using mbsync</a></li>
@ -639,7 +639,8 @@ Tables:
 <div class="outline-text-3" id="text-orgb47335d">
 <div class="org-src-container">
 <pre class="src src-emacs-lisp"><span class="org-rainbow-delimiters-depth-1">(</span><span class="org-keyword">after!</span> evil
-  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">map!</span> <span class="org-builtin">:m</span>  <span class="org-string">"-"</span>  <span class="org-highlight-quoted-quote">#'</span><span class="org-highlight-quoted-symbol">dired-jump</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
+  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">map!</span> <span class="org-builtin">:m</span>  <span class="org-string">"-"</span>  <span class="org-highlight-quoted-quote">#'</span><span class="org-highlight-quoted-symbol">dired-jump</span><span class="org-rainbow-delimiters-depth-2">)</span>
+  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">setq</span> <span class="org-variable-name">evil-respect-visual-line-mode</span> nil<span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
 </pre>
 </div>

@ -662,6 +663,11 @@ Make horizontal movement cross lines
 </pre>
 </div>

+<p>
+;; In org-mode, $ does not go to the real end of line, it jumps to the end of <i>visual</i> line
+;; Create a real end of line by APPENDING and then going back to normal state
+</p>
+
 <p>
 Evil Surround (not working):
 </p>
@ -719,7 +725,7 @@ Turn off auto-fill mode that add line breaks.
  <span class="org-comment-delimiter">;; </span><span class="org-comment">turn off auto-fill for org-mode</span>
  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-function-name">add-hook</span> <span class="org-highlight-quoted-quote">'</span><span class="org-variable-name">org-mode-hook</span> <span class="org-highlight-quoted-quote">'</span><span class="org-highlight-quoted-symbol">turn-off-auto-fill</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
 <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-keyword">after!</span> auctex
-  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-function-name">add-hook</span> <span class="org-highlight-quoted-quote">'</span><span class="org-variable-name">latex-mode-hook</span> <span class="org-highlight-quoted-quote">'</span><span class="org-highlight-quoted-symbol">turn-off-auto-fill</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
+  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-function-name">add-hook</span> <span class="org-highlight-quoted-quote">'</span><span class="org-highlight-quoted-symbol">latex-mode-hook</span> <span class="org-highlight-quoted-quote">'</span><span class="org-highlight-quoted-symbol">turn-off-auto-fill</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
 </pre>
 </div>
 </div>
@ -1010,9 +1016,9 @@ Display the real size of images and not the one set with <code>attr_latex: :widt
 </div>
 </div>

-<div id="outline-container-orge34498a" class="outline-3">
-<h3 id="orge34498a">Org Links</h3>
-<div class="outline-text-3" id="text-orge34498a">
+<div id="outline-container-orgecc2892" class="outline-3">
+<h3 id="orgecc2892">Org Links</h3>
+<div class="outline-text-3" id="text-orgecc2892">
 <div class="org-src-container">
 <pre class="src src-emacs-lisp"><span class="org-rainbow-delimiters-depth-1">(</span><span class="org-keyword">after!</span> org
  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">setq</span> <span class="org-variable-name">org-link-abbrev-alist</span>
@ -1829,7 +1835,7 @@ Adapt this from <a href="https://github.com/alhassy/emacs.d">https://github.com/
                                           <span class="org-builtin">:image-output-type</span> <span class="org-string">"png"</span>
                                           <span class="org-builtin">:image-size-adjust</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-highlight-numbers-number">1.0</span> . <span class="org-highlight-numbers-number">1.0</span><span class="org-rainbow-delimiters-depth-2">)</span>
                                           <span class="org-builtin">:latex-compiler</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"pdflatex -interaction nonstopmode -output-directory %o %f"</span><span class="org-rainbow-delimiters-depth-2">)</span>
-                                           <span class="org-builtin">:image-converter</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"convert -density %D -trim -antialias %f -quality 100 %O"</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
+                                           <span class="org-builtin">:image-converter</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"convert -density 100 -trim -antialias %f -quality 100 %O"</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
                                          <span class="org-rainbow-delimiters-depth-1">(</span>dvipng
                                           <span class="org-builtin">:programs</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"latex"</span> <span class="org-string">"dvipng"</span><span class="org-rainbow-delimiters-depth-2">)</span>
                                           <span class="org-builtin">:description</span> <span class="org-string">"dvi &gt; png"</span>
@ -1839,6 +1845,24 @@ Adapt this from <a href="https://github.com/alhassy/emacs.d">https://github.com/
                                           <span class="org-builtin">:image-size-adjust</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-highlight-numbers-number">0.4</span> . <span class="org-highlight-numbers-number">0.4</span><span class="org-rainbow-delimiters-depth-2">)</span>
                                           <span class="org-builtin">:latex-compiler</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"latex -interaction nonstopmode -output-directory %o %f"</span><span class="org-rainbow-delimiters-depth-2">)</span>
                                           <span class="org-builtin">:image-converter</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"dvipng -D %D -T tight -o %O %f"</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
+                                          <span class="org-rainbow-delimiters-depth-1">(</span>pdf2svg
+                                           <span class="org-builtin">:programs</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"pdflatex"</span> <span class="org-string">"pdftocairo"</span> <span class="org-string">"pdfcrop"</span><span class="org-rainbow-delimiters-depth-2">)</span>
+                                           <span class="org-builtin">:description</span> <span class="org-string">"pdf &gt; png"</span>
+                                           <span class="org-builtin">:message</span> <span class="org-string">"you need to install the programs: pdflatex, pdftocairo and pdfcrop."</span>
+                                           <span class="org-builtin">:image-input-type</span> <span class="org-string">"pdf"</span>
+                                           <span class="org-builtin">:image-output-type</span> <span class="org-string">"svg"</span>
+                                           <span class="org-builtin">:image-size-adjust</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-highlight-numbers-number">1.0</span> . <span class="org-highlight-numbers-number">1.0</span><span class="org-rainbow-delimiters-depth-2">)</span>
+                                           <span class="org-builtin">:latex-compiler</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"pdflatex -interaction nonstopmode -output-directory %o %f"</span><span class="org-rainbow-delimiters-depth-2">)</span>
+                                           <span class="org-builtin">:image-converter</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"pdfcrop %f %f &amp;&amp; pdf2svg %f %O"</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
+                                          <span class="org-rainbow-delimiters-depth-1">(</span>pdf2dvi
+                                           <span class="org-builtin">:programs</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"pdflatex"</span> <span class="org-string">"dvipng"</span><span class="org-rainbow-delimiters-depth-2">)</span>
+                                           <span class="org-builtin">:description</span> <span class="org-string">"pdf &gt; png"</span>
+                                           <span class="org-builtin">:message</span> <span class="org-string">"you need to install the programs: pdflatex, pdftocairo and pdfcrop."</span>
+                                           <span class="org-builtin">:image-input-type</span> <span class="org-string">"dvi"</span>
+                                           <span class="org-builtin">:image-output-type</span> <span class="org-string">"png"</span>
+                                           <span class="org-builtin">:image-size-adjust</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-highlight-numbers-number">0.4</span> . <span class="org-highlight-numbers-number">0.4</span><span class="org-rainbow-delimiters-depth-2">)</span>
+                                           <span class="org-builtin">:latex-compiler</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"pdflatex -output-format dvi -interaction nonstopmode -output-directory %o %f"</span><span class="org-rainbow-delimiters-depth-2">)</span>
+                                           <span class="org-builtin">:image-converter</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"dvipng -D %D -T tight -o %O %f"</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
                                          <span class="org-rainbow-delimiters-depth-1">(</span>dvisvgm
                                           <span class="org-builtin">:programs</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"xetex"</span> <span class="org-string">"dvisvgm"</span><span class="org-rainbow-delimiters-depth-2">)</span>
                                           <span class="org-builtin">:description</span> <span class="org-string">"xdv &gt; svg"</span>
@ -1851,11 +1875,11 @@ Adapt this from <a href="https://github.com/alhassy/emacs.d">https://github.com/
                                          <span class="org-rainbow-delimiters-depth-3">)</span><span class="org-rainbow-delimiters-depth-2">)</span>

  <span class="org-comment-delimiter">;; </span><span class="org-comment">Use imagemagick/dvisvgm to generate png from pdf</span>
-  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">setq</span> <span class="org-variable-name">org-preview-latex-default-process</span> <span class="org-highlight-quoted-quote">'</span><span class="org-highlight-quoted-symbol">dvisvgm</span><span class="org-rainbow-delimiters-depth-2">)</span>
+  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">setq</span> <span class="org-variable-name">org-preview-latex-default-process</span> <span class="org-highlight-quoted-quote">'</span><span class="org-highlight-quoted-symbol">pdf2svg</span><span class="org-rainbow-delimiters-depth-2">)</span>

  <span class="org-comment-delimiter">;; </span><span class="org-comment">Don't change the font size for subscripts and superscripts in latex fragments.</span>
  <span class="org-comment-delimiter">;; </span><span class="org-comment">This cause the orgmode tables not to be well aligned.</span>
-  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">setq</span> <span class="org-variable-name">font-latex-fontify-script</span> nil<span class="org-rainbow-delimiters-depth-2">)</span>
+  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">setq</span> font-latex-fontify-script nil<span class="org-rainbow-delimiters-depth-2">)</span>

  <span class="org-comment-delimiter">;; </span><span class="org-comment">Colors of latex fragments</span>
  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">setq</span> <span class="org-variable-name">org-format-latex-options</span> <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-constant">plist-put</span> <span class="org-variable-name">org-format-latex-options</span> <span class="org-builtin">:foreground</span> <span class="org-highlight-quoted-quote">'</span><span class="org-highlight-quoted-symbol">default</span><span class="org-rainbow-delimiters-depth-3">)</span><span class="org-rainbow-delimiters-depth-2">)</span>
@ -2542,9 +2566,9 @@ Special Environments
 </div>
 </div>

-<div id="outline-container-orgecc2892" class="outline-3">
-<h3 id="orgecc2892">Org Links</h3>
-<div class="outline-text-3" id="text-orgecc2892">
+<div id="outline-container-org776db03" class="outline-3">
+<h3 id="org776db03">Org Links</h3>
+<div class="outline-text-3" id="text-org776db03">
 </div>
 <div id="outline-container-orgd172897" class="outline-4">
 <h4 id="orgd172897">Youtube Links</h4>
@ -3272,7 +3296,7 @@ Future task2               :         des4, after des3, 5d
 </div>


-<div id="org2a44176" class="figure">
+<div id="org9427c31" class="figure">
 <p><img src="figs/mermaid.png" alt="mermaid.png" />
 </p>
 </div>
@ -3389,7 +3413,7 @@ when inside a source block. Otherwise, keep the normal behavior for <code>ctrl-r
    <span class="org-doc">"Returns t when the point is inside a source code block"</span>
    <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-constant">string=</span> <span class="org-string">"src"</span> <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-function-name">org-in-block-p</span> <span class="org-highlight-quoted-quote">'</span><span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"src"</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span><span class="org-rainbow-delimiters-depth-3">)</span><span class="org-rainbow-delimiters-depth-2">)</span>

-  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">if</span> <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-function-name">tdh-in-src-block-p</span><span class="org-rainbow-delimiters-depth-3">)</span>
+  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">if</span> <span class="org-rainbow-delimiters-depth-3">(</span>tdh-in-src-block-p<span class="org-rainbow-delimiters-depth-3">)</span>
      <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-keyword">progn</span>
        <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-function-name">org-babel-execute-src-block</span><span class="org-rainbow-delimiters-depth-1">)</span>
        <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-function-name">org-babel-next-src-block</span><span class="org-rainbow-delimiters-depth-1">)</span><span class="org-rainbow-delimiters-depth-3">)</span>
@ -3515,7 +3539,7 @@ if no region is selected, it runs all the code blocks and goes to the next block
    <span class="org-doc">"Returns t when the point is inside a source code block"</span>
    <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-constant">string=</span> <span class="org-string">"src"</span> <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-function-name">org-in-block-p</span> <span class="org-highlight-quoted-quote">'</span><span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"src"</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span><span class="org-rainbow-delimiters-depth-3">)</span><span class="org-rainbow-delimiters-depth-2">)</span>

-  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">if</span> <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-function-name">tdh-in-src-block-p</span><span class="org-rainbow-delimiters-depth-3">)</span>
+  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">if</span> <span class="org-rainbow-delimiters-depth-3">(</span>tdh-in-src-block-p<span class="org-rainbow-delimiters-depth-3">)</span>
      <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-keyword">let</span> <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-rainbow-delimiters-depth-2">(</span>lang <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-constant">nth</span> <span class="org-highlight-numbers-number">0</span> <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-function-name">org-babel-get-src-block-info</span><span class="org-rainbow-delimiters-depth-1">)</span><span class="org-rainbow-delimiters-depth-3">)</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
        <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-keyword">if</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-constant">string=</span> lang <span class="org-string">"matlab"</span><span class="org-rainbow-delimiters-depth-2">)</span>
            <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">if</span> <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-function-name">region-active-p</span><span class="org-rainbow-delimiters-depth-3">)</span>
@ -3550,7 +3574,7 @@ if no region is selected, it runs all the code blocks and goes to the next block
    <span class="org-doc">"Returns t when the point is inside a source code block"</span>
    <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-constant">string=</span> <span class="org-string">"src"</span> <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-function-name">org-in-block-p</span> <span class="org-highlight-quoted-quote">'</span><span class="org-rainbow-delimiters-depth-2">(</span><span class="org-string">"src"</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span><span class="org-rainbow-delimiters-depth-3">)</span><span class="org-rainbow-delimiters-depth-2">)</span>

-  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">if</span> <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-function-name">tdh-in-src-block-p</span><span class="org-rainbow-delimiters-depth-3">)</span>
+  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">if</span> <span class="org-rainbow-delimiters-depth-3">(</span>tdh-in-src-block-p<span class="org-rainbow-delimiters-depth-3">)</span>
      <span class="org-rainbow-delimiters-depth-3">(</span><span class="org-keyword">progn</span>
        <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-function-name">org-edit-special</span><span class="org-rainbow-delimiters-depth-1">)</span>
        <span class="org-rainbow-delimiters-depth-1">(</span><span class="org-function-name">indent-region</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-constant">point-min</span><span class="org-rainbow-delimiters-depth-2">)</span> <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-constant">point-max</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
@ -4136,9 +4160,9 @@ Provides nice functions such as:
 </ul>
 </div>

-<div id="outline-container-org1b07702" class="outline-3">
-<h3 id="org1b07702">Basic Config</h3>
-<div class="outline-text-3" id="text-org1b07702">
+<div id="outline-container-orgf94becc" class="outline-3">
+<h3 id="orgf94becc">Basic Config</h3>
+<div class="outline-text-3" id="text-orgf94becc">
 <div class="org-src-container">
 <pre class="src src-emacs-lisp"><span class="org-rainbow-delimiters-depth-1">(</span><span class="org-keyword">after!</span> auctex
  <span class="org-rainbow-delimiters-depth-2">(</span><span class="org-keyword">setq</span> <span class="org-variable-name">+latex-viewers</span> <span class="org-highlight-quoted-quote">'</span><span class="org-rainbow-delimiters-depth-3">(</span>zathura pdf-tools<span class="org-rainbow-delimiters-depth-3">)</span><span class="org-rainbow-delimiters-depth-2">)</span><span class="org-rainbow-delimiters-depth-1">)</span>
@ -4420,9 +4444,9 @@ Choose account label to feed msmtp -a option based on From header in Message buf
 </div>
 </div>

-<div id="outline-container-orgf94becc" class="outline-3">
-<h3 id="orgf94becc">Basic Config</h3>
-<div class="outline-text-3" id="text-orgf94becc">
+<div id="outline-container-org9526657" class="outline-3">
+<h3 id="org9526657">Basic Config</h3>
+<div class="outline-text-3" id="text-org9526657">
 <div class="org-src-container">
 <pre class="src src-emacs-lisp"><span class="org-rainbow-delimiters-depth-1">(</span><span class="org-keyword">use-package!</span> mu4e
  <span class="org-builtin">:config</span>
@ -4668,8 +4692,7 @@ Choose account label to feed msmtp -a option based on From header in Message buf
       <span class="org-rainbow-delimiters-depth-2">(</span>javascript
        +lsp<span class="org-rainbow-delimiters-depth-2">)</span>
       <span class="org-rainbow-delimiters-depth-2">(</span>latex
-        +latexmk
-        +lsp<span class="org-rainbow-delimiters-depth-2">)</span>
+        +latexmk<span class="org-rainbow-delimiters-depth-2">)</span>
       <span class="org-comment-delimiter">;; </span><span class="org-comment">markdown          ; writing docs for people to ignore</span>
       <span class="org-rainbow-delimiters-depth-2">(</span>org              <span class="org-comment-delimiter">; </span><span class="org-comment">organize your plain life in plain text</span>
        +dragndrop       <span class="org-comment-delimiter">; </span><span class="org-comment">drag &amp; drop files/images into org buffers</span>
@ -4844,7 +4867,7 @@ Choose account label to feed msmtp -a option based on From header in Message buf
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Dehaeze Thomas</p>
-<p class="date">Created: 2021-04-25 dim. 19:10</p>
+<p class="date">Created: 2021-05-02 dim. 11:26</p>
 </div>
 </body>
 </html>
--- a/docs/i3.html
+++ b/docs/i3.html
@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2021-04-25 dim. 19:10 -->
+<!-- 2021-05-02 dim. 11:26 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>I3 Configuration</title>
 <meta name="author" content="Dehaeze Thomas" />
@ -247,7 +247,7 @@ set $ws8 <span class="org-highlight-numbers-number">8</span>
 <span class="org-variable-name">for_window [class</span>=<span class="org-string">"Floating"</span>] floating enable, resize set <span class="org-highlight-numbers-number">800</span> <span class="org-highlight-numbers-number">600</span>, move position <span class="org-highlight-numbers-number">1100</span> <span class="org-highlight-numbers-number">460</span>
 <span class="org-variable-name">for_window [class</span>=<span class="org-string">"mpv"</span>] floating enable <span class="org-comment-delimiter"># </span><span class="org-comment">Size/Position is defined in mpv.conf</span>
 <span class="org-variable-name">for_window [class</span>=<span class="org-string">"Sxiv"</span>] floating enable, resize set <span class="org-highlight-numbers-number">800</span> <span class="org-highlight-numbers-number">600</span>, move position center
-<span class="org-variable-name">for_window [title</span>=<span class="org-string">"khal"</span>] floating enable, resize set <span class="org-highlight-numbers-number">600</span> <span class="org-highlight-numbers-number">600</span>, move position center
+<span class="org-variable-name">for_window [title</span>=<span class="org-string">"khal interactive"</span>] floating enable, resize set <span class="org-highlight-numbers-number">600</span> <span class="org-highlight-numbers-number">600</span>, move position center
 <span class="org-variable-name">for_window [title</span>=<span class="org-string">"ncmpcpp"</span>] floating enable, resize set <span class="org-highlight-numbers-number">800</span> <span class="org-highlight-numbers-number">400</span>, move position center
 <span class="org-variable-name">for_window [title</span>=<span class="org-string">"nmtui"</span>] floating enable, resize set <span class="org-highlight-numbers-number">800</span> <span class="org-highlight-numbers-number">600</span>, move position center
 <span class="org-variable-name">for_window [title</span>=<span class="org-string">"linkding"</span>] floating enable, resize set <span class="org-highlight-numbers-number">800</span> <span class="org-highlight-numbers-number">600</span>, move position center
@ -293,7 +293,7 @@ exec --no-startup-id polybar top &gt;&gt;/tmp/polybar.log 2&gt;&amp;1 &amp;
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Dehaeze Thomas</p>
-<p class="date">Created: 2021-04-25 dim. 19:10</p>
+<p class="date">Created: 2021-05-02 dim. 11:26</p>
 </div>
 </body>
 </html>
--- a/docs/nas.html
+++ b/docs/nas.html
@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2021-04-25 dim. 19:10 -->
+<!-- 2021-05-02 dim. 11:26 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>Home Server</title>
 <meta name="author" content="Dehaeze Thomas" />
@ -56,74 +56,74 @@
 <ul>
 <li><a href="#orgff78ad6">Networks</a></li>
 <li><a href="#org0110d65">Logging</a></li>
-<li><a href="#org9442cd9"><code>traefik</code> - Application proxy</a>
+<li><a href="#org75d4e83"><code>traefik</code> - Application proxy (link)</a>
 <ul>
 <li><a href="#org2e68b6a"><code>usersfile</code></a></li>
 <li><a href="#org986ca95"><code>traefik.yaml</code></a></li>
 </ul>
 </li>
-<li><a href="#org682fd4a"><code>homer</code> - Home page</a>
-<ul>
-<li><a href="#org66a172e"><code>config.yml</code></a></li>
-</ul>
-</li>
-<li><a href="#orgba8c1aa"><code>snapraid</code> - Manage local backup with parity disk</a>
-<ul>
-<li><a href="#org243fb45"><code>snapraid.conf</code></a></li>
-<li><a href="#orgf79de7e"><code>snapraid-runner.conf</code></a></li>
-</ul>
-</li>
-<li><a href="#org1646b45"><code>portainer</code> - Manage docker</a></li>
-<li><a href="#org42336f6"><code>wireguard</code> - VPN</a></li>
-<li><a href="#org3bffa6e"><code>gitea</code> - Git server</a></li>
-<li><a href="#org5079d4d"><code>caddy</code> - Research Pages</a>
-<ul>
-<li><a href="#orgcb02743"><code>Caddyfile</code></a></li>
-</ul>
-</li>
-<li><a href="#org561b908"><code>caddy</code> - Dotfiles</a>
-<ul>
-<li><a href="#orgfd07272"><code>Caddyfile</code></a></li>
-</ul>
-</li>
 <li><a href="#org1d70220"><code>nginx</code> - Root</a>
 <ul>
 <li><a href="#orga3c41af"><code>nginx.conf</code></a></li>
 </ul>
 </li>
+<li><a href="#org2f71095"><code>homer</code> - Home page (link)</a>
+<ul>
+<li><a href="#org66a172e"><code>config.yml</code></a></li>
+</ul>
+</li>
+<li><a href="#org3ab303e"><code>snapraid</code> - Manage local backup with parity disk (link)</a>
+<ul>
+<li><a href="#org243fb45"><code>snapraid.conf</code></a></li>
+<li><a href="#orgf79de7e"><code>snapraid-runner.conf</code></a></li>
+</ul>
+</li>
+<li><a href="#org9fb4ba7"><code>portainer</code> - Manage docker (link)</a></li>
+<li><a href="#org29fde19"><code>wireguard</code> - VPN (link)</a></li>
+<li><a href="#orgb293734"><code>gitea</code> - Git server (link)</a></li>
+<li><a href="#org5079d4d"><code>caddy</code> - Research Pages</a>
+<ul>
+<li><a href="#orgfd07272"><code>Caddyfile</code></a></li>
+</ul>
+</li>
+<li><a href="#org561b908"><code>caddy</code> - Dotfiles</a>
+<ul>
+<li><a href="#orge337d87"><code>Caddyfile</code></a></li>
+</ul>
+</li>
 <li><a href="#org361b49e"><code>hugo</code> - Wiki + Blog</a></li>
-<li><a href="#orgeea56a9"><code>syncthing</code> - File Synchronization</a></li>
-<li><a href="#org061c36c"><code>miniflux</code> - RSS reader</a></li>
-<li><a href="#org51bdaa4"><code>homeassistant</code> - Home Automation</a></li>
-<li><a href="#org675a101"><code>jellyfin</code> - Media server</a></li>
-<li><a href="#orga8dc1e3"><code>filebrowser</code> - Web file browser</a>
+<li><a href="#orgf1c740a"><code>syncthing</code> - File Synchronization (link)</a></li>
+<li><a href="#org95594dd"><code>miniflux</code> - RSS reader (link)</a></li>
+<li><a href="#org6a527e1"><code>homeassistant</code> - Home Automation (link)</a></li>
+<li><a href="#orgdba8c98"><code>jellyfin</code> - Media server (link)</a></li>
+<li><a href="#org7097caa"><code>filebrowser</code> - Web file browser (link)</a>
 <ul>
 <li><a href="#org191aab8"><code>.filebrowser.json</code></a></li>
 </ul>
 </li>
-<li><a href="#org3a5502c"><code>scrutiny</code> - Hard drive monitoring</a></li>
-<li><a href="#org12e136c"><code>transmission</code> - Torrent server</a></li>
-<li><a href="#orgceb876c"><code>aria2</code> - Download daemon</a>
+<li><a href="#orgf34f80a"><code>scrutiny</code> - Hard drive monitoring (link)</a></li>
+<li><a href="#org51a4b6c"><code>transmission</code> - Torrent server (link)</a></li>
+<li><a href="#orge0635d3"><code>aria2</code> - Download daemon (link)</a>
 <ul>
 <li><a href="#orgaafd6da"><code>aria2.conf</code></a></li>
 </ul>
 </li>
-<li><a href="#org759769e"><code>aria2-ui</code> - Download web UI</a></li>
-<li><a href="#org98dce20"><code>linkding</code> - Bookmark manager</a></li>
 <li><a href="#orgfab848b"><code>radicale</code> - CalDAC/CardDAV server (link)</a>
 <ul>
 <li><a href="#org99f7e08"><code>config</code></a></li>
 </ul>
 </li>
-<li><a href="#org7d77805"><code>restic</code> - Automatic online backups</a>
+<li><a href="#org0172548"><code>restic</code> - Automatic online backups (link)</a>
 <ul>
 <li><a href="#orge22af00"><code>exclude.txt</code> - Exclude files</a></li>
 </ul>
 </li>
-<li><a href="#org835dd0e"><code>octoprint</code> - Web interface for 3D printing</a></li>
-<li><a href="#org4fdb420"><code>adguardhome</code> - Web interface for 3D printing</a></li>
-<li><a href="#org5b7a10e"><code>mealie</code> - Recipe Manager</a></li>
-<li><a href="#org63a3028"><code>diun</code> - Notification for Docker image updates</a></li>
+<li><a href="#orge07bead"><code>octoprint</code> - Web interface for 3D printing (link)</a></li>
+<li><a href="#orgb9ae7e8"><code>linkding</code> - Bookmark manager (link)</a></li>
+<li><a href="#orgd7244f7"><code>adguardhome</code> - Network-wide ads &amp; trackers blocking DNS server (link)</a></li>
+<li><a href="#org065ce60"><code>mealie</code> - Recipe Manager (link)</a></li>
+<li><a href="#org40ab15c"><code>diun</code> - Notification for Docker image updates (link)</a></li>
+<li><a href="#org65f5c7a"><code>commento</code> - Commenting system (link)</a></li>
 </ul>
 </li>
 <li><a href="#orgbb869cd"><code>.env</code> - Variable used for Docker Compose</a></li>
@ -701,9 +701,9 @@ If indeed, we want to make a copy of the file, we can use the backup folder
 </div>
 </div>

-<div id="outline-container-org9442cd9" class="outline-3">
-<h3 id="org9442cd9"><code>traefik</code> - Application proxy</h3>
-<div class="outline-text-3" id="text-org9442cd9">
+<div id="outline-container-org75d4e83" class="outline-3">
+<h3 id="org75d4e83"><code>traefik</code> - Application proxy (<a href="https://github.com/traefik/traefik">link</a>)</h3>
+<div class="outline-text-3" id="text-org75d4e83">
 <div class="org-src-container">
 <pre class="src src-yaml"><span class="org-variable-name">services</span>:
 </pre>
@ -832,9 +832,67 @@ If indeed, we want to make a copy of the file, we can use the backup folder
 </div>
 </div>

-<div id="outline-container-org682fd4a" class="outline-3">
-<h3 id="org682fd4a"><code>homer</code> - Home page</h3>
-<div class="outline-text-3" id="text-org682fd4a">
+<div id="outline-container-org1d70220" class="outline-3">
+<h3 id="org1d70220"><code>nginx</code> - Root</h3>
+<div class="outline-text-3" id="text-org1d70220">
+<div class="org-src-container">
+<pre class="src src-yaml">  <span class="org-variable-name">root</span>:
+    <span class="org-variable-name">container_name</span>: root
+    <span class="org-variable-name">image</span>: nginx
+    <span class="org-variable-name">restart</span>: unless-stopped
+    <span class="org-variable-name">networks</span>:
+      - t2_proxy
+    <span class="org-variable-name">environment</span>:
+      - PUID=$PUID
+      - PGID=$PGID
+      - TZ=$TZ
+    <span class="org-variable-name">volumes</span>:
+      - $CONFIGDIR/root/nginx.conf:/etc/nginx/nginx.conf
+    <span class="org-variable-name">labels</span>:
+      - <span class="org-string">"traefik.enable=true"</span>
+      - <span class="org-string">"traefik.http.routers.root-rtr.entrypoints=https"</span>
+      - <span class="org-string">"traefik.http.routers.root-rtr.rule=Host(`$DOMAINNAME`)"</span>
+      - <span class="org-string">"traefik.http.routers.root-rtr.tls=true"</span>
+      - <span class="org-string">"traefik.http.routers.root-rtr.service=root-svc"</span>
+      - <span class="org-string">"traefik.http.services.root-svc.loadbalancer.server.port=8080"</span>
+    <span class="org-variable-name">logging</span>: <span class="org-function-name">*default-logging</span>
+</pre>
+</div>
+</div>
+
+<div id="outline-container-orga3c41af" class="outline-4">
+<h4 id="orga3c41af"><code>nginx.conf</code></h4>
+<div class="outline-text-4" id="text-orga3c41af">
+<div class="org-src-container">
+<pre class="src src-conf"><span class="org-type">events</span> {
+
+}
+
+<span class="org-type">http</span> {
+    <span class="org-type">server</span> {
+        server_name tdehaeze.xyz;
+        listen <span class="org-highlight-numbers-number">8080</span>;
+
+        <span class="org-type">location /.well-known/matrix/client</span> {
+            proxy_pass https://matrix.tdehaeze.xyz/.well-known/matrix/client;
+            proxy_set_header X-Forwarded-For $remote_addr;
+        }
+
+        <span class="org-type">location /.well-known/matrix/server</span> {
+            proxy_pass https://matrix.tdehaeze.xyz/.well-known/matrix/server;
+            proxy_set_header X-Forwarded-For $remote_addr;
+        }
+    }
+}
+</pre>
+</div>
+</div>
+</div>
+</div>
+
+<div id="outline-container-org2f71095" class="outline-3">
+<h3 id="org2f71095"><code>homer</code> - Home page (<a href="https://github.com/bastienwirtz/homer">link</a>)</h3>
+<div class="outline-text-3" id="text-org2f71095">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">homer</span>:
    <span class="org-variable-name">container_name</span>: homer
@ -1010,9 +1068,9 @@ If indeed, we want to make a copy of the file, we can use the backup folder
 </div>
 </div>

-<div id="outline-container-orgba8c1aa" class="outline-3">
-<h3 id="orgba8c1aa"><code>snapraid</code> - Manage local backup with parity disk</h3>
-<div class="outline-text-3" id="text-orgba8c1aa">
+<div id="outline-container-org3ab303e" class="outline-3">
+<h3 id="org3ab303e"><code>snapraid</code> - Manage local backup with parity disk (<a href="https://github.com/amadvance/snapraid">link</a>)</h3>
+<div class="outline-text-3" id="text-org3ab303e">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">snapraid</span>:
    <span class="org-variable-name">container_name</span>: snapraid
@ -1141,9 +1199,9 @@ exclude .AppleDB
 </div>


-<div id="outline-container-org1646b45" class="outline-3">
-<h3 id="org1646b45"><code>portainer</code> - Manage docker</h3>
-<div class="outline-text-3" id="text-org1646b45">
+<div id="outline-container-org9fb4ba7" class="outline-3">
+<h3 id="org9fb4ba7"><code>portainer</code> - Manage docker (<a href="https://github.com/portainer/portainer">link</a>)</h3>
+<div class="outline-text-3" id="text-org9fb4ba7">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">portainer</span>:
    <span class="org-variable-name">container_name</span>: portainer
@ -1174,9 +1232,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org42336f6" class="outline-3">
-<h3 id="org42336f6"><code>wireguard</code> - VPN</h3>
-<div class="outline-text-3" id="text-org42336f6">
+<div id="outline-container-org29fde19" class="outline-3">
+<h3 id="org29fde19"><code>wireguard</code> - VPN (<a href="https://github.com/linuxserver/docker-wireguard">link</a>)</h3>
+<div class="outline-text-3" id="text-org29fde19">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">wireguard</span>:
    <span class="org-variable-name">container_name</span>: wireguard
@ -1206,9 +1264,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org3bffa6e" class="outline-3">
-<h3 id="org3bffa6e"><code>gitea</code> - Git server</h3>
-<div class="outline-text-3" id="text-org3bffa6e">
+<div id="outline-container-orgb293734" class="outline-3">
+<h3 id="orgb293734"><code>gitea</code> - Git server (<a href="https://github.com/go-gitea/gitea">link</a>)</h3>
+<div class="outline-text-3" id="text-orgb293734">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">gitea</span>:
    <span class="org-variable-name">container_name</span>: git
@ -1291,9 +1349,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-orgcb02743" class="outline-4">
-<h4 id="orgcb02743"><code>Caddyfile</code></h4>
-<div class="outline-text-4" id="text-orgcb02743">
+<div id="outline-container-orgfd07272" class="outline-4">
+<h4 id="orgfd07272"><code>Caddyfile</code></h4>
+<div class="outline-text-4" id="text-orgfd07272">
 <div class="org-src-container">
 <pre class="src src-conf">0.0.0.0:<span class="org-highlight-numbers-number">2015</span> {
    root /srv/www/
@ -1342,9 +1400,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-orgfd07272" class="outline-4">
-<h4 id="orgfd07272"><code>Caddyfile</code></h4>
-<div class="outline-text-4" id="text-orgfd07272">
+<div id="outline-container-orge337d87" class="outline-4">
+<h4 id="orge337d87"><code>Caddyfile</code></h4>
+<div class="outline-text-4" id="text-orge337d87">
 <div class="org-src-container">
 <pre class="src src-conf">0.0.0.0:<span class="org-highlight-numbers-number">2015</span> {
    root /srv/www/docs/
@ -1362,64 +1420,6 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org1d70220" class="outline-3">
-<h3 id="org1d70220"><code>nginx</code> - Root</h3>
-<div class="outline-text-3" id="text-org1d70220">
-<div class="org-src-container">
-<pre class="src src-yaml">  <span class="org-variable-name">root</span>:
-    <span class="org-variable-name">container_name</span>: root
-    <span class="org-variable-name">image</span>: nginx
-    <span class="org-variable-name">restart</span>: unless-stopped
-    <span class="org-variable-name">networks</span>:
-      - t2_proxy
-    <span class="org-variable-name">environment</span>:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
-    <span class="org-variable-name">volumes</span>:
-      - $CONFIGDIR/root/nginx.conf:/etc/nginx/nginx.conf
-    <span class="org-variable-name">labels</span>:
-      - <span class="org-string">"traefik.enable=true"</span>
-      - <span class="org-string">"traefik.http.routers.root-rtr.entrypoints=https"</span>
-      - <span class="org-string">"traefik.http.routers.root-rtr.rule=Host(`$DOMAINNAME`)"</span>
-      - <span class="org-string">"traefik.http.routers.root-rtr.tls=true"</span>
-      - <span class="org-string">"traefik.http.routers.root-rtr.service=root-svc"</span>
-      - <span class="org-string">"traefik.http.services.root-svc.loadbalancer.server.port=8080"</span>
-    <span class="org-variable-name">logging</span>: <span class="org-function-name">*default-logging</span>
-</pre>
-</div>
-</div>
-
-<div id="outline-container-orga3c41af" class="outline-4">
-<h4 id="orga3c41af"><code>nginx.conf</code></h4>
-<div class="outline-text-4" id="text-orga3c41af">
-<div class="org-src-container">
-<pre class="src src-conf"><span class="org-type">events</span> {
-
-}
-
-<span class="org-type">http</span> {
-    <span class="org-type">server</span> {
-        server_name tdehaeze.xyz;
-        listen <span class="org-highlight-numbers-number">8080</span>;
-
-        <span class="org-type">location /.well-known/matrix/client</span> {
-            proxy_pass https://matrix.tdehaeze.xyz/.well-known/matrix/client;
-            proxy_set_header X-Forwarded-For $remote_addr;
-        }
-
-        <span class="org-type">location /.well-known/matrix/server</span> {
-            proxy_pass https://matrix.tdehaeze.xyz/.well-known/matrix/server;
-            proxy_set_header X-Forwarded-For $remote_addr;
-        }
-    }
-}
-</pre>
-</div>
-</div>
-</div>
-</div>
-
 <div id="outline-container-org361b49e" class="outline-3">
 <h3 id="org361b49e"><code>hugo</code> - Wiki + Blog</h3>
 <div class="outline-text-3" id="text-org361b49e">
@ -1445,9 +1445,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-orgeea56a9" class="outline-3">
-<h3 id="orgeea56a9"><code>syncthing</code> - File Synchronization</h3>
-<div class="outline-text-3" id="text-orgeea56a9">
+<div id="outline-container-orgf1c740a" class="outline-3">
+<h3 id="orgf1c740a"><code>syncthing</code> - File Synchronization (<a href="https://hub.docker.com/r/linuxserver/syncthing">link</a>)</h3>
+<div class="outline-text-3" id="text-orgf1c740a">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">syncthing</span>:
    <span class="org-variable-name">container_name</span>: syncthing
@ -1485,9 +1485,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org061c36c" class="outline-3">
-<h3 id="org061c36c"><code>miniflux</code> - RSS reader</h3>
-<div class="outline-text-3" id="text-org061c36c">
+<div id="outline-container-org95594dd" class="outline-3">
+<h3 id="org95594dd"><code>miniflux</code> - RSS reader (<a href="https://hub.docker.com/r/miniflux/miniflux">link</a>)</h3>
+<div class="outline-text-3" id="text-org95594dd">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">miniflux</span>:
    <span class="org-variable-name">container_name</span>: miniflux
@ -1533,9 +1533,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org51bdaa4" class="outline-3">
-<h3 id="org51bdaa4"><code>homeassistant</code> - Home Automation</h3>
-<div class="outline-text-3" id="text-org51bdaa4">
+<div id="outline-container-org6a527e1" class="outline-3">
+<h3 id="org6a527e1"><code>homeassistant</code> - Home Automation (<a href="https://hub.docker.com/r/homeassistant/home-assistant">link</a>)</h3>
+<div class="outline-text-3" id="text-org6a527e1">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">homeassistant</span>:
    <span class="org-variable-name">container_name</span>: homeassistant
@ -1573,9 +1573,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org675a101" class="outline-3">
-<h3 id="org675a101"><code>jellyfin</code> - Media server</h3>
-<div class="outline-text-3" id="text-org675a101">
+<div id="outline-container-orgdba8c98" class="outline-3">
+<h3 id="orgdba8c98"><code>jellyfin</code> - Media server (<a href="https://hub.docker.com/r/linuxserver/jellyfin">link</a>)</h3>
+<div class="outline-text-3" id="text-orgdba8c98">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">jellyfin</span>:
    <span class="org-variable-name">container_name</span>: jellyfin
@ -1607,9 +1607,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-orga8dc1e3" class="outline-3">
-<h3 id="orga8dc1e3"><code>filebrowser</code> - Web file browser</h3>
-<div class="outline-text-3" id="text-orga8dc1e3">
+<div id="outline-container-org7097caa" class="outline-3">
+<h3 id="org7097caa"><code>filebrowser</code> - Web file browser (<a href="https://hub.docker.com/r/filebrowser/filebrowser">link</a>)</h3>
+<div class="outline-text-3" id="text-org7097caa">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">filebrowser</span>:
    <span class="org-variable-name">container_name</span>: filebrowser
@ -1656,9 +1656,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org3a5502c" class="outline-3">
-<h3 id="org3a5502c"><code>scrutiny</code> - Hard drive monitoring</h3>
-<div class="outline-text-3" id="text-org3a5502c">
+<div id="outline-container-orgf34f80a" class="outline-3">
+<h3 id="orgf34f80a"><code>scrutiny</code> - Hard drive monitoring (<a href="https://hub.docker.com/r/hotio/scrutiny">link</a>)</h3>
+<div class="outline-text-3" id="text-orgf34f80a">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">scrutiny</span>:
    <span class="org-variable-name">container_name</span>: scrutiny
@ -1693,9 +1693,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org12e136c" class="outline-3">
-<h3 id="org12e136c"><code>transmission</code> - Torrent server</h3>
-<div class="outline-text-3" id="text-org12e136c">
+<div id="outline-container-org51a4b6c" class="outline-3">
+<h3 id="org51a4b6c"><code>transmission</code> - Torrent server (<a href="https://hub.docker.com/r/haugene/transmission-openvpn">link</a>)</h3>
+<div class="outline-text-3" id="text-org51a4b6c">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">transmission-openvpn</span>:
    <span class="org-variable-name">container_name</span>: transmission
@ -1741,9 +1741,12 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-orgceb876c" class="outline-3">
-<h3 id="orgceb876c"><code>aria2</code> - Download daemon</h3>
-<div class="outline-text-3" id="text-orgceb876c">
+<div id="outline-container-orge0635d3" class="outline-3">
+<h3 id="orge0635d3"><code>aria2</code> - Download daemon (<a href="https://hub.docker.com/r/opengg/aria2">link</a>)</h3>
+<div class="outline-text-3" id="text-orge0635d3">
+<p>
+Backend (<a href="https://hub.docker.com/r/opengg/aria2">link</a>):
+</p>
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">aria2</span>:
    <span class="org-variable-name">container_name</span>: aria2
@ -1763,6 +1766,32 @@ exclude .AppleDB
    <span class="org-variable-name">logging</span>: <span class="org-function-name">*default-logging</span>
 </pre>
 </div>
+
+<p>
+Web-UI (<a href="https://hub.docker.com/r/p3terx/ariang">link</a>):
+</p>
+<div class="org-src-container">
+<pre class="src src-yaml">  <span class="org-variable-name">aria2-ui</span>:
+    <span class="org-variable-name">container_name</span>: aria2-ui
+    <span class="org-variable-name">image</span>: p3terx/ariang
+    <span class="org-variable-name">restart</span>: unless-stopped
+    <span class="org-variable-name">networks</span>:
+      - t2_proxy
+    <span class="org-variable-name">environment</span>:
+      - PUID=$PUID
+      - PGID=$PGID
+    <span class="org-variable-name">ports</span>:
+      - 6880:6880
+    <span class="org-variable-name">labels</span>:
+      - <span class="org-string">"traefik.enable=true"</span>
+      - <span class="org-string">"traefik.http.routers.aria2-rtr.entrypoints=http"</span>
+      - <span class="org-string">"traefik.http.routers.aria2-rtr.rule=Host(`dl.$DOMAINNAME`)"</span>
+      - <span class="org-string">"traefik.http.routers.aria2-rtr.tls=false"</span>
+      - <span class="org-string">"traefik.http.routers.aria2-rtr.service=aria2-svc"</span>
+      - <span class="org-string">"traefik.http.services.aria2-svc.loadbalancer.server.port=6880"</span>
+    <span class="org-variable-name">logging</span>: <span class="org-function-name">*default-logging</span>
+</pre>
+</div>
 </div>

 <div id="outline-container-orgaafd6da" class="outline-4">
@ -1796,64 +1825,6 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org759769e" class="outline-3">
-<h3 id="org759769e"><code>aria2-ui</code> - Download web UI</h3>
-<div class="outline-text-3" id="text-org759769e">
-<div class="org-src-container">
-<pre class="src src-yaml">  <span class="org-variable-name">aria2-ui</span>:
-    <span class="org-variable-name">container_name</span>: aria2-ui
-    <span class="org-variable-name">image</span>: p3terx/ariang
-    <span class="org-variable-name">restart</span>: unless-stopped
-    <span class="org-variable-name">networks</span>:
-      - t2_proxy
-    <span class="org-variable-name">environment</span>:
-      - PUID=$PUID
-      - PGID=$PGID
-    <span class="org-variable-name">ports</span>:
-      - 6880:6880
-    <span class="org-variable-name">labels</span>:
-      - <span class="org-string">"traefik.enable=true"</span>
-      - <span class="org-string">"traefik.http.routers.aria2-rtr.entrypoints=http"</span>
-      - <span class="org-string">"traefik.http.routers.aria2-rtr.rule=Host(`dl.$DOMAINNAME`)"</span>
-      - <span class="org-string">"traefik.http.routers.aria2-rtr.tls=false"</span>
-      - <span class="org-string">"traefik.http.routers.aria2-rtr.service=aria2-svc"</span>
-      - <span class="org-string">"traefik.http.services.aria2-svc.loadbalancer.server.port=6880"</span>
-    <span class="org-variable-name">logging</span>: <span class="org-function-name">*default-logging</span>
-</pre>
-</div>
-</div>
-</div>
-
-<div id="outline-container-org98dce20" class="outline-3">
-<h3 id="org98dce20"><code>linkding</code> - Bookmark manager</h3>
-<div class="outline-text-3" id="text-org98dce20">
-<div class="org-src-container">
-<pre class="src src-yaml">  <span class="org-variable-name">linkding</span>:
-    <span class="org-variable-name">container_name</span>: linkding
-    <span class="org-variable-name">image</span>: sissbruecker/linkding:latest
-    <span class="org-variable-name">restart</span>: unless-stopped
-    <span class="org-variable-name">networks</span>:
-      - t2_proxy
-    <span class="org-variable-name">volumes</span>:
-      - $CONFIGDIR/linkding:/etc/linkding/data
-    <span class="org-variable-name">environment</span>:
-      - TZ=$TZ
-      - PUID=$PUID
-      - PGID=$PGID
-    <span class="org-variable-name">labels</span>:
-      - <span class="org-string">"traefik.enable=true"</span>
-      - <span class="org-string">"traefik.http.routers.linkding-rtr.entrypoints=https"</span>
-      - <span class="org-string">"traefik.http.routers.linkding-rtr.rule=Host(`bm.$DOMAINNAME`)"</span>
-      - <span class="org-string">"traefik.http.routers.linkding-rtr.tls=true"</span>
-      - <span class="org-string">"traefik.http.routers.linkding-rtr.service=linkding-svc"</span>
-      - <span class="org-string">"traefik.http.routers.linkding-rtr.middlewares=traefik-auth"</span>
-      - <span class="org-string">"traefik.http.services.linkding-svc.loadbalancer.server.port=9090"</span>
-    <span class="org-variable-name">logging</span>: <span class="org-function-name">*default-logging</span>
-</pre>
-</div>
-</div>
-</div>
-
 <div id="outline-container-orgfab848b" class="outline-3">
 <h3 id="orgfab848b"><code>radicale</code> - CalDAC/CardDAV server (<a href="https://github.com/tomsquest/docker-radicale">link</a>)</h3>
 <div class="outline-text-3" id="text-orgfab848b">
@ -1871,6 +1842,15 @@ exclude .AppleDB
      - TZ=$TZ
      - UID=$PUID
      - GID=$PGID
+    <span class="org-variable-name">security_opt</span>:
+      - no-new-privileges:true
+    <span class="org-variable-name">cap_drop</span>:
+      - ALL
+    <span class="org-variable-name">cap_add</span>:
+      - SETUID
+      - SETGID
+      - CHOWN
+      - KILL
    <span class="org-variable-name">labels</span>:
      - <span class="org-string">"traefik.enable=true"</span>
      - <span class="org-string">"traefik.http.routers.radicale-rtr.entrypoints=https"</span>
@ -1891,77 +1871,21 @@ exclude .AppleDB
 <span class="org-variable-name">hosts</span> = 0.0.0.0:<span class="org-highlight-numbers-number">5232</span>

 [<span class="org-type">auth</span>]
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Authentication method</span>
-<span class="org-comment-delimiter"># </span><span class="org-comment">Value: none | htpasswd | remote_user | http_x_remote_user</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">type = none</span>
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Htpasswd filename</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">htpasswd_filename = /etc/radicale/users</span>
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Htpasswd encryption method</span>
-<span class="org-comment-delimiter"># </span><span class="org-comment">Value: plain | bcrypt | md5</span>
-<span class="org-comment-delimiter"># </span><span class="org-comment">bcrypt requires the installation of radicale[bcrypt].</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">htpasswd_encryption = md5</span>
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Incorrect authentication delay (seconds)</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">delay = 1</span>
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Message displayed in the client when a password is needed</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">realm = Radicale - Password Required</span>
-
-
-[<span class="org-type">rights</span>]
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Rights backend</span>
-<span class="org-comment-delimiter"># </span><span class="org-comment">Value: none | authenticated | owner_only | owner_write | from_file</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">type = owner_only</span>
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">File for rights management from_file</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">file = /etc/radicale/rights</span>
-
+<span class="org-variable-name">type</span> = htpasswd
+<span class="org-variable-name">htpasswd_filename</span> = /config/users
+<span class="org-variable-name">htpasswd_encryption</span> = md5

 [<span class="org-type">storage</span>]
 <span class="org-variable-name">filesystem_folder</span> = /data/collections
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Delete sync token that are older (seconds)</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">max_sync_token_age = 2592000</span>
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Command that is run after changes to storage</span>
-<span class="org-comment-delimiter"># </span><span class="org-comment">Example: ([ -d .git ] || git init) &amp;&amp; git add -A &amp;&amp; (git diff --cached --quiet || git commit -m "Changes by "%(user)s)</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">hook = ([ -d .git ] || git init) &amp;&amp; git add -A &amp;&amp; (git diff --cached --quiet || git commit -m "Changes by "%(user)s)</span>
-
-
-[<span class="org-type">web</span>]
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Web interface backend</span>
-<span class="org-comment-delimiter"># </span><span class="org-comment">Value: none | internal</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">type = internal</span>
-
-
-[<span class="org-type">logging</span>]
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Threshold for the logger</span>
-<span class="org-comment-delimiter"># </span><span class="org-comment">Value: debug | info | warning | error | critical</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">level = warning</span>
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Don't include passwords in logs</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">mask_passwords = True</span>
-
-
-[<span class="org-type">headers</span>]
-
-<span class="org-comment-delimiter"># </span><span class="org-comment">Additional HTTP headers</span>
-<span class="org-comment-delimiter">#</span><span class="org-comment">Access-Control-Allow-Origin = *</span>
 </pre>
 </div>
 </div>
 </div>
 </div>

-<div id="outline-container-org7d77805" class="outline-3">
-<h3 id="org7d77805"><code>restic</code> - Automatic online backups</h3>
-<div class="outline-text-3" id="text-org7d77805">
+<div id="outline-container-org0172548" class="outline-3">
+<h3 id="org0172548"><code>restic</code> - Automatic online backups (<a href="https://github.com/djmaze/resticker/">link</a>)</h3>
+<div class="outline-text-3" id="text-org0172548">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">restic</span>:
    <span class="org-variable-name">container_name</span>: restic
@ -2011,9 +1935,9 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org835dd0e" class="outline-3">
-<h3 id="org835dd0e"><code>octoprint</code> - Web interface for 3D printing</h3>
-<div class="outline-text-3" id="text-org835dd0e">
+<div id="outline-container-orge07bead" class="outline-3">
+<h3 id="orge07bead"><code>octoprint</code> - Web interface for 3D printing (<a href="https://github.com/OctoPrint/OctoPrint">link</a>)</h3>
+<div class="outline-text-3" id="text-orge07bead">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">octoprint</span>:
    <span class="org-variable-name">container_name</span>: octoprint
@ -2043,13 +1967,39 @@ exclude .AppleDB
 </div>
 </div>

-<div id="outline-container-org4fdb420" class="outline-3">
-<h3 id="org4fdb420"><code>adguardhome</code> - Web interface for 3D printing</h3>
-<div class="outline-text-3" id="text-org4fdb420">
-<p>
-ports for DHCP server:
-</p>
+<div id="outline-container-orgb9ae7e8" class="outline-3">
+<h3 id="orgb9ae7e8"><code>linkding</code> - Bookmark manager (<a href="https://github.com/sissbruecker/linkding">link</a>)</h3>
+<div class="outline-text-3" id="text-orgb9ae7e8">
+<div class="org-src-container">
+<pre class="src src-yaml">  <span class="org-variable-name">linkding</span>:
+    <span class="org-variable-name">container_name</span>: linkding
+    <span class="org-variable-name">image</span>: sissbruecker/linkding:latest
+    <span class="org-variable-name">restart</span>: unless-stopped
+    <span class="org-variable-name">networks</span>:
+      - t2_proxy
+    <span class="org-variable-name">volumes</span>:
+      - $CONFIGDIR/linkding:/etc/linkding/data
+    <span class="org-variable-name">environment</span>:
+      - TZ=$TZ
+      - PUID=$PUID
+      - PGID=$PGID
+    <span class="org-variable-name">labels</span>:
+      - <span class="org-string">"traefik.enable=true"</span>
+      - <span class="org-string">"traefik.http.routers.linkding-rtr.entrypoints=https"</span>
+      - <span class="org-string">"traefik.http.routers.linkding-rtr.rule=Host(`bm.$DOMAINNAME`)"</span>
+      - <span class="org-string">"traefik.http.routers.linkding-rtr.tls=true"</span>
+      - <span class="org-string">"traefik.http.routers.linkding-rtr.service=linkding-svc"</span>
+      - <span class="org-string">"traefik.http.routers.linkding-rtr.middlewares=traefik-auth"</span>
+      - <span class="org-string">"traefik.http.services.linkding-svc.loadbalancer.server.port=9090"</span>
+    <span class="org-variable-name">logging</span>: <span class="org-function-name">*default-logging</span>
+</pre>
+</div>
+</div>
+</div>

+<div id="outline-container-orgd7244f7" class="outline-3">
+<h3 id="orgd7244f7"><code>adguardhome</code> - Network-wide ads &amp; trackers blocking DNS server (<a href="https://github.com/AdguardTeam/AdGuardHome">link</a>)</h3>
+<div class="outline-text-3" id="text-orgd7244f7">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">adguardhome</span>:
    <span class="org-variable-name">container_name</span>: adguardhome
@ -2081,9 +2031,9 @@ ports for DHCP server:
 </div>
 </div>

-<div id="outline-container-org5b7a10e" class="outline-3">
-<h3 id="org5b7a10e"><code>mealie</code> - Recipe Manager</h3>
-<div class="outline-text-3" id="text-org5b7a10e">
+<div id="outline-container-org065ce60" class="outline-3">
+<h3 id="org065ce60"><code>mealie</code> - Recipe Manager (<a href="https://github.com/hay-kot/mealie">link</a>)</h3>
+<div class="outline-text-3" id="text-org065ce60">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">miam</span>:
    <span class="org-variable-name">container_name</span>: miam
@ -2111,9 +2061,9 @@ ports for DHCP server:
 </div>
 </div>

-<div id="outline-container-org63a3028" class="outline-3">
-<h3 id="org63a3028"><code>diun</code> - Notification for Docker image updates</h3>
-<div class="outline-text-3" id="text-org63a3028">
+<div id="outline-container-org40ab15c" class="outline-3">
+<h3 id="org40ab15c"><code>diun</code> - Notification for Docker image updates (<a href="https://github.com/crazy-max/diun/">link</a>)</h3>
+<div class="outline-text-3" id="text-org40ab15c">
 <div class="org-src-container">
 <pre class="src src-yaml">  <span class="org-variable-name">diun</span>:
    <span class="org-variable-name">container_name</span>: diun
@ -2130,7 +2080,7 @@ ports for DHCP server:
      - DIUN_PROVIDERS_DOCKER=true
      - DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=true
      - DIUN_NOTIF_MAIL_HOST=smtp.gmail.com
-      - DIUN_NOTIF_MAIL_PORT=587
+      - DIUN_NOTIF_MAIL_PORT=465
      - DIUN_NOTIF_MAIL_SSL=true
      - DIUN_NOTIF_MAIL_USERNAME=tdehaeze.xyz@gmail.com
      - DIUN_NOTIF_MAIL_PASSWORD=$GMAIL_PASS
@ -2143,6 +2093,62 @@ ports for DHCP server:
 </div>
 </div>
 </div>
+
+<div id="outline-container-org65f5c7a" class="outline-3">
+<h3 id="org65f5c7a"><code>commento</code> - Commenting system (<a href="https://github.com/adtac/commento">link</a>)</h3>
+<div class="outline-text-3" id="text-org65f5c7a">
+<div class="org-src-container">
+<pre class="src src-yaml">  <span class="org-variable-name">commento</span>:
+    <span class="org-variable-name">container_name</span>: commento
+    <span class="org-variable-name">image</span>: registry.gitlab.com/commento/commento
+    <span class="org-variable-name">restart</span>: unless-stopped
+    <span class="org-variable-name">networks</span>:
+      - t2_proxy
+      - backend
+    <span class="org-comment-delimiter"># </span><span class="org-comment">ports:</span>
+    <span class="org-comment-delimiter">#   </span><span class="org-comment">- 8080:8080</span>
+    <span class="org-variable-name">environment</span>:
+      - TZ=$TZ
+      - UID=$PUID
+      - GID=$PGID
+      - COMMENTO_ORIGIN=https://commento.tdehaeze.xyz/
+      - COMMENTO_PORT=8080
+      - COMMENTO_POSTGRES=postgres://postgres:$COMMENTO_DB_PASSWORD@commento_db:5432/commento?sslmode=disable
+      - COMMENTO_SMTP_HOST=smtp.gmail.com
+      - COMMENTO_SMTP_PORT=587
+      - COMMENTO_SMTP_USERNAME=tdehaeze.xyz@gmail.com
+      - COMMENTO_SMTP_PASSWORD=$GMAIL_PASS
+      - COMMENTO_SMTP_FROM_ADDRESS=tdehaeze.xyz@gmail.com
+    <span class="org-variable-name">depends_on</span>:
+      - commento_db
+    <span class="org-variable-name">labels</span>:
+      - <span class="org-string">"traefik.enable=true"</span>
+      - <span class="org-string">"traefik.http.routers.commento-rtr.entrypoints=https"</span>
+      - <span class="org-string">"traefik.http.routers.commento-rtr.rule=Host(`commento.$DOMAINNAME`)"</span>
+      - <span class="org-string">"traefik.http.routers.commento-rtr.tls=true"</span>
+      - <span class="org-string">"traefik.http.routers.commento-rtr.service=commento-svc"</span>
+      - <span class="org-string">"traefik.http.services.commento-svc.loadbalancer.server.port=8080"</span>
+    <span class="org-variable-name">logging</span>: <span class="org-function-name">*default-logging</span>
+</pre>
+</div>
+
+<div class="org-src-container">
+<pre class="src src-yaml">  <span class="org-variable-name">commento_db</span>:
+    <span class="org-variable-name">container_name</span>: commento_db
+    <span class="org-variable-name">image</span>: postgres
+    <span class="org-variable-name">restart</span>: unless-stopped
+    <span class="org-variable-name">networks</span>:
+      - backend
+    <span class="org-variable-name">environment</span>:
+      - POSTGRES_DB=commento
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=$COMMENTO_DB_PASSWORD
+    <span class="org-variable-name">volumes</span>:
+      - $CONFIGDIR/commento_db:/var/lib/postgresql/data
+</pre>
+</div>
+</div>
+</div>
 </div>

 <div id="outline-container-orgbb869cd" class="outline-2">
@ -2217,6 +2223,11 @@ ports for DHCP server:
 <pre class="src src-conf"><span class="org-variable-name">GMAIL_PASS</span>=&lt;&lt;get-password(passname=<span class="org-string">"google.com/tdehaeze.xyz"</span>)&gt;&gt;
 </pre>
 </div>
+
+<div class="org-src-container">
+<pre class="src src-conf"><span class="org-variable-name">COMMENTO_DB_PASSWORD</span>=&lt;&lt;get-password(passname=<span class="org-string">"nas/commento_db_pass"</span>)&gt;&gt;
+</pre>
+</div>
 </div>
 </div>

@ -2248,7 +2259,7 @@ Type <code>crontab -e</code> and add this line:
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Dehaeze Thomas</p>
-<p class="date">Created: 2021-04-25 dim. 19:10</p>
+<p class="date">Created: 2021-05-02 dim. 11:26</p>
 </div>
 </body>
 </html>
--- a/docs/tablet.html
+++ b/docs/tablet.html
@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<!-- 2021-04-25 dim. 19:10 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<title>Drawing Tablet - Xournal</title>
+<meta name="author" content="Dehaeze Thomas" />
+<meta name="generator" content="Org Mode" />
+<link rel="stylesheet" type="text/css" href="./dist/style.css"/>
+<script type="text/javascript" src="./dist/script.js"></script>
+</head>
+<body>
+<div id="org-div-home-and-up">
+ <a accesskey="h" href="./index.html"> UP </a>
+ |
+ <a accesskey="H" href="./index.html"> HOME </a>
+</div><div id="content">
+<h1 class="title">Drawing Tablet - Xournal</h1>
+<div id="table-of-contents">
+<h2>Table of Contents</h2>
+<div id="text-table-of-contents">
+<ul>
+<li><a href="#org51f707f"><code>xournalpp</code></a></li>
+</ul>
+</div>
+</div>
+
+<div id="outline-container-org51f707f" class="outline-2">
+<h2 id="org51f707f"><code>xournalpp</code></h2>
+<div class="outline-text-2" id="text-org51f707f">
+<p>
+<code>toolbar.ini</code>:
+</p>
+<div class="org-src-container">
+<pre class="src src-conf"><span class="org-comment-delimiter">## </span><span class="org-comment">Xournal++ Toolbar configuration</span>
+<span class="org-comment-delimiter">## </span><span class="org-comment">Here you can customize the Toolbars</span>
+<span class="org-comment-delimiter"># </span><span class="org-comment">Delete this file to generate a new config file with default values</span>
+<span class="org-comment-delimiter">#</span>
+<span class="org-comment-delimiter"># </span><span class="org-comment">Available buttons:</span>
+<span class="org-comment-delimiter"># </span><span class="org-comment">File: NEW,SAVE,OPEN,PRINT</span>
+<span class="org-comment-delimiter">#</span>
+<span class="org-comment-delimiter"># </span><span class="org-comment">Edit: CUT,COPY,PASTE,SEARCH,UNDO,REDO,INSERT_NEW_PAGE</span>
+<span class="org-comment-delimiter">#</span>
+<span class="org-comment-delimiter"># </span><span class="org-comment">Navigation: GOTO_FIRST,GOTO_BACK,GOTO_NEXT,GOTO_LAST,GOTO_NEXT_ANNOTATED_PAGE</span>
+<span class="org-comment-delimiter">#</span>
+<span class="org-comment-delimiter"># </span><span class="org-comment">Zoom: ZOOM_OUT,ZOOM_IN,ZOOM_FIT,ZOOM_100,FULLSCREEN,PAIRED_PAGES</span>
+<span class="org-comment-delimiter">#</span>
+<span class="org-comment-delimiter"># </span><span class="org-comment">Color: COLOR(0xffffff),COLOR(0xffff00),COLOR(0xff8000),COLOR(0xff00ff),COLOR(0x00ff00),COLOR(0x00c0ff),COLOR(0x808080),COLOR(0x008000),COLOR(0xff0000),COLOR(0x3333cc),COLOR(0x000000),COLOR_SELECT</span>
+<span class="org-comment-delimiter">#  </span><span class="org-comment">Notice: This are the default Xournal colors, each other color in HEX can also be used, eg COLOR(0x12ABCF);</span>
+<span class="org-comment-delimiter">#</span>
+<span class="org-comment-delimiter"># </span><span class="org-comment">Tools: ERASER,PEN,HIGHLIGHTER,IMAGE,TEXT,IMAGE,SELECT,SELECT_REGION,SELECT_RECTANGLE,VERTICAL_SPACE,HAND</span>
+<span class="org-comment-delimiter">#  </span><span class="org-comment">Notice: ERASER also has a drop down menu to select the eraser type, SELECT are all selection tools, with drop down menu</span>
+<span class="org-comment-delimiter">#</span>
+<span class="org-comment-delimiter"># </span><span class="org-comment">Tool settings: SHAPE_RECOGNIZER,RULER,FINE,MEDIUM,THICK,SELECT_FONT</span>
+<span class="org-comment-delimiter">#</span>
+<span class="org-comment-delimiter"># </span><span class="org-comment">Components: PAGE_SPIN,ZOOM_SLIDER,LAYER</span>
+<span class="org-comment-delimiter">#  </span><span class="org-comment">PAGE_SPIN: The page spiner, incl. current page label</span>
+<span class="org-comment-delimiter">#  </span><span class="org-comment">ZOOM_SLIDER: The zoom slider</span>
+<span class="org-comment-delimiter">#  </span><span class="org-comment">LAYER: The layer dropdown menu</span>
+<span class="org-comment-delimiter">#</span>
+<span class="org-comment-delimiter">#</span>
+
+[<span class="org-type">Floating Toolbox - Custom</span>]
+<span class="org-variable-name">toolbarTop1</span>=SAVE,NEW,OPEN,SEPARATOR,IMAGE,TEXT,MATH_TEX,DRAW,SEPARATOR,SELECT,SEPARATOR,DEFAULT_TOOL,SEPARATOR,ZOOM_100,ZOOM_FIT
+
+<span class="org-variable-name">toolbarFloat1</span>=PEN,HIGHLIGHTER,ERASER
+<span class="org-variable-name">toolbarFloat2</span>=FINE,MEDIUM,THICK,VERY_THICK
+<span class="org-variable-name">toolbarFloat3</span>=COLOR(0xffffff),COLOR(0x0072BD),COLOR(0xD95218),COLOR(0xECB01F),COLOR(0x7D2E8E),COLOR(0x77AB2F),COLOR(0x000000),COLOR_SELECT
+<span class="org-variable-name">toolbarFloat4</span>=DRAW_RECTANGLE,DRAW_ELLIPSE,DRAW_ARROW,RULER,DRAW_SPLINE
+
+<span class="org-variable-name">name</span>=Floating Tolbox - Custom
+</pre>
+</div>
+
+<p>
+Special lines in <code>settings.xml</code>:
+</p>
+<div class="org-src-container">
+<pre class="src src-conf">&lt;!--Config for new pages--&gt;
+<span class="org-variable-name">&lt;property name</span>=<span class="org-string">"eagerPageCleanup"</span> value=<span class="org-string">"true"</span>/&gt;
+<span class="org-variable-name">&lt;property name</span>=<span class="org-string">"pageTemplate"</span> value=<span class="org-string">"xoj/template&amp;#10;copyLastPageSettings=false&amp;#10;size=600.0x400.0&amp;#10;backgroundType=plain&amp;#10;backgroundColor=#ffffff&amp;#10;"</span>/&gt;
+</pre>
+</div>
+</div>
+</div>
+</div>
+<div id="postamble" class="status">
+<p class="author">Author: Dehaeze Thomas</p>
+<p class="date">Created: 2021-04-25 dim. 19:10</p>
+</div>
+</body>
+</html>
--- a/docs/torrent.html
+++ b/docs/torrent.html
@ -3,11 +3,11 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2021-01-08 ven. 01:43 -->
+<!-- 2021-05-02 dim. 11:26 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>Torrent Configuration</title>
-<meta name="generator" content="Org mode" />
 <meta name="author" content="Dehaeze Thomas" />
+<meta name="generator" content="Org Mode" />
 <link rel="stylesheet" type="text/css" href="./dist/style.css"/>
 <script type="text/javascript" src="./dist/script.js"></script>
 </head>
@ -25,7 +25,6 @@
 <li><a href="#orgc387510"><code>tremc</code> - Curses interface for Transmission</a></li>
 <li><a href="#orgcdb4a92"><code>aria2c</code> - Lightweight download utility</a>
 <ul>
-<li><a href="#orgfbe3e4f">Aria2c Config</a></li>
 <li><a href="#org1d6cd04">Download Start Script</a></li>
 <li><a href="#org702c949">Download Complete Script</a></li>
 <li><a href="#orgc677acc">Download Error Script</a></li>
@ -48,7 +47,7 @@
 <span class="org-variable-name">username</span> = tdehaeze
 <span class="org-variable-name">port</span> = <span class="org-highlight-numbers-number">9091</span>
 <span class="org-variable-name">host</span> = torrent.tdehaeze.xyz
-<span class="org-variable-name">path</span> = /transmission/rpc
+<span class="org-variable-name">path</span> = /transmission/rpc/
 <span class="org-variable-name">ssl</span> = False

 [<span class="org-type">Sorting</span>]
@ -91,10 +90,6 @@
 <div id="outline-container-orgcdb4a92" class="outline-2">
 <h2 id="orgcdb4a92"><code>aria2c</code> - Lightweight download utility</h2>
 <div class="outline-text-2" id="text-orgcdb4a92">
-</div>
-<div id="outline-container-orgfbe3e4f" class="outline-3">
-<h3 id="orgfbe3e4f">Aria2c Config</h3>
-<div class="outline-text-3" id="text-orgfbe3e4f">
 <div class="org-src-container">
 <pre class="src src-conf">continue
 <span class="org-variable-name">daemon</span>=true
@ -111,7 +106,6 @@
 </pre>
 </div>
 </div>
-</div>

 <div id="outline-container-org1d6cd04" class="outline-3">
 <h3 id="org1d6cd04">Download Start Script</h3>
@ -146,7 +140,7 @@
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Dehaeze Thomas</p>
-<p class="date">Created: 2021-01-08 ven. 01:43</p>
+<p class="date">Created: 2021-05-02 dim. 11:26</p>
 </div>
 </body>
 </html>
--- a/doom.org
+++ b/doom.org
@ -155,7 +155,8 @@ Tables:
 ** Evil
 #+begin_src emacs-lisp
 (after! evil
-  (map! :m  "-"  #'dired-jump))
+  (map! :m  "-"  #'dired-jump)
+  (setq evil-respect-visual-line-mode nil))
 #+end_src

 Make movement keys work like they should
@ -171,6 +172,9 @@ Make horizontal movement cross lines
 (setq-default evil-cross-lines t)
 #+end_src

+;; In org-mode, $ does not go to the real end of line, it jumps to the end of /visual/ line
+;; Create a real end of line by APPENDING and then going back to normal state
+
 Evil Surround (not working):
 #+begin_src emacs-lisp :tangle no
 ;; this macro was copied from here: https://stackoverflow.com/a/22418983/4921402
@ -1099,7 +1103,7 @@ by spaces.
                                           :image-output-type "png"
                                           :image-size-adjust (1.0 . 1.0)
                                           :latex-compiler ("pdflatex -interaction nonstopmode -output-directory %o %f")
-                                           :image-converter ("convert -density %D -trim -antialias %f -quality 100 %O"))
+                                           :image-converter ("convert -density 100 -trim -antialias %f -quality 100 %O"))
                                          (dvipng
                                           :programs ("latex" "dvipng")
                                           :description "dvi > png"
@ -1109,6 +1113,24 @@ by spaces.
                                           :image-size-adjust (0.4 . 0.4)
                                           :latex-compiler ("latex -interaction nonstopmode -output-directory %o %f")
                                           :image-converter ("dvipng -D %D -T tight -o %O %f"))
+                                          (pdf2svg
+                                           :programs ("pdflatex" "pdftocairo" "pdfcrop")
+                                           :description "pdf > png"
+                                           :message "you need to install the programs: pdflatex, pdftocairo and pdfcrop."
+                                           :image-input-type "pdf"
+                                           :image-output-type "svg"
+                                           :image-size-adjust (1.0 . 1.0)
+                                           :latex-compiler ("pdflatex -interaction nonstopmode -output-directory %o %f")
+                                           :image-converter ("pdfcrop %f %f && pdf2svg %f %O"))
+                                          (pdf2dvi
+                                           :programs ("pdflatex" "dvipng")
+                                           :description "pdf > png"
+                                           :message "you need to install the programs: pdflatex, pdftocairo and pdfcrop."
+                                           :image-input-type "dvi"
+                                           :image-output-type "png"
+                                           :image-size-adjust (0.4 . 0.4)
+                                           :latex-compiler ("pdflatex -output-format dvi -interaction nonstopmode -output-directory %o %f")
+                                           :image-converter ("dvipng -D %D -T tight -o %O %f"))
                                          (dvisvgm
                                           :programs ("xetex" "dvisvgm")
                                           :description "xdv > svg"
@ -1121,7 +1143,7 @@ by spaces.
                                          ))

  ;; Use imagemagick/dvisvgm to generate png from pdf
-  (setq org-preview-latex-default-process 'dvisvgm)
+  (setq org-preview-latex-default-process 'pdf2svg)

  ;; Don't change the font size for subscripts and superscripts in latex fragments.
  ;; This cause the orgmode tables not to be well aligned.
@ -3323,8 +3345,7 @@ Choose account label to feed msmtp -a option based on From header in Message buf
       (javascript
        +lsp)
       (latex
-        +latexmk
-        +lsp)
+        +latexmk)
       ;; markdown          ; writing docs for people to ignore
       (org              ; organize your plain life in plain text
        +dragndrop       ; drag & drop files/images into org buffers
--- a/i3.org
+++ b/i3.org
@ -131,7 +131,7 @@ for_window [title="Simulink Library Browser"] floating enable
 for_window [class="Floating"] floating enable, resize set 800 600, move position 1100 460
 for_window [class="mpv"] floating enable # Size/Position is defined in mpv.conf
 for_window [class="Sxiv"] floating enable, resize set 800 600, move position center
-for_window [title="khal"] floating enable, resize set 600 600, move position center
+for_window [title="khal interactive"] floating enable, resize set 600 600, move position center
 for_window [title="ncmpcpp"] floating enable, resize set 800 400, move position center
 for_window [title="nmtui"] floating enable, resize set 800 600, move position center
 for_window [title="linkding"] floating enable, resize set 800 600, move position center
--- a/nas.org
+++ b/nas.org
@ -305,7 +305,7 @@ x-logging:
    max-file: "10"
 #+end_src

-** =traefik= - Application proxy
+** =traefik= - Application proxy ([[https://github.com/traefik/traefik][link]])
 #+begin_src yaml
 services:
 #+end_src
@ -420,7 +420,55 @@ certificatesResolvers:
        resolvers: 1.1.1.1:53,1.0.0.1:53
 #+end_src

-** =homer= - Home page
+** =nginx= - Root
+#+begin_src yaml
+  root:
+    container_name: root
+    image: nginx
+    restart: unless-stopped
+    networks:
+      - t2_proxy
+    environment:
+      - PUID=$PUID
+      - PGID=$PGID
+      - TZ=$TZ
+    volumes:
+      - $CONFIGDIR/root/nginx.conf:/etc/nginx/nginx.conf
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.root-rtr.entrypoints=https"
+      - "traefik.http.routers.root-rtr.rule=Host(`$DOMAINNAME`)"
+      - "traefik.http.routers.root-rtr.tls=true"
+      - "traefik.http.routers.root-rtr.service=root-svc"
+      - "traefik.http.services.root-svc.loadbalancer.server.port=8080"
+    logging: *default-logging
+#+end_src
+
+*** =nginx.conf=
+#+begin_src conf :tangle /ssh:thomas@grenoble:~/docker/config/root/Caddyfile
+events {
+
+}
+
+http {
+    server {
+        server_name tdehaeze.xyz;
+        listen 8080;
+
+        location /.well-known/matrix/client {
+            proxy_pass https://matrix.tdehaeze.xyz/.well-known/matrix/client;
+            proxy_set_header X-Forwarded-For $remote_addr;
+        }
+
+        location /.well-known/matrix/server {
+            proxy_pass https://matrix.tdehaeze.xyz/.well-known/matrix/server;
+            proxy_set_header X-Forwarded-For $remote_addr;
+        }
+    }
+}
+#+end_src
+
+** =homer= - Home page ([[https://github.com/bastienwirtz/homer][link]])
 #+begin_src yaml
  homer:
    container_name: homer
@ -588,7 +636,7 @@ services:
      url: "https://octoprint.tdehaeze.xyz/"
 #+end_src

-** =snapraid= - Manage local backup with parity disk
+** =snapraid= - Manage local backup with parity disk ([[https://github.com/amadvance/snapraid][link]])
 #+begin_src yaml
  snapraid:
    container_name: snapraid
@ -704,7 +752,7 @@ older-than = 10
 #+end_src


-** =portainer= - Manage docker
+** =portainer= - Manage docker ([[https://github.com/portainer/portainer][link]])
 #+begin_src yaml
  portainer:
    container_name: portainer
@ -732,7 +780,7 @@ older-than = 10
    logging: *default-logging
 #+end_src

-** =wireguard= - VPN
+** =wireguard= - VPN ([[https://github.com/linuxserver/docker-wireguard][link]])
 #+begin_src yaml
  wireguard:
    container_name: wireguard
@ -759,7 +807,7 @@ older-than = 10
    logging: *default-logging
 #+end_src

-** =gitea= - Git server
+** =gitea= - Git server ([[https://github.com/go-gitea/gitea][link]])
 #+begin_src yaml
  gitea:
    container_name: git
@ -889,54 +937,6 @@ older-than = 10
 }
 #+end_src

-** =nginx= - Root
-#+begin_src yaml
-  root:
-    container_name: root
-    image: nginx
-    restart: unless-stopped
-    networks:
-      - t2_proxy
-    environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
-    volumes:
-      - $CONFIGDIR/root/nginx.conf:/etc/nginx/nginx.conf
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.root-rtr.entrypoints=https"
-      - "traefik.http.routers.root-rtr.rule=Host(`$DOMAINNAME`)"
-      - "traefik.http.routers.root-rtr.tls=true"
-      - "traefik.http.routers.root-rtr.service=root-svc"
-      - "traefik.http.services.root-svc.loadbalancer.server.port=8080"
-    logging: *default-logging
-#+end_src
-
-*** =nginx.conf=
-#+begin_src conf :tangle /ssh:thomas@grenoble:~/docker/config/root/Caddyfile
-events {
-
-}
-
-http {
-    server {
-        server_name tdehaeze.xyz;
-        listen 8080;
-
-        location /.well-known/matrix/client {
-            proxy_pass https://matrix.tdehaeze.xyz/.well-known/matrix/client;
-            proxy_set_header X-Forwarded-For $remote_addr;
-        }
-
-        location /.well-known/matrix/server {
-            proxy_pass https://matrix.tdehaeze.xyz/.well-known/matrix/server;
-            proxy_set_header X-Forwarded-For $remote_addr;
-        }
-    }
-}
-#+end_src
-
 ** =hugo= - Wiki + Blog
 #+begin_src yaml
  hugo:
@ -957,7 +957,7 @@ http {
    logging: *default-logging
 #+end_src

-** =syncthing= - File Synchronization
+** =syncthing= - File Synchronization ([[https://hub.docker.com/r/linuxserver/syncthing][link]])
 #+begin_src yaml
  syncthing:
    container_name: syncthing
@ -992,7 +992,7 @@ http {
    logging: *default-logging
 #+end_src

-** =miniflux= - RSS reader
+** =miniflux= - RSS reader ([[https://hub.docker.com/r/miniflux/miniflux][link]])
 #+begin_src yaml
  miniflux:
    container_name: miniflux
@ -1034,7 +1034,7 @@ http {
    logging: *default-logging
 #+end_src

-** =homeassistant= - Home Automation
+** =homeassistant= - Home Automation ([[https://hub.docker.com/r/homeassistant/home-assistant][link]])
 #+begin_src yaml
  homeassistant:
    container_name: homeassistant
@ -1069,7 +1069,7 @@ http {
    logging: *default-logging
 #+end_src

-** =jellyfin= - Media server
+** =jellyfin= - Media server ([[https://hub.docker.com/r/linuxserver/jellyfin][link]])
 #+begin_src yaml
  jellyfin:
    container_name: jellyfin
@ -1098,7 +1098,7 @@ http {
    logging: *default-logging
 #+end_src

-** =filebrowser= - Web file browser
+** =filebrowser= - Web file browser ([[https://hub.docker.com/r/filebrowser/filebrowser][link]])
 #+begin_src yaml
  filebrowser:
    container_name: filebrowser
@ -1138,7 +1138,7 @@ http {
 }
 #+end_src

-** =scrutiny= - Hard drive monitoring
+** =scrutiny= - Hard drive monitoring ([[https://hub.docker.com/r/hotio/scrutiny][link]])
 #+begin_src yaml
  scrutiny:
    container_name: scrutiny
@ -1170,7 +1170,7 @@ http {
    logging: *default-logging
 #+end_src

-** =transmission= - Torrent server
+** =transmission= - Torrent server ([[https://hub.docker.com/r/haugene/transmission-openvpn][link]])
 #+begin_src yaml
  transmission-openvpn:
    container_name: transmission
@ -1213,7 +1213,8 @@ http {
    logging: *default-logging
 #+end_src

-** =aria2= - Download daemon
+** =aria2= - Download daemon ([[https://hub.docker.com/r/opengg/aria2][link]])
+Backend ([[https://hub.docker.com/r/opengg/aria2][link]]):
 #+begin_src yaml
  aria2:
    container_name: aria2
@ -1233,6 +1234,29 @@ http {
    logging: *default-logging
 #+end_src

+Web-UI ([[https://hub.docker.com/r/p3terx/ariang][link]]):
+#+begin_src yaml
+  aria2-ui:
+    container_name: aria2-ui
+    image: p3terx/ariang
+    restart: unless-stopped
+    networks:
+      - t2_proxy
+    environment:
+      - PUID=$PUID
+      - PGID=$PGID
+    ports:
+      - 6880:6880
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.aria2-rtr.entrypoints=http"
+      - "traefik.http.routers.aria2-rtr.rule=Host(`dl.$DOMAINNAME`)"
+      - "traefik.http.routers.aria2-rtr.tls=false"
+      - "traefik.http.routers.aria2-rtr.service=aria2-svc"
+      - "traefik.http.services.aria2-svc.loadbalancer.server.port=6880"
+    logging: *default-logging
+#+end_src
+
 *** =aria2.conf=
 #+begin_src conf :tangle /ssh:thomas@grenoble:~/docker/config/aria2/aria2.conf :noweb yes
 save-session=/config/aria2.session
@ -1258,30 +1282,7 @@ min-split-size=1M
 split=16
 #+end_src

-** =aria2-ui= - Download web UI
-#+begin_src yaml
-  aria2-ui:
-    container_name: aria2-ui
-    image: p3terx/ariang
-    restart: unless-stopped
-    networks:
-      - t2_proxy
-    environment:
-      - PUID=$PUID
-      - PGID=$PGID
-    ports:
-      - 6880:6880
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.aria2-rtr.entrypoints=http"
-      - "traefik.http.routers.aria2-rtr.rule=Host(`dl.$DOMAINNAME`)"
-      - "traefik.http.routers.aria2-rtr.tls=false"
-      - "traefik.http.routers.aria2-rtr.service=aria2-svc"
-      - "traefik.http.services.aria2-svc.loadbalancer.server.port=6880"
-    logging: *default-logging
-#+end_src
-
-** =deemix= - Music Download                                       :noexport:
+** =deemix= - Music Download ([[https://gitlab.com/Bockiii/deemix-docker][link]])                                :noexport:
 #+begin_src yaml
  deemix:
    container_name: deemix
@ -1313,7 +1314,7 @@ split=16
 <<get-password(passname="nas/deemix_arl")>>
 #+end_src

-** =qobuz= - Qobuz Downloader                                    :noexport:
+** =qobuz= - Qobuz Downloader ([[https://github.com/tdehaeze/qobuz-docker][link]])                               :noexport:
 #+begin_src yaml
  qobuz:
    container_name: qobuz
@ -1342,31 +1343,6 @@ split=16
    logging: *default-logging
 #+end_src

-** TODO =linkding= - Bookmark manager
-#+begin_src yaml
-  linkding:
-    container_name: linkding
-    image: sissbruecker/linkding:latest
-    restart: unless-stopped
-    networks:
-      - t2_proxy
-    volumes:
-      - $CONFIGDIR/linkding:/etc/linkding/data
-    environment:
-      - TZ=$TZ
-      - PUID=$PUID
-      - PGID=$PGID
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.linkding-rtr.entrypoints=https"
-      - "traefik.http.routers.linkding-rtr.rule=Host(`bm.$DOMAINNAME`)"
-      - "traefik.http.routers.linkding-rtr.tls=true"
-      - "traefik.http.routers.linkding-rtr.service=linkding-svc"
-      - "traefik.http.routers.linkding-rtr.middlewares=traefik-auth"
-      - "traefik.http.services.linkding-svc.loadbalancer.server.port=9090"
-    logging: *default-logging
-#+end_src
-
 ** =radicale= - CalDAC/CardDAV server ([[https://github.com/tomsquest/docker-radicale][link]])
 #+begin_src yaml
  radicale:
@ -1382,6 +1358,15 @@ split=16
      - TZ=$TZ
      - UID=$PUID
      - GID=$PGID
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    cap_add:
+      - SETUID
+      - SETGID
+      - CHOWN
+      - KILL
    labels:
      - "traefik.enable=true"
      - "traefik.http.routers.radicale-rtr.entrypoints=https"
@ -1398,71 +1383,15 @@ split=16
 hosts = 0.0.0.0:5232

 [auth]
-
-# Authentication method
-# Value: none | htpasswd | remote_user | http_x_remote_user
-#type = none
-
-# Htpasswd filename
-#htpasswd_filename = /etc/radicale/users
-
-# Htpasswd encryption method
-# Value: plain | bcrypt | md5
-# bcrypt requires the installation of radicale[bcrypt].
-#htpasswd_encryption = md5
-
-# Incorrect authentication delay (seconds)
-#delay = 1
-
-# Message displayed in the client when a password is needed
-#realm = Radicale - Password Required
-
-
-[rights]
-
-# Rights backend
-# Value: none | authenticated | owner_only | owner_write | from_file
-#type = owner_only
-
-# File for rights management from_file
-#file = /etc/radicale/rights
-
+type = htpasswd
+htpasswd_filename = /config/users
+htpasswd_encryption = md5

 [storage]
 filesystem_folder = /data/collections
-
-# Delete sync token that are older (seconds)
-#max_sync_token_age = 2592000
-
-# Command that is run after changes to storage
-# Example: ([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by "%(user)s)
-#hook = ([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by "%(user)s)
-
-
-[web]
-
-# Web interface backend
-# Value: none | internal
-#type = internal
-
-
-[logging]
-
-# Threshold for the logger
-# Value: debug | info | warning | error | critical
-#level = warning
-
-# Don't include passwords in logs
-#mask_passwords = True
-
-
-[headers]
-
-# Additional HTTP headers
-#Access-Control-Allow-Origin = *
 #+end_src

-** =restic= - Automatic online backups
+** =restic= - Automatic online backups ([[https://github.com/djmaze/resticker/][link]])
 #+begin_src yaml
  restic:
    container_name: restic
@ -1505,7 +1434,7 @@ filesystem_folder = /data/collections
 /source/docker/config/web/www/
 #+end_src

-** =octoprint= - Web interface for 3D printing
+** =octoprint= - Web interface for 3D printing ([[https://github.com/OctoPrint/OctoPrint][link]])
 #+begin_src yaml
  octoprint:
    container_name: octoprint
@ -1532,9 +1461,32 @@ filesystem_folder = /data/collections
    logging: *default-logging
 #+end_src

-** TODO =adguardhome= - Web interface for 3D printing
-ports for DHCP server:
+** TODO =linkding= - Bookmark manager ([[https://github.com/sissbruecker/linkding][link]])
+#+begin_src yaml
+  linkding:
+    container_name: linkding
+    image: sissbruecker/linkding:latest
+    restart: unless-stopped
+    networks:
+      - t2_proxy
+    volumes:
+      - $CONFIGDIR/linkding:/etc/linkding/data
+    environment:
+      - TZ=$TZ
+      - PUID=$PUID
+      - PGID=$PGID
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.linkding-rtr.entrypoints=https"
+      - "traefik.http.routers.linkding-rtr.rule=Host(`bm.$DOMAINNAME`)"
+      - "traefik.http.routers.linkding-rtr.tls=true"
+      - "traefik.http.routers.linkding-rtr.service=linkding-svc"
+      - "traefik.http.routers.linkding-rtr.middlewares=traefik-auth"
+      - "traefik.http.services.linkding-svc.loadbalancer.server.port=9090"
+    logging: *default-logging
+#+end_src

+** TODO =adguardhome= - Network-wide ads & trackers blocking DNS server ([[https://github.com/AdguardTeam/AdGuardHome][link]])
 #+begin_src yaml
  adguardhome:
    container_name: adguardhome
@ -1563,7 +1515,7 @@ ports for DHCP server:
    logging: *default-logging
 #+end_src

-** TODO =mealie= - Recipe Manager
+** =mealie= - Recipe Manager ([[https://github.com/hay-kot/mealie][link]])
 #+begin_src yaml
  miam:
    container_name: miam
@ -1588,7 +1540,7 @@ ports for DHCP server:
    logging: *default-logging
 #+end_src

-** =diun= - Notification for Docker image updates
+** =diun= - Notification for Docker image updates ([[https://github.com/crazy-max/diun/][link]])
 #+begin_src yaml
  diun:
    container_name: diun
@ -1605,7 +1557,7 @@ ports for DHCP server:
      - DIUN_PROVIDERS_DOCKER=true
      - DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=true
      - DIUN_NOTIF_MAIL_HOST=smtp.gmail.com
-      - DIUN_NOTIF_MAIL_PORT=587
+      - DIUN_NOTIF_MAIL_PORT=465
      - DIUN_NOTIF_MAIL_SSL=true
      - DIUN_NOTIF_MAIL_USERNAME=tdehaeze.xyz@gmail.com
      - DIUN_NOTIF_MAIL_PASSWORD=$GMAIL_PASS
@ -1616,7 +1568,81 @@ ports for DHCP server:
      - $CONFIGDIR/diun:/data
 #+end_src

+** =commento= - Commenting system ([[https://github.com/adtac/commento][link]])
+
+#+begin_src yaml
+  commento:
+    container_name: commento
+    image: registry.gitlab.com/commento/commento
+    restart: unless-stopped
+    networks:
+      - t2_proxy
+      - backend
+    # ports:
+    #   - 8080:8080
+    environment:
+      - TZ=$TZ
+      - UID=$PUID
+      - GID=$PGID
+      - COMMENTO_ORIGIN=https://commento.tdehaeze.xyz/
+      - COMMENTO_PORT=8080
+      - COMMENTO_POSTGRES=postgres://postgres:$COMMENTO_DB_PASSWORD@commento_db:5432/commento?sslmode=disable
+      - COMMENTO_SMTP_HOST=smtp.gmail.com
+      - COMMENTO_SMTP_PORT=587
+      - COMMENTO_SMTP_USERNAME=tdehaeze.xyz@gmail.com
+      - COMMENTO_SMTP_PASSWORD=$GMAIL_PASS
+      - COMMENTO_SMTP_FROM_ADDRESS=tdehaeze.xyz@gmail.com
+    depends_on:
+      - commento_db
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.commento-rtr.entrypoints=https"
+      - "traefik.http.routers.commento-rtr.rule=Host(`commento.$DOMAINNAME`)"
+      - "traefik.http.routers.commento-rtr.tls=true"
+      - "traefik.http.routers.commento-rtr.service=commento-svc"
+      - "traefik.http.services.commento-svc.loadbalancer.server.port=8080"
+    logging: *default-logging
+#+end_src
+
+#+begin_src yaml
+  commento_db:
+    container_name: commento_db
+    image: postgres
+    restart: unless-stopped
+    networks:
+      - backend
+    environment:
+      - POSTGRES_DB=commento
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=$COMMENTO_DB_PASSWORD
+    volumes:
+      - $CONFIGDIR/commento_db:/var/lib/postgresql/data
+#+end_src
+
 * Docker-Compose OLD                                                :noexport:
+** =vaultwarden= - Password Manager ([[https://github.com/dani-garcia/vaultwarden][link]])
+#+begin_src yaml
+  vaultwarden:
+    container_name: vaultwarden
+    image: vaultwarden/server
+    restart: unless-stopped
+    networks:
+      - t2_proxy
+    environment:
+      - PUID=$PUID
+      - PGID=$PGID
+      - TZ=$TZ
+    volumes:
+      - $CONFIGDIR/vaultwarden:/data
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.vaultwarden-rtr.entrypoints=https"
+      - "traefik.http.routers.vaultwarden-rtr.rule=Host(`pass.$DOMAINNAME`)"
+      - "traefik.http.routers.vaultwarden-rtr.tls=true"
+      - "traefik.http.routers.vaultwarden-rtr.service=vaultwarden-svc"
+      - "traefik.http.services.vaultwarden-svc.loadbalancer.server.port=80"
+#+end_src
+
 ** =gonic= - Subsonic Server
 #+begin_src yaml
  gonic:
@ -1743,7 +1769,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - "traefik.http.services.transfer-svc.loadbalancer.server.port=8080"
 #+end_src

-** =ombi=
+** =ombi= - Request movies/tv-shows
 #+begin_src yaml
  ombi:
    container_name: ombi
@ -1767,7 +1793,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - "traefik.http.services.ombi-svc.loadbalancer.server.port=3579"
 #+end_src

-** =jackett=
+** =jackett= - API support for torrents
 #+begin_src yaml
  jackett:
    container_name: jackett
@ -1788,7 +1814,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - 9117:9117
 #+end_src

-** =radarr=
+** =radarr= - Automatically download Movies
 #+begin_src yaml
  radarr:
    container_name: radarr
@ -1809,7 +1835,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - 7878:7878
 #+end_src

-** =sonarr=
+** =sonarr= - Automatically download TVshows
 #+begin_src yaml
  sonarr:
    container_name: sonarr
@ -1830,7 +1856,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - 8989:8989
 #+end_src

-** =bazarr=
+** =bazarr= - Automatically download Music
 #+begin_src yaml
  bazarr:
    container_name: bazarr
@ -1851,7 +1877,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - 6767:6767
 #+end_src

-** =gotify=
+** =gotify= - Notification service
 #+begin_src yaml
  gotify:
    container_name: gotify
@ -1876,7 +1902,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - "traefik.http.services.gotify-svc.loadbalancer.server.port=80"
 #+end_src

-** =mail-cli=
+** =mail-cli= - CLI mail client
 #+begin_src yaml
  mail-cli:
    image: tdehaeze/docker-mail-cli
@ -1893,29 +1919,6 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
    tty: true
 #+end_src

-** =bitwarden=
-#+begin_src yaml
-  bitwarden:
-    container_name: bitwarden
-    image: bitwardenrs/server
-    restart: unless-stopped
-    networks:
-      - t2_proxy
-    environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
-    volumes:
-      - $CONFIGDIR/bitwarden:/data
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.bitwarden-rtr.entrypoints=https"
-      - "traefik.http.routers.bitwarden-rtr.rule=Host(`bw.$DOMAINNAME`)"
-      - "traefik.http.routers.bitwarden-rtr.tls=true"
-      - "traefik.http.routers.bitwarden-rtr.service=bitwarden-svc"
-      - "traefik.http.services.bitwarden-svc.loadbalancer.server.port=80"
-#+end_src
-
 ** =cloudcmd= - Minimalist file manager
 #+begin_src yaml
  cloudcmd:
@ -1993,7 +1996,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - $CONFIGDIR/wallabag/data:/var/lib/mysql
 #+end_src

-** =transmission=
+** =transmission= - Torrent server
 #+begin_src yaml
  transmission:
    container_name: transmission
@ -2023,7 +2026,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - "traefik.http.services.transmission-svc.loadbalancer.server.port=9091"
 #+end_src

-** =navidrome=
+** =navidrome= - Music server
 #+begin_src yaml
  navidrome:
    container_name: navidrome
@ -2052,7 +2055,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - "traefik.http.services.navidrome-svc.loadbalancer.server.port=4533"
 #+end_src

-** =buku=
+** =buku= - Bookmark manager
 #+begin_src yaml
  buku:
    container_name: buku
@ -2081,31 +2084,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - "traefik.http.services.buku-svc.loadbalancer.server.port=5001"
 #+end_src

-** =gossa=
-#+begin_src yaml
-  gossa:
-    container_name: gossa
-    image: pldubouilh/gossa
-    restart: unless-stopped
-    networks:
-      - t2_proxy
-    environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
-    volumes:
-      - /srv/storage/Downloads:/shared
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.gossa-rtr.entrypoints=https"
-      - "traefik.http.routers.gossa-rtr.rule=Host(`cloud.$DOMAINNAME`)"
-      - "traefik.http.routers.gossa-rtr.tls=true"
-      - "traefik.http.routers.gossa-rtr.service=gossa-svc"
-      - "traefik.http.routers.gossa-rtr.middlewares=traefik-auth"
-      - "traefik.http.services.gossa-svc.loadbalancer.server.port=8001"
-#+end_src
-
-** =duplicati=
+** =duplicati= - Backup system
 #+begin_src yaml
  duplicati:
    container_name: duplicati
@ -2132,203 +2111,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - "traefik.http.services.duplicati-svc.loadbalancer.server.port=8200"
 #+end_src

-** =pyload=
-#+begin_src yaml
-  pyload:
-    image: linuxserver/pyload
-    container_name: pyload
-    restart: unless-stopped
-    environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
-    volumes:
-      - $CONFIGDIR/pyload:/config
-      - /srv/storage/Downloads:/downloads
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.pyload-rtr.entrypoints=https"
-      - "traefik.http.routers.pyload-rtr.rule=Host(`dl.$DOMAINNAME`)"
-      - "traefik.http.routers.pyload-rtr.tls=true"
-      - "traefik.http.routers.pyload-rtr.service=pyload-svc"
-      - "traefik.http.routers.pyload-rtr.middlewares=traefik-auth"
-      # - 'traefik.http.routers.pyload-rtr.middlewares=authelia@docker'
-      - "traefik.http.services.pyload-svc.loadbalancer.server.port=8000"
-#+end_src
-
-** =aria2= - Webui
-#+begin_src yaml
-  aria2:
-    container_name: aria2
-    image: lukasmrtvy/lsiobase-aria2-webui
-    restart: unless-stopped
-    networks:
-      - t2_proxy
-    environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
-      - WEBUI=ariang
-      - SKIP_SSL=true
-      - CUSTOM_RPC_TOKEN=P@ssword123
-    volumes:
-      - $CONFIGDIR/aria2:/data/config
-      - /srv/storage/Downloads:/data/downloads
-    ports:
-      - 6800:6800
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.aria2-rtr.entrypoints=https"
-      - "traefik.http.routers.aria2-rtr.rule=Host(`dl.$DOMAINNAME`)"
-      - "traefik.http.routers.aria2-rtr.tls=true"
-      - "traefik.http.routers.aria2-rtr.service=aria2-svc"
-      - "traefik.http.routers.aria2-rtr.middlewares=traefik-auth"
-      - "traefik.http.services.aria2-svc.loadbalancer.server.port=4040"
-#+end_src
-
-** =aria2= - Daemon
-#+begin_src yaml
-  aria2:
-    container_name: aria2
-    image: p3terx/aria2-pro
-    restart: unless-stopped
-    networks:
-      - t2_proxy
-    environment:
-      - PUID=$PUID
-      - PGID=$PGID
-    logging:
-      driver: json-file
-      options:
-        max-size: 1m
-    volumes:
-      - $CONFIGDIR/aria2:/config
-      - /srv/storage/Downloads:/downloads
-    ports:
-      - 6800:6800
-#+end_src
-
-** =droppy=
-#+begin_src yaml
-  droppy:
-    container_name: droppy
-    image: silverwind/droppy
-    restart: unless-stopped
-    networks:
-      - t2_proxy
-    environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
-    volumes:
-      - $CONFIGDIR/droppy:/config
-      - /home/thomas/docker/test:/files
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.droppy-rtr.entrypoints=https"
-      - "traefik.http.routers.droppy-rtr.rule=Host(`test.$DOMAINNAME`)"
-      - "traefik.http.routers.droppy-rtr.tls=true"
-      - "traefik.http.routers.droppy-rtr.service=droppy-svc"
-      - "traefik.http.services.droppy-svc.loadbalancer.server.port=8989"
-#+end_src
-
-** =synapse=
-#+begin_src yaml
-  synapse:
-    container_name: synapse
-    image: matrixdotorg/synapse
-    restart: unless-stopped
-    depends_on:
-      - synapse_db
-    networks:
-      - t2_proxy
-      - backend
-    environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
-      - SYNAPSE_SERVER_NAME=matrix.tdehaeze.xyz
-      - SYNAPSE_REPORT_STATS=no
-    ports:
-      - 8448:8448
-    #  - 3478:3478
-    volumes:
-      - $CONFIGDIR/synapse:/data
-      - $CONFIGDIR/mautrix-facebook:/data/mautrix-facebook
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.synapse-rtr.entrypoints=https"
-      - "traefik.http.routers.synapse-rtr.rule=Host(`matrix.$DOMAINNAME`)"
-      - "traefik.http.routers.synapse-rtr.tls=true"
-      - "traefik.http.routers.synapse-rtr.service=synapse-svc"
-      - "traefik.http.services.synapse-svc.loadbalancer.server.port=8008"
-
-  synapse_db:
-    container_name: synapse_db
-    image: postgres
-    restart: unless-stopped
-    networks:
-      - backend
-    ports:
-      - 5432:5432
-    environment:
-      - POSTGRES_DB=synapse
-      - POSTGRES_INITDB_ARGS=--encoding='UTF8' --lc-collate='C' --lc-ctype='C'
-      - POSTGRES_USER=synapse_user
-      - POSTGRES_PASSWORD=$SYNAPSE_POSTGRES_PASSWORD
-    volumes:
-      - $CONFIGDIR/synapse_db:/var/lib/postgresql/data
-#+end_src
-
-** =mautrix-facebook=
-#+begin_src yaml
-  mautrix-facebook:
-    container_name: mautrix-facebook
-    image: dock.mau.dev/tulir/mautrix-facebook
-    restart: unless-stopped
-    depends_on:
-      - synapse
-    networks:
-      - t2_proxy
-      - backend
-    ports:
-      - 29319:29319
-    volumes:
-      - $CONFIGDIR/mautrix-facebook:/data
-#+end_src
-
-** =matrix-slack=
-#+begin_src yaml
-  matrix-slack:
-    container_name: matrix-slack
-    image: matrixdotorg/matrix-appservice-slack
-    restart: unless-stopped
-    depends_on:
-      - synapse
-      - matrix_slack_db
-    networks:
-      - t2_proxy
-      - backend
-    ports:
-      - 9898:9898
-    volumes:
-      - $CONFIGDIR/matrix-slack:/config
-
-  matrix_slack_db:
-    container_name: matrix_slack_db
-    image: postgres:latest
-    restart: unless-stopped
-    networks:
-      - backend
-    environment:
-      - POSTGRES_DB=slack_bridge
-      - POSTGRES_USER=slackbridge_user
-      - POSTGRES_PASSWORD=test
-    volumes:
-      - $CONFIGDIR/matrix_slack_db:/var/lib/postgresql/data
-#+end_src
-
-** =netdata=
+** =netdata= - Performance Monitoring
 #+begin_src yaml
  netdata:
    image: netdata/netdata
@ -2360,7 +2143,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - "traefik.http.services.netdata-svc.loadbalancer.server.port=19999"
 #+end_src

-** =fail2ban=
+** =fail2ban= - Ban hosts that cause multiple authentication errors
 #+begin_src yaml
  fail2ban:
    image: crazymax/fail2ban:latest
@ -2379,7 +2162,7 @@ pass = <<get-password(passname="nas/duplicity_mega")>>
      - PGID=$PGID
 #+end_src

-** =authelia=
+** =authelia= - Single Sign-On Multi-Factor portal ([[https://github.com/authelia/authelia][link]])
 #+begin_src yaml
  authelia:
    image: authelia/authelia
@ -2468,6 +2251,10 @@ DEEMIX_ARL=<<get-password(passname="nas/deemix_arl")>>
 GMAIL_PASS=<<get-password(passname="google.com/tdehaeze.xyz")>>
 #+end_src

+#+begin_src conf
+COMMENTO_DB_PASSWORD=<<get-password(passname="nas/commento_db_pass")>>
+#+end_src
+
 * Cron Jobs
 ** Caddy Update
 Create a script =~/cron/caddy_update.sh= with:
--- a/tablet.org
+++ b/tablet.org
@ -0,0 +1,52 @@
+#+TITLE: Drawing Tablet - Xournal
+#+SETUPFILE: ./setup/org-setup-file.org
+
+* =xournalpp=
+
+=toolbar.ini=:
+#+begin_src conf :tangle ~/.config/xournalpp/toolbar.ini
+## Xournal++ Toolbar configuration
+## Here you can customize the Toolbars
+# Delete this file to generate a new config file with default values
+#
+# Available buttons:
+# File: NEW,SAVE,OPEN,PRINT
+#
+# Edit: CUT,COPY,PASTE,SEARCH,UNDO,REDO,INSERT_NEW_PAGE
+#
+# Navigation: GOTO_FIRST,GOTO_BACK,GOTO_NEXT,GOTO_LAST,GOTO_NEXT_ANNOTATED_PAGE
+#
+# Zoom: ZOOM_OUT,ZOOM_IN,ZOOM_FIT,ZOOM_100,FULLSCREEN,PAIRED_PAGES
+#
+# Color: COLOR(0xffffff),COLOR(0xffff00),COLOR(0xff8000),COLOR(0xff00ff),COLOR(0x00ff00),COLOR(0x00c0ff),COLOR(0x808080),COLOR(0x008000),COLOR(0xff0000),COLOR(0x3333cc),COLOR(0x000000),COLOR_SELECT
+#  Notice: This are the default Xournal colors, each other color in HEX can also be used, eg COLOR(0x12ABCF);
+#
+# Tools: ERASER,PEN,HIGHLIGHTER,IMAGE,TEXT,IMAGE,SELECT,SELECT_REGION,SELECT_RECTANGLE,VERTICAL_SPACE,HAND
+#  Notice: ERASER also has a drop down menu to select the eraser type, SELECT are all selection tools, with drop down menu
+#
+# Tool settings: SHAPE_RECOGNIZER,RULER,FINE,MEDIUM,THICK,SELECT_FONT
+#
+# Components: PAGE_SPIN,ZOOM_SLIDER,LAYER
+#  PAGE_SPIN: The page spiner, incl. current page label
+#  ZOOM_SLIDER: The zoom slider
+#  LAYER: The layer dropdown menu
+#
+#
+
+[Floating Toolbox - Custom]
+toolbarTop1=SAVE,NEW,OPEN,SEPARATOR,IMAGE,TEXT,MATH_TEX,DRAW,SEPARATOR,SELECT,SEPARATOR,DEFAULT_TOOL,SEPARATOR,ZOOM_100,ZOOM_FIT
+
+toolbarFloat1=PEN,HIGHLIGHTER,ERASER
+toolbarFloat2=FINE,MEDIUM,THICK,VERY_THICK
+toolbarFloat3=COLOR(0xffffff),COLOR(0x0072BD),COLOR(0xD95218),COLOR(0xECB01F),COLOR(0x7D2E8E),COLOR(0x77AB2F),COLOR(0x000000),COLOR_SELECT
+toolbarFloat4=DRAW_RECTANGLE,DRAW_ELLIPSE,DRAW_ARROW,RULER,DRAW_SPLINE
+
+name=Floating Tolbox - Custom
+#+end_src
+
+Special lines in =settings.xml=:
+#+begin_src conf :tangle no
+<!--Config for new pages-->
+<property name="eagerPageCleanup" value="true"/>
+<property name="pageTemplate" value="xoj/template&#10;copyLastPageSettings=false&#10;size=600.0x400.0&#10;backgroundType=plain&#10;backgroundColor=#ffffff&#10;"/>
+#+end_src
--- a/torrent.org
+++ b/torrent.org
@ -10,7 +10,7 @@ password = <<get-password(passname="nas/transmission")>>
 username = tdehaeze
 port = 9091
 host = torrent.tdehaeze.xyz
-path = /transmission/rpc
+path = /transmission/rpc/
 ssl = False

 [Sorting]
@ -48,7 +48,6 @@ file_prio_off = bg:blue,fg:black
 #+end_src

 * =aria2c= - Lightweight download utility
-** Aria2c Config
 #+begin_src conf :comments none :mkdirp yes :tangle ~/.config/aria2/aria2.conf :noweb no-export
 continue
 daemon=true