Move cron scripts into cron/, remove ad-hoc subfolder

56 files changed, 29 insertions, 408 deletions

diff --git a/.gitignore b/.gitignore
index 258e7a4d..92c38ca4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
-mail/offlineimap.pyc
-tam_required
 /result
-
-/scripts/ad-hoc/node_modules/
-/scripts/package-lock.json
\ No newline at end of file
+/cron/generated/
diff --git a/bash/env.sh b/bash/env.sh
index 2babd957..8a7b45b6 100644
--- a/bash/env.sh
+++ b/bash/env.sh
@@ -13,10 +13,4 @@ export NIX_BUILD_CORES=0
 export GUIX_PROFILE="$HOME/.guix-profile"
 export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale"
 
-PATH="$PATH:$HOME/.local/bin"
-PATH="$PATH:$HOME/tmp/bin"
-PATH="$PATH:$HOME/dev/libre/others/dinheiros"
-
-for p in "${DOTFILES}/scripts" "$HOME/annex/bin"; do
-  PATH="$p/ad-hoc:$p/cron:$PATH"
-done
+PATH="$HOME/.local/bin:$HOME/tmp/bin:$HOME/dev/libre/others/dinheiros:$DOTFILES/scripts:$HOME/annex/bin/scripts:$HOME/annex/bin/cron:$PATH"
diff --git a/bash/fake-symlinks.sh b/bash/fake-symlinks.sh
index 160e3177..4dc78668 100644
--- a/bash/fake-symlinks.sh
+++ b/bash/fake-symlinks.sh
@@ -6,18 +6,20 @@ cp "${DOTFILES}/org.keepassxc.keepassxc_browser.json" ~/.mozilla/native-messagin
 pushd "${DOTFILES}/bash/templates/" > /dev/null || exit 1
 export DOLLAR='$'
 
-for job in report-summary annex elfeed backup copy-box-backups repo-update notmuch-dump mbox-archive mr-remotes-backup; do
-  sed "s/__JOB__/$job/" cronjob-with-email.sh > "$HOME/dev/libre/dotfiles/scripts/cron/${job}-job.sh"
-  chmod +x "$HOME/dev/libre/dotfiles/scripts/ad-hoc/${job}.sh"
-  chmod +x "$HOME/dev/libre/dotfiles/scripts/cron/${job}-job.sh"
+mkdir -p "$DOTFILES/cron/generated/"
+for job in report-summary annex elfeed backup copy-box-backups repo-update mbox-archive mr-remotes-backup; do
+  sed "s/__JOB__/$job/" cronjob-with-email.sh > "$HOME/dev/libre/dotfiles/cron/generated/${job}-job.sh"
+  chmod +x "$HOME/dev/libre/dotfiles/cron/${job}.sh"
+  chmod +x "$HOME/dev/libre/dotfiles/cron/generated/${job}-job.sh"
 done
 
+mkdir -p "$HOME/annex/bin/cron/generated/"
 # shellcheck disable=2043
 for job in pacheco; do
-  prefix="$HOME/annex/bin/ad-hoc"
-  sed "s/__JOB__-job/$job-job/" cronjob-with-email.sh | sed "s|.*__JOB__.*|$prefix/$job.sh|" > "$HOME/annex/bin/cron/${job}-job.sh"
-  chmod +x "$HOME/annex/bin/ad-hoc/${job}.sh"
-  chmod +x "$HOME/annex/bin/cron/${job}-job.sh"
+  prefix="$HOME/annex/bin/cron"
+  sed "s/__JOB__-job/$job-job/" cronjob-with-email.sh | sed "s|.*__JOB__.*|$prefix/$job.sh|" > "$HOME/annex/bin/cron/generated/${job}-job.sh"
+  chmod +x "$HOME/annex/bin/cron/${job}.sh"
+  chmod +x "$HOME/annex/bin/cron/generated/${job}-job.sh"
 done
 
 mkdir -p ~/archive/torrent/
diff --git a/bash/templates/cronjob-with-email.sh b/bash/templates/cronjob-with-email.sh
index 44ee8754..9f6e0ac3 100644
--- a/bash/templates/cronjob-with-email.sh
+++ b/bash/templates/cronjob-with-email.sh
@@ -26,6 +26,6 @@ LOG_FILE="$(mktemp)"
   trap finish EXIT
 
   echo "Starting: $(date -Is)"
-  ~/dev/libre/dotfiles/scripts/ad-hoc/__JOB__.sh
+  ~/dev/libre/dotfiles/cron/__JOB__.sh
   echo "Finishing: $(date -Is)"
 } | tee "$LOG_FILE" 2>&1
diff --git a/build-aux/assert-todos.sh b/build-aux/assert-todos.sh
index f02a1b8c..2af84fe0 100755
--- a/build-aux/assert-todos.sh
+++ b/build-aux/assert-todos.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -eu
 
-EXCLUDE='(bash/templates/|build-aux/assert-todos.sh|scripts/ad-hoc/pastebin.sh|bash/util.sh|docbook-xsl.tar.gz)'
+EXCLUDE='(bash/templates/|build-aux/assert-todos.sh|scripts/pastebin.sh|bash/util.sh|docbook-xsl.tar.gz)'
 if git grep FIXME | grep -Ev "$EXCLUDE"; then
   echo "Found dangling FIXME markers on the project."
   echo "You should write them down properly on TODOs.org."
diff --git a/scripts/ad-hoc/annex.sh b/cron/annex.sh
index 555653a1..555653a1 100755
--- a/scripts/ad-hoc/annex.sh
+++ b/cron/annex.sh
diff --git a/scripts/ad-hoc/archive-box.sh b/cron/archive-box.sh
index 64f23e54..f6d81502 100755
--- a/scripts/ad-hoc/archive-box.sh
+++ b/cron/archive-box.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -eux
 
+# FIXME
+
 # Derived from ArchiveBox:
 # https://github.com/pirate/ArchiveBox/blob/db1f6efc934bbcdf53377bf51a064c6fd0fc5b1d/bin/archivebox-export-browser-history#L23-L37
 QUERY=$(cat <<EOF
diff --git a/scripts/ad-hoc/backup.sh b/cron/backup.sh
index 59b3cd0d..59b3cd0d 100755
--- a/scripts/ad-hoc/backup.sh
+++ b/cron/backup.sh
diff --git a/scripts/ad-hoc/copy-box-backups.sh b/cron/copy-box-backups.sh
index 92eda65a..92eda65a 100755
--- a/scripts/ad-hoc/copy-box-backups.sh
+++ b/cron/copy-box-backups.sh
diff --git a/scripts/ad-hoc/elfeed.sh b/cron/elfeed.sh
index fd6c2c7b..fd6c2c7b 100755
--- a/scripts/ad-hoc/elfeed.sh
+++ b/cron/elfeed.sh
diff --git a/scripts/ad-hoc/mbox-archive.sh b/cron/mbox-archive.sh
index 58360ccf..a12281ec 100755
--- a/scripts/ad-hoc/mbox-archive.sh
+++ b/cron/mbox-archive.sh
@@ -1,4 +1,6 @@
 #!/bin/sh -eux
 
+# FIXME
+
 echo 'TODO: Download MBOX archive of mailing lists, see:'
 echo 'https://todo.sr.ht/~sircmpwn/lists.sr.ht/162'
diff --git a/scripts/ad-hoc/mr-remotes-backup.sh b/cron/mr-remotes-backup.sh
index 0e378642..0e378642 100755
--- a/scripts/ad-hoc/mr-remotes-backup.sh
+++ b/cron/mr-remotes-backup.sh
diff --git a/scripts/ad-hoc/repo-update.sh b/cron/repo-update.sh
index 65eb6db5..65eb6db5 100755
--- a/scripts/ad-hoc/repo-update.sh
+++ b/cron/repo-update.sh
diff --git a/scripts/ad-hoc/report-summary.sh b/cron/report-summary.sh
index c21b1476..c21b1476 100755
--- a/scripts/ad-hoc/report-summary.sh
+++ b/cron/report-summary.sh
diff --git a/scripts/ad-hoc/elfeed.js b/scripts/ad-hoc/elfeed.js
deleted file mode 100644
index 54ed7abb..00000000
--- a/scripts/ad-hoc/elfeed.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const fs = require("fs");
-const rss = require("rss");
-
-const items = JSON.parse(fs.readFileSync(0, "utf-8"));
-
-const feed = new rss({
-  title: "EuAndreh RIL title",
-  description: "EuAndreh RIL description",
-});
-
-items.forEach(({ title, url }) =>
-  feed.item({
-    title,
-    url
-  }));
-
-const xml = feed.xml({indent: true});
-
-console.log(xml);
diff --git a/scripts/ad-hoc/package-lock.json b/scripts/ad-hoc/package-lock.json
deleted file mode 100644
index 29925e3d..00000000
--- a/scripts/ad-hoc/package-lock.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "mime-db": {
-      "version": "1.25.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz",
-      "integrity": "sha1-wY29fHOl2/b0SgJNwNFloeexw5I="
-    },
-    "mime-types": {
-      "version": "2.1.13",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz",
-      "integrity": "sha1-4HqqnGxrmnyjASxpADrSWjnpKog=",
-      "requires": {
-        "mime-db": "~1.25.0"
-      }
-    },
-    "rss": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/rss/-/rss-1.2.2.tgz",
-      "integrity": "sha1-UKFpiHYTgTOnT5oF0r3I240nqSE=",
-      "requires": {
-        "mime-types": "2.1.13",
-        "xml": "1.0.1"
-      }
-    },
-    "xml": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU="
-    }
-  }
-}
diff --git a/scripts/ad-hoc/brightness.sh b/scripts/brightness.sh
index 29dc05ba..29dc05ba 100755
--- a/scripts/ad-hoc/brightness.sh
+++ b/scripts/brightness.sh
diff --git a/scripts/ad-hoc/c b/scripts/c
index 9b220622..9b220622 100755
--- a/scripts/ad-hoc/c
+++ b/scripts/c
diff --git a/scripts/ad-hoc/copy-public-key.sh b/scripts/copy-public-key.sh
index b864b4b1..b864b4b1 100755
--- a/scripts/ad-hoc/copy-public-key.sh
+++ b/scripts/copy-public-key.sh
diff --git a/scripts/cron/annex-job.sh b/scripts/cron/annex-job.sh
deleted file mode 100755
index 3d03297e..00000000
--- a/scripts/cron/annex-job.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -eux
-LOG_FILE="$(mktemp)"
-{
-  finish() {
-    status=$?
-    if [ $status = 0 ]; then
-      STATUS="✅ SUCCESS (status $status)"
-    else
-      STATUS="❌ FAILURE (status $status)"
-    fi
-
-    echo "Registering status locally..."
-    set -x
-    printf '%s annex\n' "$status" >> "/tmp/cron-dbg.summary.$(date -I).euandreh.log"
-
-    echo "Sending report email..."
-
-    SUBJECT="Job report on $(hostname): ${STATUS} for annex-job.sh"
-    gpg -easr eu@euandre.org < "$LOG_FILE" | \
-      mail eu@euandre.org           \
-          -s "$SUBJECT"            \
-          -a 'From:eu@euandre.org' \
-          --content-type 'text/plain; charset=utf-8'
-    echo 'Mail sent!'
-  }
-  trap finish EXIT
-
-  echo "Starting: $(date -Is)"
-  ~/dev/libre/dotfiles/scripts/ad-hoc/annex.sh
-  echo "Finishing: $(date -Is)"
-} | tee "$LOG_FILE" 2>&1
diff --git a/scripts/cron/backup-job.sh b/scripts/cron/backup-job.sh
deleted file mode 100755
index ef9be7a7..00000000
--- a/scripts/cron/backup-job.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -eux
-LOG_FILE="$(mktemp)"
-{
-  finish() {
-    status=$?
-    if [ $status = 0 ]; then
-      STATUS="✅ SUCCESS (status $status)"
-    else
-      STATUS="❌ FAILURE (status $status)"
-    fi
-
-    echo "Registering status locally..."
-    set -x
-    printf '%s backup\n' "$status" >> "/tmp/cron-dbg.summary.$(date -I).euandreh.log"
-
-    echo "Sending report email..."
-
-    SUBJECT="Job report on $(hostname): ${STATUS} for backup-job.sh"
-    gpg -easr eu@euandre.org < "$LOG_FILE" | \
-      mail eu@euandre.org           \
-          -s "$SUBJECT"            \
-          -a 'From:eu@euandre.org' \
-          --content-type 'text/plain; charset=utf-8'
-    echo 'Mail sent!'
-  }
-  trap finish EXIT
-
-  echo "Starting: $(date -Is)"
-  ~/dev/libre/dotfiles/scripts/ad-hoc/backup.sh
-  echo "Finishing: $(date -Is)"
-} | tee "$LOG_FILE" 2>&1
diff --git a/scripts/cron/copy-box-backups-job.sh b/scripts/cron/copy-box-backups-job.sh
deleted file mode 100755
index da7e11db..00000000
--- a/scripts/cron/copy-box-backups-job.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -eux
-LOG_FILE="$(mktemp)"
-{
-  finish() {
-    status=$?
-    if [ $status = 0 ]; then
-      STATUS="✅ SUCCESS (status $status)"
-    else
-      STATUS="❌ FAILURE (status $status)"
-    fi
-
-    echo "Registering status locally..."
-    set -x
-    printf '%s copy-box-backups\n' "$status" >> "/tmp/cron-dbg.summary.$(date -I).euandreh.log"
-
-    echo "Sending report email..."
-
-    SUBJECT="Job report on $(hostname): ${STATUS} for copy-box-backups-job.sh"
-    gpg -easr eu@euandre.org < "$LOG_FILE" | \
-      mail eu@euandre.org           \
-          -s "$SUBJECT"            \
-          -a 'From:eu@euandre.org' \
-          --content-type 'text/plain; charset=utf-8'
-    echo 'Mail sent!'
-  }
-  trap finish EXIT
-
-  echo "Starting: $(date -Is)"
-  ~/dev/libre/dotfiles/scripts/ad-hoc/copy-box-backups.sh
-  echo "Finishing: $(date -Is)"
-} | tee "$LOG_FILE" 2>&1
diff --git a/scripts/cron/deliver-my-enqueued-emails.sh b/scripts/cron/deliver-my-enqueued-emails.sh
deleted file mode 100755
index 9dadf43f..00000000
--- a/scripts/cron/deliver-my-enqueued-emails.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -eux
-
-echo "Starting $(date -Is)"
-find ~/mbsync/my-queued-emails/ -type f -exec sh -c '$HOME/annex/bin/misc/mail/dispatch-email.sh "$1" && trash "$1"' _ {} \;
-echo "Done $(date -Is)"
diff --git a/scripts/cron/deliver-queued-mail.sh b/scripts/cron/deliver-queued-mail.sh
deleted file mode 100755
index 0dde65a6..00000000
--- a/scripts/cron/deliver-queued-mail.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -Eeuo pipefail
-
-exec &> /dev/stdout
-echo "Starting $(date -Is)"
-
-if [[ "$(find ~/mbsync/queued-email/ -type f -not -name 'index' | wc -l)" = 0 ]]; then
-  echo 'No queued emails found. noop'
-else
-  # https://github.com/syl20bnr/spacemacs/issues/4504#issuecomment-232973179
-  emacs -batch                                   \
-        -l ~/.emacs.d/init.el                    \
-        -l ~/annex/bin/misc/mail/notmuch.el      \
-        --eval "(run-hooks 'emacs-startup-hook)" \
-        --eval '(smtpmail-send-queued-mail)'
-fi
-
-echo "Finishing: $(date -Is)"
diff --git a/scripts/cron/elfeed-job.sh b/scripts/cron/elfeed-job.sh
deleted file mode 100755
index c0c3ac1a..00000000
--- a/scripts/cron/elfeed-job.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -eux
-LOG_FILE="$(mktemp)"
-{
-  finish() {
-    status=$?
-    if [ $status = 0 ]; then
-      STATUS="✅ SUCCESS (status $status)"
-    else
-      STATUS="❌ FAILURE (status $status)"
-    fi
-
-    echo "Registering status locally..."
-    set -x
-    printf '%s elfeed\n' "$status" >> "/tmp/cron-dbg.summary.$(date -I).euandreh.log"
-
-    echo "Sending report email..."
-
-    SUBJECT="Job report on $(hostname): ${STATUS} for elfeed-job.sh"
-    gpg -easr eu@euandre.org < "$LOG_FILE" | \
-      mail eu@euandre.org           \
-          -s "$SUBJECT"            \
-          -a 'From:eu@euandre.org' \
-          --content-type 'text/plain; charset=utf-8'
-    echo 'Mail sent!'
-  }
-  trap finish EXIT
-
-  echo "Starting: $(date -Is)"
-  ~/dev/libre/dotfiles/scripts/ad-hoc/elfeed.sh
-  echo "Finishing: $(date -Is)"
-} | tee "$LOG_FILE" 2>&1
diff --git a/scripts/cron/mbox-archive-job.sh b/scripts/cron/mbox-archive-job.sh
deleted file mode 100755
index 6474a1d0..00000000
--- a/scripts/cron/mbox-archive-job.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -eux
-LOG_FILE="$(mktemp)"
-{
-  finish() {
-    status=$?
-    if [ $status = 0 ]; then
-      STATUS="✅ SUCCESS (status $status)"
-    else
-      STATUS="❌ FAILURE (status $status)"
-    fi
-
-    echo "Registering status locally..."
-    set -x
-    printf '%s mbox-archive\n' "$status" >> "/tmp/cron-dbg.summary.$(date -I).euandreh.log"
-
-    echo "Sending report email..."
-
-    SUBJECT="Job report on $(hostname): ${STATUS} for mbox-archive-job.sh"
-    gpg -easr eu@euandre.org < "$LOG_FILE" | \
-      mail eu@euandre.org           \
-          -s "$SUBJECT"            \
-          -a 'From:eu@euandre.org' \
-          --content-type 'text/plain; charset=utf-8'
-    echo 'Mail sent!'
-  }
-  trap finish EXIT
-
-  echo "Starting: $(date -Is)"
-  ~/dev/libre/dotfiles/scripts/ad-hoc/mbox-archive.sh
-  echo "Finishing: $(date -Is)"
-} | tee "$LOG_FILE" 2>&1
diff --git a/scripts/cron/mr-remotes-backup-job.sh b/scripts/cron/mr-remotes-backup-job.sh
deleted file mode 100755
index d2cca9b4..00000000
--- a/scripts/cron/mr-remotes-backup-job.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -eux
-LOG_FILE="$(mktemp)"
-{
-  finish() {
-    status=$?
-    if [ $status = 0 ]; then
-      STATUS="✅ SUCCESS (status $status)"
-    else
-      STATUS="❌ FAILURE (status $status)"
-    fi
-
-    echo "Registering status locally..."
-    set -x
-    printf '%s mr-remotes-backup\n' "$status" >> "/tmp/cron-dbg.summary.$(date -I).euandreh.log"
-
-    echo "Sending report email..."
-
-    SUBJECT="Job report on $(hostname): ${STATUS} for mr-remotes-backup-job.sh"
-    gpg -easr eu@euandre.org < "$LOG_FILE" | \
-      mail eu@euandre.org           \
-          -s "$SUBJECT"            \
-          -a 'From:eu@euandre.org' \
-          --content-type 'text/plain; charset=utf-8'
-    echo 'Mail sent!'
-  }
-  trap finish EXIT
-
-  echo "Starting: $(date -Is)"
-  ~/dev/libre/dotfiles/scripts/ad-hoc/mr-remotes-backup.sh
-  echo "Finishing: $(date -Is)"
-} | tee "$LOG_FILE" 2>&1
diff --git a/scripts/cron/notmuch-dump-job.sh b/scripts/cron/notmuch-dump-job.sh
deleted file mode 100755
index 1c32eb6c..00000000
--- a/scripts/cron/notmuch-dump-job.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -eux
-LOG_FILE="$(mktemp)"
-{
-  finish() {
-    status=$?
-    if [ $status = 0 ]; then
-      STATUS="✅ SUCCESS (status $status)"
-    else
-      STATUS="❌ FAILURE (status $status)"
-    fi
-
-    echo "Registering status locally..."
-    set -x
-    printf '%s notmuch-dump\n' "$status" >> "/tmp/cron-dbg.summary.$(date -I).euandreh.log"
-
-    echo "Sending report email..."
-
-    SUBJECT="Job report on $(hostname): ${STATUS} for notmuch-dump-job.sh"
-    gpg -easr eu@euandre.org < "$LOG_FILE" | \
-      mail eu@euandre.org           \
-          -s "$SUBJECT"            \
-          -a 'From:eu@euandre.org' \
-          --content-type 'text/plain; charset=utf-8'
-    echo 'Mail sent!'
-  }
-  trap finish EXIT
-
-  echo "Starting: $(date -Is)"
-  ~/dev/libre/dotfiles/scripts/ad-hoc/notmuch-dump.sh
-  echo "Finishing: $(date -Is)"
-} | tee "$LOG_FILE" 2>&1
diff --git a/scripts/cron/repo-update-job.sh b/scripts/cron/repo-update-job.sh
deleted file mode 100755
index 8c7eaa06..00000000
--- a/scripts/cron/repo-update-job.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -eux
-LOG_FILE="$(mktemp)"
-{
-  finish() {
-    status=$?
-    if [ $status = 0 ]; then
-      STATUS="✅ SUCCESS (status $status)"
-    else
-      STATUS="❌ FAILURE (status $status)"
-    fi
-
-    echo "Registering status locally..."
-    set -x
-    printf '%s repo-update\n' "$status" >> "/tmp/cron-dbg.summary.$(date -I).euandreh.log"
-
-    echo "Sending report email..."
-
-    SUBJECT="Job report on $(hostname): ${STATUS} for repo-update-job.sh"
-    gpg -easr eu@euandre.org < "$LOG_FILE" | \
-      mail eu@euandre.org           \
-          -s "$SUBJECT"            \
-          -a 'From:eu@euandre.org' \
-          --content-type 'text/plain; charset=utf-8'
-    echo 'Mail sent!'
-  }
-  trap finish EXIT
-
-  echo "Starting: $(date -Is)"
-  ~/dev/libre/dotfiles/scripts/ad-hoc/repo-update.sh
-  echo "Finishing: $(date -Is)"
-} | tee "$LOG_FILE" 2>&1
diff --git a/scripts/cron/report-summary-job.sh b/scripts/cron/report-summary-job.sh
deleted file mode 100755
index 9ee4fbf3..00000000
--- a/scripts/cron/report-summary-job.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -eux
-LOG_FILE="$(mktemp)"
-{
-  finish() {
-    status=$?
-    if [ $status = 0 ]; then
-      STATUS="✅ SUCCESS (status $status)"
-    else
-      STATUS="❌ FAILURE (status $status)"
-    fi
-
-    echo "Registering status locally..."
-    set -x
-    printf '%s report-summary\n' "$status" >> "/tmp/cron-dbg.summary.$(date -I).euandreh.log"
-
-    echo "Sending report email..."
-
-    SUBJECT="Job report on $(hostname): ${STATUS} for report-summary-job.sh"
-    gpg -easr eu@euandre.org < "$LOG_FILE" | \
-      mail eu@euandre.org           \
-          -s "$SUBJECT"            \
-          -a 'From:eu@euandre.org' \
-          --content-type 'text/plain; charset=utf-8'
-    echo 'Mail sent!'
-  }
-  trap finish EXIT
-
-  echo "Starting: $(date -Is)"
-  ~/dev/libre/dotfiles/scripts/ad-hoc/report-summary.sh
-  echo "Finishing: $(date -Is)"
-} | tee "$LOG_FILE" 2>&1
diff --git a/scripts/cron/sync-mail.sh b/scripts/cron/sync-mail.sh
deleted file mode 100755
index 2726cf9e..00000000
--- a/scripts/cron/sync-mail.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -eu
-
-echo "Starting: $(date -Is)"
-
-FAST_RUN="${1:-}"
-
-if [ "${FAST_RUN}" = "--fast" ]; then
-  echo 'Doing fast run'
-  mbsync EuAndreh
-  notmuch new
-else
-  echo 'Doing normal (slow) run'
-  notmuch new
-  mbsync EuAndreh &
-  mbsync Nubank   &
-  mbsync Gmail    &
-  wait
-  notmuch new
-fi
-
-echo "Finishing: $(date -Is)"
diff --git a/scripts/ad-hoc/dmenu-emoji.sh b/scripts/dmenu-emoji.sh
index 11f8ab48..2177ac88 100755
--- a/scripts/ad-hoc/dmenu-emoji.sh
+++ b/scripts/dmenu-emoji.sh
@@ -3,7 +3,7 @@
 # Derived from:
 # https://github.com/porras/dmenu-emoji
 
-LIST="$HOME/dev/libre/dotfiles/scripts/ad-hoc/emoji-list.txt"
+LIST="$HOME/dev/libre/dotfiles/scripts/emoji-list.txt"
 
 dmenu                           \
   -l 20                         \
diff --git a/scripts/ad-hoc/dmenu-vlc.sh b/scripts/dmenu-vlc.sh
index c42e26fb..c42e26fb 100755
--- a/scripts/ad-hoc/dmenu-vlc.sh
+++ b/scripts/dmenu-vlc.sh
diff --git a/scripts/ad-hoc/emoji-list.txt b/scripts/emoji-list.txt
index 06b5a582..06b5a582 100755
--- a/scripts/ad-hoc/emoji-list.txt
+++ b/scripts/emoji-list.txt
diff --git a/scripts/ad-hoc/export-keys.sh b/scripts/export-keys.sh
index 5807dbce..5807dbce 100755
--- a/scripts/ad-hoc/export-keys.sh
+++ b/scripts/export-keys.sh
diff --git a/scripts/ad-hoc/fim b/scripts/fim
index ff8e00d1..ff8e00d1 100755
--- a/scripts/ad-hoc/fim
+++ b/scripts/fim
diff --git a/scripts/ad-hoc/gc-mail.sh b/scripts/gc-mail.sh
index 5952cf78..5952cf78 100755
--- a/scripts/ad-hoc/gc-mail.sh
+++ b/scripts/gc-mail.sh
diff --git a/scripts/ad-hoc/gc-nix.sh b/scripts/gc-nix.sh
index 056c1ebe..056c1ebe 100755
--- a/scripts/ad-hoc/gc-nix.sh
+++ b/scripts/gc-nix.sh
diff --git a/scripts/ad-hoc/gc.sh b/scripts/gc.sh
index bdc00431..bdc00431 100755
--- a/scripts/ad-hoc/gc.sh
+++ b/scripts/gc.sh
diff --git a/scripts/ad-hoc/hd.sh b/scripts/hd.sh
index e977aa3c..e977aa3c 100755
--- a/scripts/ad-hoc/hd.sh
+++ b/scripts/hd.sh
diff --git a/scripts/ad-hoc/mailing-list-import-mbox.sh b/scripts/mailing-list-import-mbox.sh
index d69c42f0..d69c42f0 100755
--- a/scripts/ad-hoc/mailing-list-import-mbox.sh
+++ b/scripts/mailing-list-import-mbox.sh
diff --git a/scripts/ad-hoc/open b/scripts/open
index 9383059d..9383059d 100755
--- a/scripts/ad-hoc/open
+++ b/scripts/open
diff --git a/scripts/ad-hoc/pastebin.sh b/scripts/pastebin.sh
index d4c3159b..d4c3159b 100755
--- a/scripts/ad-hoc/pastebin.sh
+++ b/scripts/pastebin.sh
diff --git a/scripts/ad-hoc/post.sh b/scripts/post.sh
index 25579fa4..25579fa4 100755
--- a/scripts/ad-hoc/post.sh
+++ b/scripts/post.sh
diff --git a/scripts/ad-hoc/record-my-screen.sh b/scripts/record-my-screen.sh
index 95094b67..95094b67 100755
--- a/scripts/ad-hoc/record-my-screen.sh
+++ b/scripts/record-my-screen.sh
diff --git a/scripts/ad-hoc/rotate-mpris-player.sh b/scripts/rotate-mpris-player.sh
index 863501e3..863501e3 100755
--- a/scripts/ad-hoc/rotate-mpris-player.sh
+++ b/scripts/rotate-mpris-player.sh
diff --git a/scripts/ad-hoc/single-monitor.sh b/scripts/single-monitor.sh
index 83d0455e..83d0455e 100755
--- a/scripts/ad-hoc/single-monitor.sh
+++ b/scripts/single-monitor.sh
diff --git a/scripts/ad-hoc/three-monitors.sh b/scripts/three-monitors.sh
index d1ef7c6a..d1ef7c6a 100755
--- a/scripts/ad-hoc/three-monitors.sh
+++ b/scripts/three-monitors.sh
diff --git a/scripts/ad-hoc/vlc b/scripts/vlc
index 8570b53c..8570b53c 100755
--- a/scripts/ad-hoc/vlc
+++ b/scripts/vlc
diff --git a/scripts/ad-hoc/xdg-open b/scripts/xdg-open
index ce4a72b8..ce4a72b8 120000
--- a/scripts/ad-hoc/xdg-open
+++ b/scripts/xdg-open
diff --git a/scripts/ad-hoc/xmobar-mpris.sh b/scripts/xmobar-mpris.sh
index a2af8c40..a2af8c40 100755
--- a/scripts/ad-hoc/xmobar-mpris.sh
+++ b/scripts/xmobar-mpris.sh
diff --git a/scripts/ad-hoc/xmobar-notmuch.sh b/scripts/xmobar-notmuch.sh
index f174a8e0..f174a8e0 100755
--- a/scripts/ad-hoc/xmobar-notmuch.sh
+++ b/scripts/xmobar-notmuch.sh
diff --git a/scripts/ad-hoc/yt b/scripts/yt
index 2d8de8d2..2d8de8d2 100755
--- a/scripts/ad-hoc/yt
+++ b/scripts/yt
diff --git a/scripts/ad-hoc/zero-brightness.sh b/scripts/zero-brightness.sh
index a748724b..a748724b 100755
--- a/scripts/ad-hoc/zero-brightness.sh
+++ b/scripts/zero-brightness.sh
diff --git a/xmonad/xmobar.hs b/xmonad/xmobar.hs
index bbbeffa1..828ab1b6 100644
--- a/xmonad/xmobar.hs
+++ b/xmonad/xmobar.hs
@@ -18,8 +18,8 @@ Config {
           "-h", "green",
           "-l", "red"]
           10
-      , Run CommandReader "~/dev/libre/dotfiles/scripts/ad-hoc/xmobar-mpris.sh" "mpris"
-      , Run CommandReader "~/dev/libre/dotfiles/scripts/ad-hoc/xmobar-notmuch.sh" "notmuch"
+      , Run CommandReader "~/dev/libre/dotfiles/scripts/xmobar-mpris.sh" "mpris"
+      , Run CommandReader "~/dev/libre/dotfiles/scripts/xmobar-notmuch.sh" "notmuch"
     ]
   , template = " <fc=#5ea2a4>%date%</fc> | %default:Master%| %mpris% } { | %notmuch% | %wlp59s0wi% | %battery% | %memory% * %swap% | %cpu% | %disku% "
 }
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 0dd8cfbc..1e9a2bd1 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -40,21 +40,21 @@ myKeyPBindings =
     , ("<F4>",   spawn "playerctl --player=$(cat ~/.cache/andreh/mpris-player.txt) position 5-")
     , ("S-<F4>", spawn "playerctl --player=$(cat ~/.cache/andreh/mpris-player.txt) previous")
     , ("<F5>",   spawn "playerctl --player=$(cat ~/.cache/andreh/mpris-player.txt) play-pause")
-    , ("S-<F5>", spawn "~/dev/libre/dotfiles/scripts/ad-hoc/rotate-mpris-player.sh")
+    , ("S-<F5>", spawn "~/dev/libre/dotfiles/scripts/rotate-mpris-player.sh")
     , ("<F6>",   spawn "playerctl --player=$(cat ~/.cache/andreh/mpris-player.txt) position 5+")
     , ("S-<F6>", spawn "playerctl --player=$(cat ~/.cache/andreh/mpris-player.txt) next")
 
       -- Brightness
-    , ("<F7>",   spawn "~/dev/libre/dotfiles/scripts/ad-hoc/brightness.sh -10")
-    , ("S-<F7>", spawn "~/dev/libre/dotfiles/scripts/ad-hoc/zero-brightness.sh")
-    , ("<F8>",   spawn "~/dev/libre/dotfiles/scripts/ad-hoc/brightness.sh +10")
+    , ("<F7>",   spawn "~/dev/libre/dotfiles/scripts/brightness.sh -10")
+    , ("S-<F7>", spawn "~/dev/libre/dotfiles/scripts/zero-brightness.sh")
+    , ("<F8>",   spawn "~/dev/libre/dotfiles/scripts/brightness.sh +10")
 
 
       -- yeganesh launcher
     , ("M-p", spawnHere "exe=$(yeganesh -x) && exec $exe")
 
       -- yeganesh emoji
-    , ("M-o", spawnHere "~/dev/libre/dotfiles/scripts/ad-hoc/dmenu-emoji.sh")
+    , ("M-o", spawnHere "~/dev/libre/dotfiles/scripts/dmenu-emoji.sh")
 
       -- Lock screen
     , ("C-M-l", spawn "dm-tool switch-to-greeter")
@@ -65,10 +65,10 @@ myKeyPBindings =
     , ("C-M-<Print>", spawn "escrotum ~/Bureau/%Y-%m-%d-%T-screenshot.png -s")
 
       -- xrandr single monitor setup
-    , ("C-M-1", spawn "~/dev/libre/dotfiles/scripts/ad-hoc/single-monitor.sh")
+    , ("C-M-1", spawn "~/dev/libre/dotfiles/scripts/single-monitor.sh")
 
       -- xrandr three monitor setup
-    , ("C-M-3", spawn "~/dev/libre/dotfiles/scripts/ad-hoc/three-monitors.sh")
+    , ("C-M-3", spawn "~/dev/libre/dotfiles/scripts/three-monitors.sh")
 
       -- restart network
     , ("M-x", spawn "gksudo -S systemctl restart NetworkManager")
@@ -85,7 +85,7 @@ myKeyPBindings =
     , ("M-z",  sendMessage MirrorShrink)
 
       -- Enqueue link on clipboard in VLC
-    , ("M-v", spawn "~/dev/libre/dotfiles/scripts/ad-hoc/dmenu-vlc.sh")
+    , ("M-v", spawn "~/dev/libre/dotfiles/scripts/dmenu-vlc.sh")
     ]
 
 myLayoutHook =