From de5db64200e750781dd8a3ac003d11cc1f534899 Mon Sep 17 00:00:00 2001
From: cashmere <cashmere@autistici.org>
Date: Sat, 24 Jan 2026 10:38:16 +0100
Subject: sync

---
 config.el  | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++
 config.org | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/config.el b/config.el
index e6902a2..459fb66 100644
--- a/config.el
+++ b/config.el
@@ -1849,6 +1849,23 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
 ;;   (visual-fill-column-center-text t) ;; Text zentrieren!
 ;;   (visual-fill-column-enable-sensible-window-split t))
 
+;; (use-package diff-hl
+;;   :defer t
+;;   :straight t
+;;   :ensure t
+;;   :hook
+;;   (find-file . (lambda ()
+;;                  (global-diff-hl-mode)           ;; Enable Diff-HL mode for all files.
+;;                  (diff-hl-flydiff-mode)          ;; Automatically refresh diffs.
+;;                  (diff-hl-margin-mode)))         ;; Show diff indicators in the margin.
+;;   :custom
+;;   (diff-hl-side 'left)                           ;; Set the side for diff indicators.
+;;   (diff-hl-margin-symbols-alist '((insert . "┃") ;; Customize symbols for each change type.
+;;                                   (delete . "-")
+;;                                   (change . "┃")
+;;                                   (unknown . "┆")
+;;                                   (ignored . "i"))))
+
 (use-package diff-hl
   :defer t
   :straight t
@@ -1904,6 +1921,44 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
   :hook
   (git-commit-mode . conventional-commit-setup))
 
+(use-package hl-todo
+  :ensure t
+  :straight (:host github :repo "tarsius/hl-todo")
+  :config
+  (global-hl-todo-mode) 
+  (setq hl-todo-keyword-faces
+        '(("TODO"   . "#FF0000")
+          ("FIXME"  . "#FF0000")
+          ("DEBUG"  . "#A020F0")
+          ("GOTCHA" . "#FF4500")
+          ("STUB"   . "#1E90FF"))))
+
+(use-package magit
+  :ensure t
+  :straight t
+  :config
+  (if ek-use-nerd-fonts
+	  (setopt magit-format-file-function #'magit-format-file-nerd-icons))
+  :custom
+  (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
+
+(defun my/magit-kill-buffers ()
+  (interactive)
+  (let ((buffers (magit-mode-get-buffers)))
+	(magit-restore-window-configuration)
+	(mapc #'kill-buffer buffers)))
+
+(setq switch-to-prev-buffer-skip
+      (lambda (window buffer bury-or-kill)
+        (string-match-p "\\*magit" (buffer-name buffer))))
+
+(use-package conventional-commit
+  :ensure t
+  :straight (:host github :repo "akirak/conventional-commit.el")
+  :after git-commit
+  :hook
+  (git-commit-mode . conventional-commit-setup))
+
 (use-package indent-guide
   :defer t
   :straight t
@@ -3333,6 +3388,9 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
 (use-package emacs-everywhere
   :ensure t)
 
+(use-package md4rd
+  :ensure t)
+
 (use-package burly
   :ensure t)
 
diff --git a/config.org b/config.org
index 9435ca7..aeb9bbc 100644
--- a/config.org
+++ b/config.org
@@ -2321,6 +2321,27 @@ ily <3.
 
 * diff-hl
 
+#+begin_src emacs-lisp
+;; (use-package diff-hl
+;;   :defer t
+;;   :straight t
+;;   :ensure t
+;;   :hook
+;;   (find-file . (lambda ()
+;;                  (global-diff-hl-mode)           ;; Enable Diff-HL mode for all files.
+;;                  (diff-hl-flydiff-mode)          ;; Automatically refresh diffs.
+;;                  (diff-hl-margin-mode)))         ;; Show diff indicators in the margin.
+;;   :custom
+;;   (diff-hl-side 'left)                           ;; Set the side for diff indicators.
+;;   (diff-hl-margin-symbols-alist '((insert . "┃") ;; Customize symbols for each change type.
+;;                                   (delete . "-")
+;;                                   (change . "┃")
+;;                                   (unknown . "┆")
+;;                                   (ignored . "i"))))
+#+end_src
+
+* diff-hl
+
 #+begin_src emacs-lisp
 (use-package diff-hl
   :defer t
@@ -2390,6 +2411,56 @@ ily <3.
   (git-commit-mode . conventional-commit-setup))
 #+end_src
 
+* hl-todo
+
+#+begin_src emacs-lisp
+(use-package hl-todo
+  :ensure t
+  :straight (:host github :repo "tarsius/hl-todo")
+  :config
+  (global-hl-todo-mode) 
+  (setq hl-todo-keyword-faces
+        '(("TODO"   . "#FF0000")
+          ("FIXME"  . "#FF0000")
+          ("DEBUG"  . "#A020F0")
+          ("GOTCHA" . "#FF4500")
+          ("STUB"   . "#1E90FF"))))
+#+end_src
+
+* magit
+
+#+begin_src emacs-lisp
+(use-package magit
+  :ensure t
+  :straight t
+  :config
+  (if ek-use-nerd-fonts
+	  (setopt magit-format-file-function #'magit-format-file-nerd-icons))
+  :custom
+  (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
+
+(defun my/magit-kill-buffers ()
+  (interactive)
+  (let ((buffers (magit-mode-get-buffers)))
+	(magit-restore-window-configuration)
+	(mapc #'kill-buffer buffers)))
+
+(setq switch-to-prev-buffer-skip
+      (lambda (window buffer bury-or-kill)
+        (string-match-p "\\*magit" (buffer-name buffer))))
+#+end_src
+
+** conventional-commit
+
+#+begin_src emacs-lisp
+(use-package conventional-commit
+  :ensure t
+  :straight (:host github :repo "akirak/conventional-commit.el")
+  :after git-commit
+  :hook
+  (git-commit-mode . conventional-commit-setup))
+#+end_src
+
 * indent-guide
 
 #+begin_src emacs-lisp
-- 
cgit v1.3.1