Skip to content

Instantly share code, notes, and snippets.

View vale981's full-sized avatar

Valentin Boettcher vale981

24 followers · 89 following
View GitHub Profile
@solarkraft
solarkraft / syncthing-automerge.py
Last active March 18, 2025 17:08
Monitors a Syncthing-synced directory and tries to merge conflicting files (based on https://www.rafa.ee/articles/resolve-syncthing-conflicts-using-three-way-merge/). Probably adaptable for other directory types, but only tested with Logseq (works for me™️).
# This script automatically handles Syncthing conflicts on text files by applying a
# git three-way merge between the previously synced version and each divergent version.
# It depends on the watchdog package and git.
# For automatic dependency installation when running with ´uv run --script deconflicter.py´:
# /// script
# requires-python = ">=3.10"
# dependencies = [
# "watchdog",
@egarson
egarson / greek-letters-abbrevs.el
Created June 17, 2013 20:52
Emacs abbrev table for Greek lower- and upper-case letters. See abbrev-mode for more.
(define-abbrev-table 'greek-abbrev-table
'(
;; Greek small letters
("8al" "α")
("8be" "β")
("8ga" "γ")
("8de" "δ")
("8ep" "ε")
("8ze" "ζ")
("8et" "η")