diff --git a/android.org b/android.org index 4b69339..5755095 100644 --- a/android.org +++ b/android.org @@ -63,7 +63,6 @@ Tutorial: https://www.youtube.com/watch?v=3pxOeiIBrHI | [[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 | diff --git a/applications.org b/applications.org index 024b757..d88351a 100644 --- a/applications.org +++ b/applications.org @@ -7,10 +7,13 @@ #+BEGIN_SRC conf :tangle ~/.config/mimeapps.list [Default Applications] text/plain=nvim.desktop -text/x-shellscript=nvim.desktop; -image/png=img.desktop; -image/jpeg=img.desktop; -image/gif=img.desktop; +text/x-tex=emacsclient.desktop +text/x-shellscript=nvim.desktop +image/png=img.desktop +image/jpeg=img.desktop +image/gif=img.desktop + +image/svg+xml=inkscape.desktop application/rss+xml=rss.desktop @@ -37,6 +40,13 @@ application/x-extension-xht=org.qutebrowser.qutebrowser.desktop x-scheme-handler/about=org.qutebrowser.qutebrowser.desktop x-scheme-handler/unknown=org.qutebrowser.qutebrowser.desktop +application/msword=onlyoffice-desktopeditors.desktop +application/vnd.ms-excel=onlyoffice-desktopeditors.desktop +application/vnd.ms-powerpoint=onlyoffice-desktopeditors.desktop +application/vnd.openxmlformats-officedocument.wordprocessingml.document=onlyoffice-desktopeditors.desktop +application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=onlyoffice-desktopeditors.desktop +application/vnd.openxmlformats-officedocument.presentationml.presentation=onlyoffice-desktopeditors.desktop + text/calendar=ics_add.desktop [Added Associations] @@ -44,13 +54,43 @@ text/plain=mousepad.desktop; application/x-bittorrent=stig.desktop; #+END_SRC +* Inkscape +#+begin_src conf :tangle ~/.local/share/applications/inkscape.desktop +[Desktop Entry] +Version=1.0 +Name=Inkscape +Type=Application +Categories=Graphics;VectorGraphics;GTK; +MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; +Exec=inkscape %F +TryExec=inkscape +Terminal=false +StartupNotify=true +Icon=inkscape +X-Ayatana-Desktop-Shortcuts=Drawing +#+end_src + +* Emacs Client +#+begin_src conf :tangle ~/.local/share/applications/emacsclient.desktop +[Desktop Entry] +Name=Emacs Client +GenericName=Text Editor +Comment=Edit text +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=emacsclient -c %f +Icon=emacs +Type=Application +Terminal=false +Categories=Utility;TextEditor; +#+end_src + * Neomutt #+begin_src conf :tangle ~/.local/share/applications/neomutt.desktop [Desktop Entry] Name=Neomutt GenericName=Email client -Exec=alacritty -e neomutt %u +Exec=kitty -e neomutt %u Type=Application Icon=/usr/share/icons/Papirus/64x64/apps/mutt.svg Categories=Network;Email; @@ -82,7 +122,7 @@ StartupNotify=true [Desktop Entry] Type=Application Name=Image viewer -Exec=/usr/bin/sxiv -a %u +Exec=/home/thomas/.local/bin/nsxiv-rifle %u #+end_src * Org-Protocol diff --git a/backup.org b/backup.org index e7bb0fb..ce5651a 100644 --- a/backup.org +++ b/backup.org @@ -27,6 +27,7 @@ The following directories are backup on the =Odroid HC4= machine: - =Users= that contains the Cloud of all users - =Cloud= that contains my own cloud - =Music= that contains all the music library +- =immich= that contains all pictures What is *not* backed up: - Most of multimedia content: =Animes=, =Books=, =Conferences=, =Documentaries=, =Games=, =Scans=, =StandUp=, =LiveMusic=, =Movies=, =Trainings=, =TVShows= diff --git a/config.org b/config.org index 2777636..90998b4 100644 --- a/config.org +++ b/config.org @@ -9,11 +9,17 @@ Host * ControlMaster auto ControlPath ~/.ssh/master-%r@%h:%p.socket -# Host backup -# hostname <> -# Port 2022 -# user thomas -# IdentityFile ~/.ssh/id_rsa +Host backup + hostname pierrick.tdehaeze.xyz + Port 10022 + user thomas + IdentityFile ~/.ssh/id_rsa + +Host pierrick + hostname pierrick.tdehaeze.xyz + Port 56432 + user pierrick + IdentityFile ~/.ssh/id_rsa Host homelab hostname <> diff --git a/data.org b/data.org index 8e39eb0..34116d8 100644 --- a/data.org +++ b/data.org @@ -5092,68 +5092,3 @@ 🏴‍☠️ pirate flag; U+1F3F4 U+200D U+2620 U+FE0F #+end_src -* Nordvpn Countries -:PROPERTIES: -:CUSTOM_ID: nordvpn-countries -:END: - -#+begin_src conf :tangle ~/.local/data/nordvpn_countries.txt -Albania -Bulgaria -Denmark -Hong_Kong -Italy -Netherlands -Serbia -Sweden -United_States -Argentina -Canada -Estonia -Hungary -Japan -New_Zealand -Singapore -Switzerland -Vietnam -Australia -Chile -Finland -Iceland -Latvia -North_Macedonia -Slovakia -Taiwan -Austria -Costa_Rica -France -India -Luxembourg -Norway -Slovenia -Thailand -Belgium -Croatia -Georgia -Indonesia -Malaysia -Poland -South_Africa -Turkey -Bosnia_And_Herzegovina -Cyprus -Germany -Ireland -Mexico -Portugal -South_Korea -Ukraine -Brazil -Czech_Republic -Greece -Israel -Moldova -Romania -Spain -United_Kingdom -#+end_src diff --git a/image.org b/image.org index 08fd9c8..3cc39ad 100644 --- a/image.org +++ b/image.org @@ -1,7 +1,7 @@ -#+TITLE: SXIV Configuration +#+TITLE: NSXIV Configuration #+SETUPFILE: ./setup/org-setup-file.org -#+PROPERTY: header-args:conf :tangle ~/.config/sxiv/exec/key-handler +#+PROPERTY: header-args:conf :tangle ~/.config/nsxiv/exec/key-handler #+PROPERTY: header-args:conf+ :comments both :mkdirp yes #+PROPERTY: header-args:conf+ :shebang "#!/usr/bin/env bash" diff --git a/index.org b/index.org index 1fcabfa..063cf45 100644 --- a/index.org +++ b/index.org @@ -19,12 +19,12 @@ There are Specific configuration files for: - *Shell*: [[file:bash.org][Bash]] - *Terminal Emulator*: [[file:alacritty.org][Alacritty]] - *Terminal Multiplexer* [[file:tmux.org][Tmux]] -- *Image Setup*: [[file:image.org][Sxiv]] -- *Music Setup*: [[file:music.org][Ncmpcpp, Mopidy and Beets]] +- *Image Setup*: [[file:image.org][Nsxiv]] +- *Music Setup*: [[file:music.org][Ncmpcpp and Mopidy]] - *Video Setup*: [[file:video.org][Mpv]] - *Web Browser*: [[file:qutebrowser.org][Qutebrowser]] - *PDF Reader*: [[file:zathura.org][Zathura]] -- *Terminal File Manager*: [[file:ranger.org][Ranger]] +- *Terminal File Manager*: [[file:yazi.org][Yazi]] - *Calendar and Contacts*: [[file:calendar-contact.org][Vdirsyncer, Khal and Khard]] - *Mails*: [[file:mail.org][Mbsync, Msmtp, Mu and Neomutt]] - *Version Control*: [[file:git.org][Git]] diff --git a/maintenance.org b/maintenance.org index 85883be..66032ad 100644 --- a/maintenance.org +++ b/maintenance.org @@ -15,7 +15,7 @@ And then to perform the update: paru #+end_src -** NPM +** NPM (nodejs) First update =npm= itself #+begin_src bash sudo npm install npm@latest -g @@ -31,20 +31,9 @@ And finally perform the update: sudo npm update -g #+end_src -** PIP -First upgrade =pip= itself: +** PIP (python) #+begin_src bash -/usr/bin/python3 -m pip install --upgrade pip -#+end_src - -Then list outdated packages: -#+begin_src bash -pip3 list --outdated -#+end_src - -And update everything with: -#+begin_src bash -pip3 list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip3 install -U +/usr/bin/python3 -m pipx upgrade-all #+end_src ** Emacs and Vim diff --git a/matlab.org b/matlab.org index 0eee65d..bea67e4 100644 --- a/matlab.org +++ b/matlab.org @@ -158,6 +158,12 @@ Toolbox to work with fractional order models ([[https://github.com/extall/fomcon addpath(genpath([toolboxes_path 'fomcon-matlab'])) #+end_src +** Bliss +#+begin_src matlab +addpath('~//Cloud/work-projects/Speedgoat/Speedgoat_Bliss/matlab') +addpath('~//Cloud/work-projects/Speedgoat/Speedgoat_Bliss/library') +#+end_src + ** Clear #+begin_src matlab clear; diff --git a/ranger.org b/ranger.org index 7186c4e..c87320e 100644 --- a/ranger.org +++ b/ranger.org @@ -774,6 +774,8 @@ ext s[wmf]c, has snes9x-gtk,X = snes9x-gtk "$1" ext nes, has fceux, X = fceux "$1" ext exe = wine "$1" name ^[mM]akefile$ = make + +mime application/vnd.ms-tnef = winmail-add "$@" #+END_SRC #+BEGIN_SRC conf @@ -810,7 +812,6 @@ class fzf_select(Command): """ def execute(self): import subprocess - import os.path if self.quantifier: # match only directories command="find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \ @@ -819,13 +820,37 @@ class fzf_select(Command): # match files and directories command="find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \ -o -print 2> /dev/null | sed 1d | cut -b3- | fzf +m" - fzf = self.fm.execute_command(command, universal_newlines=True, stdout=subprocess.PIPE) + fzf = self.fm.execute_command(command, stdout=subprocess.PIPE) stdout, stderr = fzf.communicate() if fzf.returncode == 0: - fzf_file = os.path.abspath(stdout.rstrip('\n')) + fzf_file = os.path.abspath(stdout.decode('utf-8').rstrip('\n')) + if os.path.isdir(fzf_file): + self.fm.cd(fzf_file) + else: + self.fm.select_file(fzf_file) +# fzf_locate +class fzf_locate(Command): + """ + :fzf_locate + + Find a file using fzf. + + With a prefix argument select only directories. + + See: https://github.com/junegunn/fzf + """ + def execute(self): + import subprocess + if self.quantifier: + command="locate home media | fzf -e -i" + else: + command="locate home media | fzf -e -i" + fzf = self.fm.execute_command(command, stdout=subprocess.PIPE) + stdout, stderr = fzf.communicate() + if fzf.returncode == 0: + fzf_file = os.path.abspath(stdout.decode('utf-8').rstrip('\n')) if os.path.isdir(fzf_file): self.fm.cd(fzf_file) else: self.fm.select_file(fzf_file) #+end_src - diff --git a/router.org b/router.org index 0d16b90..a224e4f 100644 --- a/router.org +++ b/router.org @@ -245,24 +245,24 @@ Configuration files are in =/etc/config=. *** IOT -| Hostname | MAC-Address | IPv4-Address | Description | -|-------------------------------+-------------------+--------------+-------------| -| http://shutter-1.lan/ | C4:5B:BE:5F:C8:32 | 192.168.2.10 | Shutters | -| http://shutter-2.lan/ | C4:5B:BE:5F:3A:E2 | 192.168.2.11 | | -| http://shutter-3.lan/ | C4:5B:BE:5F:35:41 | 192.168.2.12 | | -| http://shutter-salon.lan/ | 48:3F:DA:49:24:01 | 192.168.2.13 | (ESP8266) | -|-------------------------------+-------------------+--------------+-------------| -| http://shelly1-1.lan/ | E8:68:E7:86:C1:2C | 192.168.2.20 | Light-bulbs | -| http://shelly1-2.lan/ | E8:68:E7:87:46:51 | 192.168.2.21 | | -| http://shelly1-3.lan/ | 8C:AA:B5:74:CD:16 | 192.168.2.22 | | -| http://shelly1-salon.lan/ | E8:68:E7:87:27:1D | 192.168.2.24 | | -| http://shelly25-cuisine.lan/ | 98:CD:AC:1E:11:8E | 192.168.2.25 | | -| http://shelly25-entrance.lan/ | C4:5B:BE:6B:87:39 | 192.168.2.26 | | -|-------------------------------+-------------------+--------------+-------------| -| http://xiaomi-ble.lan/ | 3C:61:05:12:A8:C4 | 192.168.2.28 | Temperature | -|-------------------------------+-------------------+--------------+-------------| -| http://shellytrv-1.lan/ | BC:33:AC:03:35:8C | 192.168.2.40 | TRV | -| http://shellytrv-2.lan/ | 60:A4:23:DC:C7:1E | 192.168.2.41 | | -| http://shellytrv-3.lan/ | 60:A4:23:DC:C8:14 | 192.168.2.42 | | -| http://shellytrv-s.lan/ | 60:A4:23:DB:2B:76 | 192.168.2.43 | | -| http://shellytrv-e.lan/ | 60:A4:23:DB:2C:8C | 192.168.2.44 | | +| Hostname | MAC-Address | IPv4-Address | Description | +|-------------------------------+-------------------+---------------------+-------------| +| http://shutter-1.lan/ | C4:5B:BE:5F:C8:32 | http://192.168.2.10 | Shutters | +| http://shutter-2.lan/ | C4:5B:BE:5F:3A:E2 | http://192.168.2.11 | | +| http://shutter-3.lan/ | C4:5B:BE:5F:35:41 | http://192.168.2.12 | | +| http://shutter-salon.lan/ | 48:3F:DA:49:24:01 | http://192.168.2.13 | (ESP8266) | +|-------------------------------+-------------------+---------------------+-------------| +| http://shelly1-1.lan/ | E8:68:E7:86:C1:2C | http://192.168.2.20 | Light-bulbs | +| http://shelly1-2.lan/ | E8:68:E7:87:46:51 | http://192.168.2.21 | | +| http://shelly1-3.lan/ | 8C:AA:B5:74:CD:16 | http://192.168.2.22 | | +| http://shelly1-salon.lan/ | E8:68:E7:87:27:1D | http://192.168.2.24 | | +| http://shelly25-cuisine.lan/ | 98:CD:AC:1E:11:8E | http://192.168.2.25 | | +| http://shelly25-entrance.lan/ | C4:5B:BE:6B:87:39 | http://192.168.2.26 | | +|-------------------------------+-------------------+---------------------+-------------| +| http://xiaomi-ble.lan/ | 3C:61:05:12:A8:C4 | http://192.168.2.28 | Temperature | +|-------------------------------+-------------------+---------------------+-------------| +| http://shellytrv-1.lan/ | BC:33:AC:03:35:8C | http://192.168.2.40 | TRV | +| http://shellytrv-2.lan/ | 60:A4:23:DC:C7:1E | http://192.168.2.41 | | +| http://shellytrv-3.lan/ | 60:A4:23:DC:C8:14 | http://192.168.2.42 | | +| http://shellytrv-s.lan/ | 60:A4:23:DB:2B:76 | http://192.168.2.43 | | +| http://shellytrv-e.lan/ | 60:A4:23:DB:2C:8C | http://192.168.2.44 | | diff --git a/systemd.org b/systemd.org index 6447e2f..b25f7b2 100644 --- a/systemd.org +++ b/systemd.org @@ -340,7 +340,7 @@ After=network.target [Service] Environment="all_proxy=socks5://localhost:8080" -ExecStart=/usr/bin/syncthing -no-browser -gui-address="0.0.0.0:8384" -no-restart -logflags=0 +ExecStart=/usr/bin/syncthing --no-browser --gui-address="0.0.0.0:8384" --no-restart --logflags=0 Restart=on-failure SuccessExitStatus=3 4 RestartForceExitStatus=3 4 @@ -409,10 +409,9 @@ restic backup \ --verbose --one-file-system --tag systemd.timer \ --exclude "/home/thomas/.cache" \ --exclude "/home/thomas/.local/data/docker" \ + --exclude "/home/thomas/.local/soft" \ --exclude "/home/thomas/Cloud" \ --exclude "/home/thomas/mnt" \ - --exclude "/home/thomas/perl5" \ - --exclude "/home/thomas/.local/soft" \ /home/thomas #+end_src diff --git a/tablet.org b/tablet.org index f54b81b..aa8ca8e 100644 --- a/tablet.org +++ b/tablet.org @@ -77,24 +77,24 @@ XAUTHORITY=/home/thomas/.Xauthority export DISPLAY XAUTHORITY # Pen Buttons -xsetwacom set "HUION Huion Tablet_H320M Pen stylus" button 1 1 # Left click -xsetwacom set "HUION Huion Tablet_H320M Pen stylus" button 2 2 # Right click -xsetwacom set "HUION Huion Tablet_H320M Pen stylus" button 3 3 # Middle click +xsetwacom set "HUION Huion Tablet_H320M stylus" button 1 1 # Left click +xsetwacom set "HUION Huion Tablet_H320M stylus" button 2 2 # Right click +xsetwacom set "HUION Huion Tablet_H320M stylus" button 3 3 # Middle click # Top Buttons -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 1 key Ctrl T # Tools -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 2 key Ctrl Shift A # Hand Tool -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 3 key Ctrl Shift D # Default Tool +xsetwacom set "HUION Huion Tablet_H320M pad" button 1 "key Ctrl T" # Tools +xsetwacom set "HUION Huion Tablet_H320M pad" button 2 "key Ctrl Shift A" # Hand Tool +xsetwacom set "HUION Huion Tablet_H320M pad" button 3 "key Ctrl Shift D" # Default Tool # Round Buttons (Top, Bottom, Middle, Left, Right) -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 8 key Ctrl Shift + # Zoom -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 9 key Ctrl - # Unzoom -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 10 key Ctrl S # Save -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 11 key Ctrl Z # Undo -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 12 key Ctrl Y # Redo +xsetwacom set "HUION Huion Tablet_H320M pad" button 8 "key Ctrl Shift +" # Zoom +xsetwacom set "HUION Huion Tablet_H320M pad" button 9 "key Ctrl -" # Unzoom +xsetwacom set "HUION Huion Tablet_H320M pad" button 10 "key Ctrl S" # Save +xsetwacom set "HUION Huion Tablet_H320M pad" button 11 "key Ctrl Z" # Undo +xsetwacom set "HUION Huion Tablet_H320M pad" button 12 "key Ctrl Y" # Redo # Bottom Buttons -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 13 key Ctrl Shift O # Select -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 14 key Ctrl Shift E # Errase -xsetwacom set "HUION Huion Tablet_H320M Pad pad" button 15 key Ctrl Q # Quit +xsetwacom set "HUION Huion Tablet_H320M pad" button 13 "key Ctrl Shift O" # Select +xsetwacom set "HUION Huion Tablet_H320M pad" button 14 "key Ctrl Shift E" # Errase +xsetwacom set "HUION Huion Tablet_H320M pad" button 15 "key Ctrl Q" # Quit #+end_src diff --git a/torrent.org b/torrent.org index 2cb8730..d7c132e 100644 --- a/torrent.org +++ b/torrent.org @@ -7,8 +7,11 @@ # Host that runs Transmission daemon set connect.host <> set connect.port 9091 +set connect.tls false set connect.user tdehaeze -set connect.password <> +set connect.host <> +set connect.path / +set connect.url /transmission/ # Update torrent/peer/file/etc lists every 10 seconds set tui.poll 10