Automatic key generation

Remove dependency on java

bash.org

@@ -86,7 +86,7 @@ bind '"\e[B": history-search-forward'
 
 ** Kitty for SSH
 #+begin_src bash
-[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
+[ "$TERM" = "xterm-kitty" ] && [ -n "$KITTY_WINDOW_ID" ] && alias ssh="kitty +kitten ssh"
 #+end_src
 
 ** Aliases
@@ -238,13 +238,15 @@ export TEXMFHOME=$HOME/.local/share/texmf
 
 *** Linkding
 #+begin_src bash
-export LINKDING_URL=`pass nas/linkding_url`
+if [ "$(hostnamectl hostname)" = "ldehaeze" ]; then
-export LINKDING_TOKEN=`pass nas/linkding_token`
+    export LINKDING_URL=`pass nas/linkding_url`
+    export LINKDING_TOKEN=`pass nas/linkding_token`
+fi
 #+end_src
 
 *** Restic
 #+begin_src bash
-if [ "$(hostname)" = "ldehaeze" ]; then
+if [ "$(hostnamectl hostname)" = "ldehaeze" ]; then
     export RESTIC_REPOSITORY=sftp:thomas@homelab:/srv/storage/Backups/esrf-laptop
     export RESTIC_PASSWORD_COMMAND="pass show restic"
 fi
@@ -258,7 +260,7 @@ export PATH
 
 ** Automatically run =startx=
 #+begin_src bash
-if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
+if [ -z "${DISPLAY}" ] && [ -n "${XDG_VTNR}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
     exec startx
 fi
 #+end_src

binaries.org

@@ -378,7 +378,7 @@ List of useful programs:
 - =inkscape=
 - =gs=
 - =pdfcrop=
-- =pdftk=
+- =qpdf=
 
 *** PDF to PNG
 #+begin_src bash
@@ -439,7 +439,7 @@ pdftrim_function() { \
 *** PDF Extract Pages
 #+begin_src bash
 pdfextract_function() { \
-    if command -v pdftk &> /dev/null; then
+    if command -v qpdf &> /dev/null; then
         pages=$(echo -e "get first\ndelete first\nextract i-j" | rofi -i -dmenu -p "Extract pages")
 
         if [ -z "$pages" ]; then
@@ -448,21 +448,21 @@ pdfextract_function() { \
 
         case "$pages" in
             "get first")
-                if command -v pdftk &> /dev/null; then
+                if command -v qpdf &> /dev/null; then
-                    pdftk "$filename_with_extension" cat 1-1 output "$filename_without_extension.first.pdf"
+                    qpdf --pages "$filename_with_extension" 1 -- "$filename_with_extension" "$filename_without_extension.first.pdf"
                 fi
                 ;;
             "delete first")
-                if command -v pdftk &> /dev/null; then
+                if command -v qpdf &> /dev/null; then
-                    pdftk "$filename_with_extension" cat 2-end output "$filename_with_extension"
+                    qpdf --pages "$filename_with_extension" 2-z -- "$filename_with_extension" "$filename_with_extension"
                 fi
                 ;;
             "extract i-j")
                 # TODO
                 page_i=$(rofi -dmenu -p "From")
                 page_j=$(rofi -dmenu -p "To")
-                if command -v pdftk &> /dev/null; then
+                if command -v qpdf &> /dev/null; then
-                    pdftk "$filename_with_extension" cat "$page_i-$page_j" output "$filename_with_extension.slice.pdf"
+                    qpdf --pages "$filename_with_extension" "$page_i-$page_j" -- "$filename_with_extension" "$filename_with_extension.slice.pdf"
                 fi
                 ;;
         esac
@@ -474,9 +474,9 @@ pdfextract_function() { \
 #+begin_src bash
 pdf_delete_first_page_function() { \
     if command -v stapler &> /dev/null; then
-        stapler del "$filename_with_extension" 1 /tmp/pdftk_out.pdf && mv /tmp/pdftk_out.pdf "$filename_with_extension"
+        stapler del "$filename_with_extension" 1 /tmp/qpdf_out.pdf && mv /tmp/qpdf_out.pdf "$filename_with_extension"
-    elif command -v pdftk &> /dev/null; then
+    elif command -v qpdf &> /dev/null; then
-        pdftk "$filename_with_extension" cat 2-end output /tmp/pdftk_out.pdf && mv /tmp/pdftk_out.pdf "$filename_with_extension"
+        qpdf --pages "$filename_with_extension" 2-z -- "$filename_with_extension" /tmp/qpdf_out.pdf && mv /tmp/qpdf_out.pdf "$filename_with_extension"
     fi
 }
 #+end_src
@@ -484,10 +484,10 @@ pdf_delete_first_page_function() { \
 *** Remove Annotations
 #+begin_src bash
 pdf_remove_annotations_function() { \
-    if command -v pdftk &> /dev/null; then
+    if command -v qpdf &> /dev/null; then
-        pdftk "$filename_with_extension" output /tmp/uncompressed.pdf uncompress
+        qpdf --qdf "$filename_with_extension" /tmp/uncompressed.pdf
         LANG=C sed -n '/^\/Annots/!p' /tmp/uncompressed.pdf > /tmp/stripped.pdf
-        pdftk /tmp/stripped.pdf output "$filename_with_extension" compress
+        qpdf /tmp/stripped.pdf "$filename_with_extension"
     fi
 }
 #+end_src

calendar-contact.org

@@ -1,6 +1,47 @@
 #+TITLE:Calendar and Contact Configuration
 #+SETUPFILE: ./setup/org-setup-file.org
 
+* Calendar Install Script
+:PROPERTIES:
+:header-args:bash: :tangle scripts/install-calendar.sh :shebang "#!/bin/bash" :mkdirp yes
+:END:
+
+Calendar/contact documentation: [[file:calendar-contact.org][calendar-contact.org]]
+
+#+begin_src bash
+set -euo pipefail
+
+DOTFILES="${HOME}/.config/literate-dotfiles"
+
+tangle() {
+    emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/$1\")"
+}
+#+end_src
+
+** Packages
+
+#+begin_src bash
+echo "==> Calendar and contacts packages"
+paru -S --needed \
+    vdirsyncer \
+    khal \
+    khard
+#+end_src
+
+** Tangle Systemd Configs
+
+#+begin_src bash
+echo "==> Tangling systemd configs for calendar"
+tangle "systemd.org"
+#+end_src
+
+** Systemd Timer
+
+#+begin_src bash
+echo "==> Enabling vdirsyncer timer"
+systemctl --user enable --now vdirsyncer.timer
+#+end_src
+
 * =vdirsyncer= - Synchronize calendars and contacts
 :PROPERTIES:
 :header-args:  :tangle ~/.config/vdirsyncer/config

config.org

@@ -13,31 +13,35 @@ Host backup
     hostname pierrick.tdehaeze.xyz
     Port 10022
     user thomas
-    IdentityFile ~/.ssh/id_rsa
+    IdentityFile ~/.ssh/id_ed25519
 
 Host pierrick
     hostname pierrick.tdehaeze.xyz
     Port 56432
     user pierrick
-    IdentityFile ~/.ssh/id_rsa
+    IdentityFile ~/.ssh/id_ed25519
 
 Host homelab
     hostname <<get-password(passname="ip/homelab")>>
     Port 22
     user thomas
-    IdentityFile ~/.ssh/id_rsa
+    IdentityFile ~/.ssh/id_ed25519
+
+Host zotac
+    hostname 192.168.5.75
+    Port 22
+    user thomas
+    IdentityFile ~/.ssh/id_ed25519
 
 Host router
     hostname 192.168.1.1
     Port 22
     user root
-    IdentityFile ~/.ssh/id_rsa
+    IdentityFile ~/.ssh/id_ed25519
-    PubkeyAcceptedAlgorithms +ssh-rsa
-    HostkeyAlgorithms +ssh-rsa
 
 Host *.esrf.fr
     User dehaeze
-    IdentityFile ~/.ssh/id_rsa
+    IdentityFile ~/.ssh/id_ed25519
 
 Host firewall.esrf.fr
     Port 5022
@@ -49,7 +53,7 @@ Match host *.esrf.fr !host firewall.esrf.fr !exec "~/.ssh/esrf-test"
 Host rnice
     Port 22
     user dehaeze
-    IdentityFile ~/.ssh/id_rsa
+    IdentityFile ~/.ssh/id_ed25519
 #+end_src
 
 #+begin_src bash :tangle ~/.ssh/esrf-test :comments none :mkdirp yes :shebang "#!/usr/bin/env bash" :tangle-mode (identity #o555)

doom.org

@@ -33,29 +33,22 @@ echo "==> Emacs packages"
 paru -S --needed emacs aspell aspell-en aspell-fr
 #+end_src
 
-** Doom Emacs
-
-#+begin_src bash
-echo "==> Installing Doom Emacs"
-git clone --depth 1 https://github.com/doomemacs/doomemacs ~/.config/emacs
-"${DOOM}" install --no-config
-#+end_src
-
 ** Tangle Configuration
 
 Tangle =doom.org= to generate =config.el=, =init.el= and =packages.el=:
 
 #+begin_src bash
 echo "==> Tangling doom.org"
-emacsclient -e "(org-babel-tangle-file \"${DOTFILES}/doom.org\")" \
+mkdir ${HOME}/.config/doom
-    || emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/doom.org\")"
+emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/doom.org\")"
 #+end_src
 
-** Sync
+** Doom Install
 
 #+begin_src bash
-echo "==> Running doom sync"
+echo "==> Installing Doom Emacs"
-"${DOOM}" sync
+git clone --depth 1 https://github.com/doomemacs/doomemacs ~/.config/emacs
+"${DOOM}" install
 #+end_src
 
 * Introduction and Resources
@@ -360,7 +353,7 @@ Function that opens current pdf page as an SVG file with Inkscape.
       (setq filename (read-string "Enter file name:" (car (split-string (file-name-base buffer-file-name) "_"))))
     (setq filename (read-string "Enter file name:")))
   (setq filepath (concat "/tmp/" filename ".svg"))
-  (shell-command (concat "pdftk " buffer-file-name " cat " (number-to-string (pdf-view-current-page)) " output /tmp/pdf_page.pdf"))
+  (shell-command (concat "qpdf --pages " buffer-file-name " " (number-to-string (pdf-view-current-page)) " -- " buffer-file-name " /tmp/pdf_page.pdf"))
   (shell-command (concat "pdf2svg /tmp/pdf_page.pdf " filepath))
   (start-process "" nil "inkscape" filepath))
 
@@ -3210,7 +3203,7 @@ Provides nice functions such as:
        ;;nim               ; python + lisp at the speed of c
        ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
-       (org +pretty +roam2 +hugo +noter)               ; organize your plain life in plain text
+       (org +pretty +roam +hugo +noter)               ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;graphviz          ; diagrams for confusing yourself even more

install.org

@@ -50,8 +50,7 @@ set -euo pipefail
 DOTFILES="${HOME}/.config/literate-dotfiles"
 
 tangle() {
-    emacsclient -e "(org-babel-tangle-file \"${DOTFILES}/$1\")" \
+    emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/$1\")"
-        || emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/$1\")"
 }
 #+end_src
 
@@ -69,10 +68,8 @@ paru -S --needed \
     kitty \
     bash bash-completion \
     zoxide \
-    nerd-fonts-hack noto-fonts-emoji \
     xorg-xrandr arandr \
     xautocfg \
-    arc-gtk-theme xcursor-breeze \
     feh xwallpaper
 #+end_src
 
@@ -108,6 +105,12 @@ i3-msg restart 2>/dev/null || echo "  (i3 not running, config will apply on next
 
 #+begin_src bash
 set -euo pipefail
+
+DOTFILES="${HOME}/.config/literate-dotfiles"
+
+tangle() {
+    emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/$1\")"
+}
 #+end_src
 
 ** Shell and Terminal
@@ -127,7 +130,9 @@ paru -S --needed \
 #+begin_src bash
 echo "==> Fonts"
 paru -S --needed \
-    nerd-fonts-hack \
+    ttf-hack-nerd \
+    ttf-sourcecodepro-nerd \
+    adobe-source-code-pro-fonts \
     noto-fonts-emoji
 #+end_src
 
@@ -228,7 +233,7 @@ paru -S --needed \
     atool unzip \
     trash-cli \
     man-db \
-    neofetch
+    fastfetch
 #+end_src
 
 ** Browser
@@ -256,6 +261,7 @@ paru -S --needed \
     mpv \
     jellyfin-tui \
     nsxiv \
+    tesseract tesseract-data-eng tesseract-data-fra tesseract-data-osd \
     zathura zathura-pdf-mupdf zathura-djvu zathura-ps zathura-cb \
     pdfpc \
     gst-plugins-ugly gst-plugins-good gst-plugins-base-libs gst-plugins-base gst-plugins-bad gst-libav
@@ -283,7 +289,7 @@ systemctl --user enable --now wireplumber.service
 #+begin_src bash
 echo "==> PDF and Image Utilities"
 paru -S --needed \
-    pdf2svg pdftk pdfarranger \
+    pdf2svg qpdf pdfarranger \
     imagemagick \
     maim flameshot \
     unclutter \
@@ -327,34 +333,89 @@ Enable Syncthing:
 systemctl --user enable --now syncthing
 #+end_src
 
-** GTK Theme
-
-#+begin_src bash
-echo "==> GTK Theme"
-paru -S --needed \
-    lxappearance \
-    arc-gtk-theme \
-    xcursor-breeze \
-    gtk2fontsel
-#+end_src
-
 ** Misc Utilities
 
 #+begin_src bash
 echo "==> Misc Utilities"
 paru -S --needed \
-    screenkey \
     xwallpaper \
     highlight-pointer-git \
     mpd
 #+end_src
 
+** SSH Keys for Tunnels
+
+#+begin_src bash
+setup_ssh_key() {
+    local key_name="$1"
+    local remote_host="$2"
+    local remote_port="${3:-22}"
+    local key_file="$HOME/.ssh/id_ed25519_${key_name}"
+
+    echo ""
+    echo "==> Setting up SSH key for ${key_name}"
+
+    # Generate key if it doesn't exist
+    if [ ! -f "${key_file}" ]; then
+        read -p "Generate new SSH key for ${key_name}? [y/N] " -n 1 -r
+        echo
+        if [[ $REPLY =~ ^[Yy]$ ]]; then
+            ssh-keygen -t ed25519 -C "${key_name}-tunnel" -f "${key_file}" -N ""
+        else
+            echo "Skipping ${key_name} key generation"
+            return 1
+        fi
+    fi
+
+    # Check if we can connect without password
+    if ssh -o BatchMode=yes -o ConnectTimeout=5 -p "${remote_port}" -i "${key_file}" "${remote_host}" exit 2>/dev/null; then
+        echo "SSH key for ${key_name} is already deployed ✓"
+        return 0
+    fi
+
+    # Prompt to deploy key
+    read -p "Deploy SSH key to ${remote_host}? [y/N] " -n 1 -r
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+        ssh-copy-id -i "${key_file}.pub" -p "${remote_port}" "${remote_host}"
+    else
+        echo "Skipping ${key_name} key deployment"
+        return 1
+    fi
+}
+
+# Setup homelab key
+setup_ssh_key "homelab" "homelab" 22
+HOMELAB_OK=$?
+
+# Setup ESRF key
+setup_ssh_key "esrf" "dehaeze@firewall.esrf.fr" 8022
+ESRF_OK=$?
+#+end_src
+
 ** Systemd Services
 
-Enable custom systemd services (tangle [[file:systemd.org][systemd.org]] first):
+#+begin_src bash
-#+begin_src bash :tangle no
+echo "==> Tangling systemd configs"
-systemctl --user enable --now homelab-tunnel
+tangle "systemd.org"
-systemctl --user enable --now esrf-tunnel
+#+end_src
+
+Enable custom =systemd= services:
+#+begin_src bash
+echo "==> Enabling systemd services"
+
+if [ $HOMELAB_OK -eq 0 ]; then
+    systemctl --user enable --now homelab-tunnel
+else
+    echo "  Skipping homelab-tunnel (SSH key not configured)"
+fi
+
+if [ $ESRF_OK -eq 0 ]; then
+    systemctl --user enable --now esrf-tunnel
+else
+    echo "  Skipping esrf-tunnel (SSH key not configured)"
+fi
+
 systemctl --user enable --now syncthing
 #+end_src
 
@@ -411,35 +472,6 @@ systemctl --user enable --now checkmail.timer
 systemctl --user enable --now syncmail.timer
 #+end_src
 
-* Calendar Install Script
-:PROPERTIES:
-:header-args:bash: :tangle scripts/install-calendar.sh :shebang "#!/bin/bash" :mkdirp yes
-:END:
-
-Calendar/contact documentation: [[file:calendar-contact.org][calendar-contact.org]]
-
-#+begin_src bash
-set -euo pipefail
-#+end_src
-
-** Packages
-
-#+begin_src bash
-echo "==> Calendar and contacts packages"
-paru -S --needed \
-    vdirsyncer \
-    khal \
-    khard \
-    mu
-#+end_src
-
-** Systemd Timer
-
-#+begin_src bash :tangle no
-echo "==> Enabling vdirsyncer timer"
-systemctl --user enable --now vdirsyncer.timer
-#+end_src
-
 * LaTeX Install Script
 :PROPERTIES:
 :header-args:bash: :tangle scripts/install-latex.sh :shebang "#!/bin/bash" :mkdirp yes

scripts/install-calendar.sh

@@ -1,9 +1,20 @@
 #!/bin/bash
 set -euo pipefail
 
+DOTFILES="${HOME}/.config/literate-dotfiles"
+
+tangle() {
+    emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/$1\")"
+}
+
 echo "==> Calendar and contacts packages"
 paru -S --needed \
     vdirsyncer \
     khal \
-    khard \
+    khard
-    mu
+
+echo "==> Tangling systemd configs for calendar"
+tangle "systemd.org"
+
+echo "==> Enabling vdirsyncer timer"
+systemctl --user enable --now vdirsyncer.timer

scripts/install-desktop.sh

@@ -4,8 +4,7 @@ set -euo pipefail
 DOTFILES="${HOME}/.config/literate-dotfiles"
 
 tangle() {
-    emacsclient -e "(org-babel-tangle-file \"${DOTFILES}/$1\")" \
+    emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/$1\")"
-        || emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/$1\")"
 }
 
 echo "==> Desktop packages"
@@ -19,10 +18,8 @@ paru -S --needed \
     kitty \
     bash bash-completion \
     zoxide \
-    nerd-fonts-hack noto-fonts-emoji \
     xorg-xrandr arandr \
     xautocfg \
-    arc-gtk-theme xcursor-breeze \
     feh xwallpaper
 
 echo "==> Tangling desktop configs"

scripts/install-main.sh

@@ -9,12 +9,14 @@ paru -S --needed \
 
 echo "==> Fonts"
 paru -S --needed \
-    nerd-fonts-hack \
+    ttf-hack-nerd \
+    ttf-sourcecodepro-nerd \
+    adobe-source-code-pro-fonts \
     noto-fonts-emoji
 
 echo "==> Text Editors"
 paru -S --needed \
-    neovim python-pynvim \
+    neovim python-pynvim nodejs-neovim \
     emacs \
     aspell aspell-en aspell-fr
 
@@ -44,7 +46,7 @@ paru -S --needed \
     atool unzip \
     trash-cli \
     man-db \
-    neofetch
+    fastfetch
 
 echo "==> Browser"
 paru -S --needed \
@@ -56,6 +58,7 @@ paru -S --needed \
     mpv \
     jellyfin-tui \
     nsxiv \
+    tesseract tesseract-data-eng tesseract-data-fra tesseract-data-osd \
     zathura zathura-pdf-mupdf zathura-djvu zathura-ps zathura-cb \
     pdfpc \
     gst-plugins-ugly gst-plugins-good gst-plugins-base-libs gst-plugins-base gst-plugins-bad gst-libav
@@ -68,7 +71,7 @@ paru -S --needed \
 
 echo "==> PDF and Image Utilities"
 paru -S --needed \
-    pdf2svg pdftk pdfarranger \
+    pdf2svg qpdf pdfarranger \
     imagemagick \
     maim flameshot \
     unclutter \
@@ -98,16 +101,8 @@ paru -S --needed \
     yt-dlp \
     python ipython python-pip
 
-echo "==> GTK Theme"
-paru -S --needed \
-    lxappearance \
-    arc-gtk-theme \
-    xcursor-breeze \
-    gtk2fontsel
-
 echo "==> Misc Utilities"
 paru -S --needed \
-    screenkey \
     xwallpaper \
     highlight-pointer-git \
     mpd

vim.org

@@ -36,8 +36,7 @@ Tangle =vim.org= to generate =~/.config/nvim/init.vim=:
 
 #+begin_src bash
 echo "==> Tangling vim.org"
-emacsclient -e "(org-babel-tangle-file \"${DOTFILES}/vim.org\")" \
+emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/vim.org\")"
-    || emacs --batch -l org --eval "(org-babel-tangle-file \"${DOTFILES}/vim.org\")"
 #+end_src
 
 ** Install Plugins

zathura.org

@@ -99,7 +99,7 @@ tmpfile=/tmp/pdf_page.pdf
 # Ideally would get the page from Zathura...
 # pagenum=$(rofi -dmenu -p "Page Number")
 
-pdftk "$1" cat $2 output "$tmpfile.pdf" && \
+qpdf --pages "$1" "$2" -- "$1" "$tmpfile.pdf" && \
     pdf2svg "$tmpfile.pdf" "$tmpfile.svg" && \
     inkscape "$tmpfile.svg"
 #+end_src