From b553c3ed3700bfffe171d5591d29c19b9bf338f5 Mon Sep 17 00:00:00 2001 From: Thomas Dehaeze Date: Sun, 2 May 2021 11:27:39 +0200 Subject: [PATCH] Update config --- android.org | 139 ++++---- binaries-private.org | 4 +- calendar-contact.org | 5 + config.org | 31 +- docs/android.html | 258 +++++++++++---- docs/binaries-private.html | 8 +- docs/calendar-contact.html | 35 +- docs/config.html | 33 +- docs/doom.html | 81 +++-- docs/i3.html | 6 +- docs/nas.html | 579 ++++++++++++++++---------------- docs/tablet.html | 94 ++++++ docs/torrent.html | 14 +- doom.org | 31 +- i3.org | 2 +- nas.org | 657 +++++++++++++------------------------ tablet.org | 52 +++ torrent.org | 3 +- 18 files changed, 1086 insertions(+), 946 deletions(-) create mode 100644 docs/tablet.html create mode 100644 tablet.org diff --git a/android.org b/android.org index 29e0413..ea9dacf 100644 --- 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://play.google.com/store/apps/details?id=com.nordvpn.android&hl=en&gl=US][NordVPN]] | | | -| Spotify | | | -| Banking | | | -| Trainline | | | -| Tricount | | | +| Name | Description | Open Source Alternative | +|---------------------+---------------------+-------------------------| +| [[https://www.waze.com/][Waze]] | GPS navigation app | | +| [[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 | | [[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=. diff --git a/binaries-private.org b/binaries-private.org index d55adf4..7f8ad0c 100644 --- 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 82.64.103.2:9091 --auth tdehaeze:$(pass nas/transmission | sed -n 1p) -a $1 && \ +#+begin_src bash :tangle ~/.local/bin/torrent-add :noweb yes +transmission-remote <>:9091 --auth tdehaeze:$(pass nas/transmission | sed -n 1p) -a $1 && \ dunstify 'Torrent' 'Successfully added' || \ dunstify 'Torrent' 'Error' #+end_src diff --git a/calendar-contact.org b/calendar-contact.org index 2db7ac3..66aab32 100644 --- 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 diff --git a/config.org b/config.org index ded455a..8785b97 100644 --- 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 82.64.103.2 - Port 10022 - user tdehaeze - IdentityFile ~/.ssh/id_rsa - -Host wingaudio - hostname 207.154.251.241 + hostname <> 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 diff --git a/docs/android.html b/docs/android.html index 289c2c2..1659f27 100644 --- a/docs/android.html +++ b/docs/android.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Android Phone @@ -22,8 +22,20 @@

Table of Contents

@@ -31,15 +43,46 @@ +

Favorite Apps

@@ -49,218 +92,274 @@ ROM: https://lineage.microg.org/ ( + + Name +  Description F-droid +  Open Source application store QKSMS +https://f-droid.org/en/packages/com.moez.QKSMS/ SMS Fenix +https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/ Firefox for android Syncthing +https://f-droid.org/en/packages/com.nutomic.syncthingandroid/ Continuous File Synchronization Termux +https://f-droid.org/en/packages/com.termux/ Terminal FastHub +https://f-droid.org/en/packages/com.fastaccess.github.libre/ Github client Gelli +https://f-droid.org/en/packages/com.dkanada.gramophone/ Music app for Jellyfin K-9 Mail +https://f-droid.org/en/packages/com.fsck.k9/ Mail client + +Simple Dialer +https://f-droid.org/en/packages/com.simplemobiletools.dialer/ +Minimalist dialing app + + Simple Gallery +https://f-droid.org/en/packages/com.simplemobiletools.gallery.pro/ Minimalist gallery app Simple Contacts +https://f-droid.org/en/packages/com.simplemobiletools.contacts.pro/ Minimalist contact app Simple Calendar -Minimalist calendar app (alternative: Etar) +https://f-droid.org/en/packages/com.simplemobiletools.calendar.pro/ +Minimalist calendar app muPDF +https://f-droid.org/en/packages/com.artifex.mupdf.viewer.app/ PDF minimalist viewer MPV +https://f-droid.org/en/packages/is.xyz.mpv/ Video player Orgzly +https://f-droid.org/en/packages/com.orgzly/ OrgMode application Element +https://f-droid.org/en/packages/im.vector.app/ Matrix client - -OAndBackupX -Backup Manager (Requires root) - - - -uhabits -Habit Tracker - - - -Aria2App -Download manager - - DAVx5 +https://f-droid.org/en/packages/at.bitfire.davdroid/ Used to synchronize contacts and calendars with calDAC/carddav Aurora Store +https://f-droid.org/en/packages/com.aurora.store/ Play Store alternative - -Bromite -Chromium fork with ad blocking and privacy enhancements - - Forcastie +https://f-droid.org/en/packages/cz.martykan.forecastie/ Weather application GitNex +https://f-droid.org/en/packages/org.mian.gitnex/ Gitea client Home Assistant +https://f-droid.org/en/packages/io.homeassistant.companion.android.minimal/ Home Assistant client Jellyfin +https://f-droid.org/en/packages/org.jellyfin.mobile/ Jellyfin client KDE Connect +https://f-droid.org/en/packages/org.kde.kdeconnect_tp/ Connect to linux desktop - -Miniflutt -Miniflux client - - NewPipe +https://f-droid.org/en/packages/org.schabi.newpipe/ Frontend for Youtube OsmAnd~ +https://f-droid.org/en/packages/net.osmand.plus/ Open Street Map application Password Store +https://f-droid.org/en/packages/dev.msfjarvis.aps/ Password manager Transistor +https://f-droid.org/en/packages/org.y20k.transistor/ Radio application Barcode Scanner +https://f-droid.org/en/packages/com.google.zxing.client.android/ Barcode Scanner Calculator++ +https://f-droid.org/en/packages/org.solovyev.android.calculator/ Nice calculator app MaterialFiles +https://f-droid.org/en/packages/me.zhanghai.android.files/ File Manager - -Tremotesf -Transmission client - - Tunerly +https://f-droid.org/en/packages/com.tunerly/ Pitch tuning app Infinity +https://f-droid.org/en/packages/ml.docilealligator.infinityforreddit/ Reddit client -tachiyomiJ2K -Manga reader - - - -AnySoftKeyboard +OpenBoard +https://f-droid.org/en/packages/org.dslul.openboard.inputmethod.latin/ Keyboard -Wireguard -  +Simple Clock +https://f-droid.org/en/packages/com.simplemobiletools.clock/ +Simple clock -Simple Clock +Wireguard +https://f-droid.org/en/packages/com.wireguard.android/ +Modern VPN + + + +uhabits +https://f-droid.org/packages/org.isoron.uhabits/ +Habit Tracker + + + +OpenKeychain +https://f-droid.org/packages/org.sufficientlysecure.keychain/ +PGP Manager + + + +Editor +https://f-droid.org/packages/org.billthefarmer.editor/ +Text Editor + + + +Transdroid +https://f-droid.org/en/packages/org.transdroid.full/ +Transmission and Aria2 clients + + + +AntennaPod +https://f-droid.org/packages/de.danoeh.antennapod/ +Podcast manager + + + +Bromite   +Chromium fork with ad blocking and privacy enhancements + + + +TachiyomiJ2K +  +Manga reader + + + +Miniflutt +  +Miniflux client @@ -284,12 +383,6 @@ ROM: https://lineage.microg.org/ ( - -Printoid -Octoprint client -Web client? - - Waze GPS navigation app @@ -297,15 +390,15 @@ ROM: https://lineage.microg.org/ ( -Boost for Reddit -Reddit client -  +Printoid +Octoprint client +Web client? Youtube Vanced Youtube without ads -  +NewPipe @@ -335,16 +428,67 @@ ROM: https://lineage.microg.org/ ( Tricount   +Splittypie + + + + + + + + +++ ++ ++ + + + + + + + + + + + + + + + + +
Table 3: Apps requiring Root
NameDescriptionOpen Source Alternative
Afwall   
Titanium Backup PRO 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. +

+
+
+

Author: Dehaeze Thomas

-

Created: 2021-04-26 lun. 11:01

+

Created: 2021-05-02 dim. 11:26

diff --git a/docs/binaries-private.html b/docs/binaries-private.html index 439b18f..bb92aac 100644 --- a/docs/binaries-private.html +++ b/docs/binaries-private.html @@ -3,11 +3,11 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + My own specific binaries - + @@ -147,7 +147,7 @@ As an alternative, sshfs can be used:

torrent-add - Download Torrent

-
transmission-remote 82.64.103.2:9091 --auth tdehaeze:$(pass nas/transmission | sed -n 1p) -a $1 && \
+
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'
 

@@ -271,7 +271,7 @@ List all pdf files and open selected one with zathura.

Author: Dehaeze Thomas

-

Created: 2021-02-10 mer. 17:57

+

Created: 2021-05-02 dim. 11:26

diff --git a/docs/calendar-contact.html b/docs/calendar-contact.html index 8921404..52a588b 100644 --- a/docs/calendar-contact.html +++ b/docs/calendar-contact.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Calendar and Contact Configuration @@ -53,6 +53,22 @@ path = "~/.calendars/radicale/" fileext = ".ics" +[pair esrf_calendar] +a = "esrf_calendar_remote" +b = "esrf_calendar_local" +collections = ["calendar"] +conflict_resolution = "a wins" + +[storage esrf_calendar_remote] +type = "caldav" +url = "https://calendar.esrf.fr/egroupware/groupdav.php/calendar" +username = "dehaeze" +password = "<<get-password(passname="ce-esrf.fr/dehaeze")>>" + +[storage esrf_calendar_local] +type = "filesystem" +path = "~/.calendars/esrf/" +fileext = ".ics" [pair radicale_contacts] a = "radicale_contacts_remote" @@ -83,14 +99,23 @@ [[Home]] path = ~/.calendars/radicale/76bfc802-3186-e3af-f688-7e165115b4f8/ -color = "#B8BB26" +color = "#B8BB26" # Green [[Thesis]] path = ~/.calendars/radicale/f78f1649-b54e-7bfe-488d-6a7005a5aa2f/ -color = "#FB4934" +color = "#FB4934" # Red + +[[ESRF]] +path = ~/.calendars/esrf/calendar/ +color = "#83A598" # Blue + +[[Birthdays]] +path = ~/.contacts/98ee5e2c-afcf-70e0-c4a2-9fb9de2e97b7/ +color = "#D3869B" # aqua +type = birthdays [highlight_days] -multiple = "#FABD2F" +multiple = "#FABD2F" # Yellow [default] highlight_event_days = True @@ -169,7 +194,7 @@

Author: Dehaeze Thomas

-

Created: 2021-04-25 dim. 19:10

+

Created: 2021-05-02 dim. 11:26

diff --git a/docs/config.html b/docs/config.html index 43018f6..7b32f10 100644 --- a/docs/config.html +++ b/docs/config.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Configuration Files @@ -42,33 +42,14 @@ 
AddKeysToAgent  yes
 
 Host grenoble
-    hostname 82.64.103.2
-    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
@@ -857,7 +838,7 @@ Colors

Author: Dehaeze Thomas

-

Created: 2021-04-25 dim. 19:10

+

Created: 2021-05-02 dim. 11:26

diff --git a/docs/doom.html b/docs/doom.html index 0f2fe33..70e145b 100644 --- a/docs/doom.html +++ b/docs/doom.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Doom Emacs Configuration @@ -56,7 +56,7 @@ -
-

Basic Config

-
+
+

Basic Config

+
(after! auctex
   (setq +latex-viewers '(zathura pdf-tools)))
@@ -4420,9 +4444,9 @@ Choose account label to feed msmtp -a option based on From header in Message buf
-
-

Basic Config

-
+
+

Basic Config

+
(use-package! mu4e
   :config
@@ -4668,8 +4692,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
@@ -4844,7 +4867,7 @@ Choose account label to feed msmtp -a option based on From header in Message buf

Author: Dehaeze Thomas

-

Created: 2021-04-25 dim. 19:10

+

Created: 2021-05-02 dim. 11:26

diff --git a/docs/i3.html b/docs/i3.html index 1d0f73b..215b527 100644 --- a/docs/i3.html +++ b/docs/i3.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + I3 Configuration @@ -247,7 +247,7 @@ set $ws8 8 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 @@ -293,7 +293,7 @@ exec --no-startup-id polybar top >>/tmp/polybar.log 2>&1 &

Author: Dehaeze Thomas

-

Created: 2021-04-25 dim. 19:10

+

Created: 2021-05-02 dim. 11:26

diff --git a/docs/nas.html b/docs/nas.html index 0e1ca9f..2aae54d 100644 --- a/docs/nas.html +++ b/docs/nas.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Home Server @@ -56,74 +56,74 @@
  • .env - Variable used for Docker Compose
    • @@ -701,9 +701,9 @@ If indeed, we want to make a copy of the file, we can use the backup folder
    -
    -

    traefik - Application proxy

    -
    +
    +

    traefik - Application proxy (link)

    +
    services:
    @@ -832,9 +832,67 @@ If indeed, we want to make a copy of the file, we can use the backup folder
    -
    -

    homer - Home page

    -
    +
    +

    nginx - Root

    +
    +
    +
      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
+
    +
    +
    + +
    +

    nginx.conf

    +
    +
    +
    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;
+        }
+    }
+}
+
    +
    +
    +
    +
    + +
    +

    homer - Home page (link)

    +
      homer:
     container_name: homer
@@ -1010,9 +1068,9 @@ If indeed, we want to make a copy of the file, we can use the backup folder
    -
    -

    snapraid - Manage local backup with parity disk

    -
    +
    +

    snapraid - Manage local backup with parity disk (link)

    +
      snapraid:
     container_name: snapraid
@@ -1141,9 +1199,9 @@ exclude .AppleDB
    -
    -

    portainer - Manage docker

    -
    +
    +

    portainer - Manage docker (link)

    +
      portainer:
     container_name: portainer
@@ -1174,9 +1232,9 @@ exclude .AppleDB
    -
    -

    wireguard - VPN

    -
    +
    +

    wireguard - VPN (link)

    +
      wireguard:
     container_name: wireguard
@@ -1206,9 +1264,9 @@ exclude .AppleDB
    -
    -

    gitea - Git server

    -
    +
    +

    gitea - Git server (link)

    +
      gitea:
     container_name: git
@@ -1291,9 +1349,9 @@ exclude .AppleDB
    -
    -

    Caddyfile

    -
    +
    +

    Caddyfile

    +
    0.0.0.0:2015 {
     root /srv/www/
@@ -1342,9 +1400,9 @@ exclude .AppleDB
    -
    -

    Caddyfile

    -
    +
    +

    Caddyfile

    +
    0.0.0.0:2015 {
     root /srv/www/docs/
@@ -1362,64 +1420,6 @@ exclude .AppleDB
    -
    -

    nginx - Root

    -
    -
    -
      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
-
    -
    -
    - -
    -

    nginx.conf

    -
    -
    -
    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;
-        }
-    }
-}
-
    -
    -
    -
    -
    -

    hugo - Wiki + Blog

    @@ -1445,9 +1445,9 @@ exclude .AppleDB
    -
    -

    syncthing - File Synchronization

    -
    +
    +

    syncthing - File Synchronization (link)

    +
      syncthing:
     container_name: syncthing
@@ -1485,9 +1485,9 @@ exclude .AppleDB
    -
    -

    miniflux - RSS reader

    -
    +
    +

    miniflux - RSS reader (link)

    +
      miniflux:
     container_name: miniflux
@@ -1533,9 +1533,9 @@ exclude .AppleDB
    -
    -

    homeassistant - Home Automation

    -
    +
    +

    homeassistant - Home Automation (link)

    +
      homeassistant:
     container_name: homeassistant
@@ -1573,9 +1573,9 @@ exclude .AppleDB
    -
    -

    jellyfin - Media server

    -
    +
    +

    jellyfin - Media server (link)

    +
      jellyfin:
     container_name: jellyfin
@@ -1607,9 +1607,9 @@ exclude .AppleDB
    -
    -

    filebrowser - Web file browser

    -
    +
    +

    filebrowser - Web file browser (link)

    +
      filebrowser:
     container_name: filebrowser
@@ -1656,9 +1656,9 @@ exclude .AppleDB
    -
    -

    scrutiny - Hard drive monitoring

    -
    +
    +

    scrutiny - Hard drive monitoring (link)

    +
      scrutiny:
     container_name: scrutiny
@@ -1693,9 +1693,9 @@ exclude .AppleDB
    -
    -

    transmission - Torrent server

    -
    +
    +

    transmission - Torrent server (link)

    +
      transmission-openvpn:
     container_name: transmission
@@ -1741,9 +1741,12 @@ exclude .AppleDB
    -
    -

    aria2 - Download daemon

    -
    +
    +

    aria2 - Download daemon (link)

    +
    +

    +Backend (link): +

      aria2:
     container_name: aria2
@@ -1763,6 +1766,32 @@ exclude .AppleDB
     logging: *default-logging
    + +

    +Web-UI (link): +

    +
    +
      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
+
    +
    @@ -1796,64 +1825,6 @@ exclude .AppleDB
    -
    -

    aria2-ui - Download web UI

    -
    -
    -
      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
-
    -
    -
    -
    - -
    -

    linkding - Bookmark manager

    -
    -
    -
      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
-
    -
    -
    -
    -

    radicale - CalDAC/CardDAV server (link)

    @@ -1871,6 +1842,15 @@ exclude .AppleDB - 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" @@ -1891,77 +1871,21 @@ exclude .AppleDB 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 = *
    -
    -

    restic - Automatic online backups

    -
    +
    +

    restic - Automatic online backups (link)

    +
      restic:
     container_name: restic
@@ -2011,9 +1935,9 @@ exclude .AppleDB
    -
    -

    octoprint - Web interface for 3D printing

    -
    +
    +

    octoprint - Web interface for 3D printing (link)

    +
      octoprint:
     container_name: octoprint
@@ -2043,13 +1967,39 @@ exclude .AppleDB
    -
    -

    adguardhome - Web interface for 3D printing

    -
    -

    -ports for DHCP server: -

    +
    +

    linkding - Bookmark manager (link)

    +
    +
    +
      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
+
    +
    +
    +
    +
    +

    adguardhome - Network-wide ads & trackers blocking DNS server (link)

    +
      adguardhome:
     container_name: adguardhome
@@ -2081,9 +2031,9 @@ ports for DHCP server:
    -
    -

    mealie - Recipe Manager

    -
    +
    +

    mealie - Recipe Manager (link)

    +
      miam:
     container_name: miam
@@ -2111,9 +2061,9 @@ ports for DHCP server:
    -
    -

    diun - Notification for Docker image updates

    -
    +
    +

    diun - Notification for Docker image updates (link)

    +
      diun:
     container_name: 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:
    + +
    +

    commento - Commenting system (link)

    +
    +
    +
      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
+
    +
    + +
    +
      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
+
    +
    +
    +
    @@ -2217,6 +2223,11 @@ ports for DHCP server: 
    GMAIL_PASS=<<get-password(passname="google.com/tdehaeze.xyz")>>
    + +
    +
    COMMENTO_DB_PASSWORD=<<get-password(passname="nas/commento_db_pass")>>
+
    +
    @@ -2248,7 +2259,7 @@ Type crontab -e and add this line:

    Author: Dehaeze Thomas

    -

    Created: 2021-04-25 dim. 19:10

    +

    Created: 2021-05-02 dim. 11:26

    diff --git a/docs/tablet.html b/docs/tablet.html new file mode 100644 index 0000000..0886669 --- /dev/null +++ b/docs/tablet.html @@ -0,0 +1,94 @@ + + + + + + +Drawing Tablet - Xournal + + + + + + +
    + UP + | + HOME +
    +

    Drawing Tablet - Xournal

    +
    +

    Table of Contents

    +
    + +
    +
    + +
    +

    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
+
    +
    + +

    +Special lines in settings.xml: +

    +
    +
    <!--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;"/>
+
    +
    +
    +
    +
    +
    +

    Author: Dehaeze Thomas

    +

    Created: 2021-04-25 dim. 19:10

    +
    + + diff --git a/docs/torrent.html b/docs/torrent.html index 894678c..0111210 100644 --- a/docs/torrent.html +++ b/docs/torrent.html @@ -3,11 +3,11 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Torrent Configuration - + @@ -25,7 +25,6 @@
  • tremc - Curses interface for Transmission
  • aria2c - Lightweight download utility
      -
    • Aria2c Config
    • Download Start Script
    • Download Complete Script
    • Download Error Script
      • @@ -48,7 +47,7 @@ username = tdehaeze port = 9091 host = torrent.tdehaeze.xyz -path = /transmission/rpc +path = /transmission/rpc/ ssl = False [Sorting] @@ -91,10 +90,6 @@

      aria2c - Lightweight download utility

      -
      -
      -

      Aria2c Config

      -
      continue
 daemon=true
@@ -111,7 +106,6 @@
      -

      Download Start Script

      @@ -146,7 +140,7 @@

      Author: Dehaeze Thomas

      -

      Created: 2021-01-08 ven. 01:43

      +

      Created: 2021-05-02 dim. 11:26

      diff --git a/doom.org b/doom.org index f254d1d..9cd7933 100644 --- 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 diff --git a/i3.org b/i3.org index 19c0858..35d406c 100644 --- 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 diff --git a/nas.org b/nas.org index dcf71ab..b76f1a1 100644 --- 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 <> #+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 = <> - "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 = <> - "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 = <> - 9117:9117 #+end_src -** =radarr= +** =radarr= - Automatically download Movies #+begin_src yaml radarr: container_name: radarr @@ -1809,7 +1835,7 @@ pass = <> - 7878:7878 #+end_src -** =sonarr= +** =sonarr= - Automatically download TVshows #+begin_src yaml sonarr: container_name: sonarr @@ -1830,7 +1856,7 @@ pass = <> - 8989:8989 #+end_src -** =bazarr= +** =bazarr= - Automatically download Music #+begin_src yaml bazarr: container_name: bazarr @@ -1851,7 +1877,7 @@ pass = <> - 6767:6767 #+end_src -** =gotify= +** =gotify= - Notification service #+begin_src yaml gotify: container_name: gotify @@ -1876,7 +1902,7 @@ pass = <> - "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 = <> 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 = <> - $CONFIGDIR/wallabag/data:/var/lib/mysql #+end_src -** =transmission= +** =transmission= - Torrent server #+begin_src yaml transmission: container_name: transmission @@ -2023,7 +2026,7 @@ pass = <> - "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 = <> - "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 = <> - "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 = <> - "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 = <> - "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 = <> - 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=<> GMAIL_PASS=<> #+end_src +#+begin_src conf +COMMENTO_DB_PASSWORD=<> +#+end_src + * Cron Jobs ** Caddy Update Create a script =~/cron/caddy_update.sh= with: diff --git a/tablet.org b/tablet.org new file mode 100644 index 0000000..636cff3 --- /dev/null +++ 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 + + + +#+end_src diff --git a/torrent.org b/torrent.org index bc361d0..91d4147 100644 --- a/torrent.org +++ b/torrent.org @@ -10,7 +10,7 @@ password = <> 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