Commit 6f760e2658e2

@@ -4,10 +4,6 @@ let
     #!/usr/bin/env bash
     fd . -d 3 --type d ~/src | ${pkgs.wofi}/bin/wofi -dmenu | xargs -I {} zsh -i -c "cd {}; emacs ."
   '';
-  emacs-mini = pkgs.writeScript "emacs-mini" ''
-    #!/usr/bin/env bash
-    emacs --init-directory=$HOME/src/home/tools/emacs/mini
-  '';
   fontConf = {
     names = [ "JetBrains Mono" ];
     size = 12.0;
@@ -124,7 +120,7 @@ in
           "${mod}+Shift+Return" = "exec emacsclient -c";
           "${mod}+Control+Return" = "exec emacs";
           "${mod}+Control+Shift+Return" = "exec ${emacs-in-folder}";
-          "${mod}+Control+Alt+Return" = "exec ${emacs-mini}";
+          "${mod}+Control+Alt+Return" = "exec emacs"; # TODO: remove this
 
           "${mod}+Left" = "focus left";
           "${mod}+Down" = "focus down";
@@ -232,7 +228,7 @@ in
           always = true;
         }
         # Probably put a condition here.
-        { command = "emacs --init-directory=$HOME/src/home/tools/emacs/mini --fg-daemon"; }
+        { command = "emacs --init-directory=$HOME/src/home/tools/emacs --fg-daemon"; }
         { command = "i3-back"; }
         { command = "firefox"; }
         { command = "${pkgs.kitty}/bin/kitty --title metask --class metask"; }
@@ -244,7 +240,7 @@ in
         inherit (config.wayland.windowManager.sway.config) menu;
       in
       ''
-        bindcode ${mod}+Control+Shift+Alt+41 exec ${emacs-mini}
+        bindcode ${mod}+Control+Shift+Alt+41 exec emacs
         bindcode ${mod}+33 exec "${menu}"
         bindcode ${mod}+Shift+33 exec "raffi -I"
         bindcode ${mod}+Control+33 exec "${pkgs.wofi-emoji}/bin/wofi-emoji -G"

@@ -1,79 +0,0 @@
-;;; 00-clean.el --- -*- lexical-binding: t; -*-
-;;; Commentary:
-;;; no-littering and recentf configurations
-;;; Note: this file is autogenerated from an org-mode file.
-;;; Code:
-
-(setopt make-backup-files nil)
-(setopt backup-inhibited nil) ; Not sure if needed, given `make-backup-files'
-(setopt create-lockfiles nil)
-
-(use-package recentf
-  :hook (after-init . recentf-mode)
-  :custom
-  (recentf-max-saved-items 500)
-  (recentf-save-file (locate-user-emacs-file "auto-save-list/recent-file-list.el"))
-  (recentf-auto-cleanup "8:00am")
-  (recentf-show-file-shortcuts-flag nil)
-  (recentf-exclude
-   '("\\.?cache" ".cask" "url" "COMMIT_EDITMSG\\'" "bookmarks"
-     "\\.\\(?:gz\\|gif\\|svg\\|elc\\|png\\|jpe?g\\|bmp\\|xpm\\)$"
-     "\\.?ido\\.last$" "\\.revive$" "/G?TAGS$" "/.elfeed/"
-     "^/tmp/" "^/var/folders/.+$" "^/sudo:" "^/su:" "^/ssh:" "^/sshfs:"
-     (lambda (file) (file-in-directory-p file package-user-dir))))
-  :config
-  (push (expand-file-name recentf-save-file) recentf-exclude)
-  ;; Magic advice to rename entries in recentf when moving files in
-  ;; dired.
-  (defun rjs/recentf-rename-notify (oldname newname &rest args)
-    (if (file-directory-p newname)
-        (rjs/recentf-rename-directory oldname newname)
-      (rjs/recentf-rename-file oldname newname)))
-
-  (defun rjs/recentf-rename-file (oldname newname)
-    (setq recentf-list
-          (mapcar (lambda (name)
-                    (if (string-equal name oldname)
-                        newname
-                      oldname))
-                  recentf-list))
-    recentf-cleanup)
-
-  (defun rjs/recentf-rename-directory (oldname newname)
-    ;; oldname, newname and all entries of recentf-list should already
-    ;; be absolute and normalised so I think this can just test whether
-    ;; oldname is a prefix of the element.
-    (setq recentf-list
-          (mapcar (lambda (name)
-                    (if (string-prefix-p oldname name)
-                        (concat newname (substring name (length oldname)))
-                      name))
-                  recentf-list))
-    recentf-cleanup)
-  (add-to-list 'recentf-filename-handlers 'abbreviate-file-name)
-  (advice-add 'dired-rename-file :after #'rjs/recentf-rename-notify))
-
-
-;; 2024-07-08: Do I have to setup this, or should I do like prot, disable *all* backup, lockfile, …
-(use-package no-littering               ; Keep .emacs.d clean
-  :config
-  (require 'recentf)
-  (add-to-list 'recentf-exclude no-littering-var-directory)
-  (add-to-list 'recentf-exclude no-littering-etc-directory)
-
-  ;; Move this in its own thing
-  (setq
-   create-lockfiles nil
-   delete-old-versions t
-   kept-new-versions 6
-   kept-old-versions 2
-   version-control t)
-
-  (setq
-   backup-directory-alist
-   `((".*" . ,(no-littering-expand-var-file-name "backup/")))
-   auto-save-file-name-transforms
-   `((".*" ,(no-littering-expand-var-file-name "auto-save/") t))))
-
-(provide '00-clean)
-;;; 00-clean.el ends here

@@ -1,164 +0,0 @@
-;;; config-appearance.el --- -*- lexical-binding: t -*-
-;;; Commentary:
-;;; Appearance configuration
-;;; Code:
-
-(set-face-attribute 'fill-column-indicator nil
-                    :foreground "#717C7C") ; katana-gray
-(global-display-fill-column-indicator-mode 1)
-
-(setopt echo-keystrokes 0.1
-        line-number-display-limit-width 10000
-        indicate-buffer-boundaries 'left
-        indicate-empty-lines +1)
-
-(line-number-mode 1)
-(column-number-mode 1)
-
-;; let's enable it for all programming major modes
-(add-hook 'prog-mode-hook #'hl-line-mode)
-;; and for all modes derived from text-mode
-(add-hook 'text-mode-hook #'hl-line-mode)
-
-(use-package frame
-  :unless noninteractive
-  :commands vde/cursor-type-mode
-  :config
-  (setq-default cursor-type 'box)
-  (setq-default cursor-in-non-selected-windows '(bar . 2))
-  (setq-default blink-cursor-blinks 50)
-  (setq-default blink-cursor-interval nil) ; 0.75 would be my choice
-  (setq-default blink-cursor-delay 0.2)
-
-  (blink-cursor-mode -1)
-
-  (define-minor-mode vde/cursor-type-mode
-    "Toggle between static block and pulsing bar cursor."
-    :init-value nil
-    :global t
-    (if vde/cursor-type-mode
-        (progn
-          (setq-local blink-cursor-interval 0.75
-                      cursor-type '(bar . 2)
-                      cursor-in-non-selected-windows 'hollow)
-          (blink-cursor-mode 1))
-      (dolist (local '(blink-cursor-interval
-                       cursor-type
-                       cursor-in-non-selected-windows))
-        (kill-local-variable `,local))
-      (blink-cursor-mode -1))))
-
-(use-package emacs
-  :config
-  (setq-default custom-safe-themes t)
-  (setq-default custom--inhibit-theme-enable nil)
-
-  (defun vde/before-load-theme (&rest args)
-    "Clear existing theme settings instead of layering them.
-Ignores `ARGS'."
-    (mapc #'disable-theme custom-enabled-themes))
-
-  (advice-add 'load-theme :before #'vde/before-load-theme))
-
-(use-package emacs
-  :config
-  (setq window-divider-default-right-width 1)
-  (setq window-divider-default-bottom-width 1)
-  (setq window-divider-default-places 'right-only)
-  :hook (after-init . window-divider-mode))
-
-(use-package tab-bar
-  :unless noninteractive
-  :config
-  (setq-default tab-bar-close-button-show nil)
-  (setq-default tab-bar-close-last-tab-choice 'tab-bar-mode-disable)
-  (setq-default tab-bar-close-tab-select 'recent)
-  (setq-default tab-bar-new-tab-choice t)
-  (setq-default tab-bar-new-tab-to 'right)
-  (setq-default tab-bar-position nil)
-  (setq-default tab-bar-show t)
-  (setq-default tab-bar-tab-hints nil)
-  (setq-default tab-bar-tab-name-function 'vde/tab-bar-tab-name)
-
-  (defun vde/tab-bar-tab-name ()
-    "Generate tab name from the buffer of the selected window *or* projectile."
-    (cond
-     ((project-current) (let ((project-path (vde-project--project-current)))
-                          (cond ((string-prefix-p "~/src" project-path)
-                                 (directory-file-name (file-relative-name project-path "~/src")))
-                                ((string-prefix-p "~/desktop" project-path)
-                                 (directory-file-name (file-relative-name project-path "~/desktop")))
-                                ((string-prefix-p "/etc" project-path)
-                                 (directory-file-name (file-relative-name project-path "/etc")))
-                                (t
-                                 (file-relative-name project-path)))))
-     (t (tab-bar-tab-name-current-with-count))))
-
-  (defun vde/complete-tab-bar-tab-dwim ()
-    "Do-What-I-Mean function for getting to a `tab-bar-mode' tab.
-If no other tab exists, create one and switch to it.  If there is
-one other tab (so two in total) switch to it without further
-questions.  Else use completion to select the tab to switch to."
-    (interactive)
-    (let ((tabs (mapcar (lambda (tab)
-                          (alist-get 'name tab))
-                        (tab-bar--tabs-recent))))
-      (cond ((eq tabs nil)
-             (tab-new))
-            ((eq (length tabs) 1)
-             (tab-next))
-            (t
-             (tab-bar-switch-to-tab
-              (completing-read "Select tab: " tabs nil t))))))
-
-  :bind (("C-x t t" . vde/complete-tab-bar-tab-dwim)
-         ("C-x t s" . tab-switcher)
-	 ("C-<next>" . tab-next)
-	 ("C-<prior>" . tab-previous)))
-
-(use-package minions
-  :hook (after-init . minions-mode)
-  :config
-  (add-to-list 'minions-prominent-modes 'flymake-mode))
-
-(use-package time
-  :unless noninteractive
-  :config
-  (setq-default display-time-24hr-format t
-                display-time-day-and-date t
-                display-time-world-list '(("Europe/Paris" "Paris")
-                                          ("Europe/London" "London")
-                                          ("America/New_York" "Boston")
-                                          ("America/Los_Angeles" "San Francisco")
-                                          ("Asia/Calcutta" "Bangalore")
-                                          ("Australia/Brisbane" "Brisbane"))
-                display-time-string-forms
-                '((format "%s %s %s, %s:%s"
-                          dayname
-                          monthname day
-                          24-hours minutes)))
-  (display-time))
-
-(use-package tooltip
-  :unless noninteractive
-  :config
-  (setq tooltip-delay 0.5)
-  (setq tooltip-short-delay 0.5)
-  (setq x-gtk-use-system-tooltips nil)
-  (setq tooltip-frame-parameters
-        '((name . "tooltip")
-          (internal-border-width . 6)
-          (border-width . 0)
-          (no-special-glyphs . t)))
-  :hook (after-init . tooltip-mode))
-
-(use-package alert
-  :init
-  (defun alert-after-finish-in-background (buf str)
-    (when (or (not (get-buffer-window buf 'visible)) (not (frame-focus-state)))
-      (alert str :buffer buf)))
-  :config
-  (setq alert-default-style 'libnotify))
-
-(provide 'config-appearance)
-;;; config-appearance.el ends here

@@ -1,109 +0,0 @@
-;;; config-buffers.el --- -*- lexical-binding: t; -*-
-;;; Commentary:
-;;; Buffer related configurations
-;;; Code:
-
-(use-package savehist
-  :unless noninteractive
-  :hook (after-init . savehist-mode)
-  :init
-  (setq savehist-file (no-littering-expand-var-file-name "savehist"))
-  :config
-  (setq-default history-length 10000
-                savehist-save-minibuffer-history t
-		savehist-delete-duplicates t
-                savehist-autosave-interval 180
-                savehist-additional-variables '(extended-command-history
-                                                search-ring
-                                                regexp-search-ring
-                                                comint-input-ring
-                                                compile-history
-                                                last-kbd-macro
-                                                shell-command-history)))
-
-(use-package uniquify
-  :unless noninteractive
-  :config
-  (setq-default uniquify-buffer-name-style 'post-forward
-                uniquify-separator ":"
-                uniquify-ignore-buffers-re "^\\*"
-                uniquify-after-kill-buffer-p t))
-
-(use-package ibuffer
-  :unless noninteractive
-  :commands (ibuffer)
-  :bind (("C-x C-b" . ibuffer)
-         ([remap list-buffers] . ibuffer))
-  :config
-  (setq-default ibuffer-expert t
-                ibuffer-filter-group-name-face 'font-lock-doc-face
-                ibuffer-default-sorting-mode 'filename/process
-                ibuffer-use-header-line t
-                ibuffer-show-empty-filter-groups nil)
-  ;; Use human readable Size column instead of original one
-  (define-ibuffer-column size-h
-    (:name "Size" :inline t)
-    (cond
-     ((> (buffer-size) 1000000) (format "%7.1fM" (/ (buffer-size) 1000000.0)))
-     ((> (buffer-size) 1000) (format "%7.1fk" (/ (buffer-size) 1000.0)))
-     (t (format "%8d" (buffer-size)))))
-
-  ;; (setq ibuffer-formats
-  ;;       '((mark modified read-only " "
-  ;;               (name 18 18 :left :elide)
-  ;;               " "
-  ;;               (size-h 9 -1 :right)
-  ;;               " "
-  ;;               (mode 16 16 :left :elide)
-  ;;               " "
-  ;;               filename-and-process)
-  ;;         (mark modified read-only " "
-  ;;               (name 18 18 :left :elide)
-  ;;               " "
-  ;;               (size 9 -1 :right)
-  ;;               " "
-  ;;               (mode 16 16 :left :elide)
-  ;;               " "
-  ;;               (vc-status 16 16 :left)
-  ;;               " "
-  ;;               filename-and-process)))
-  )
-
-(use-package ibuffer-vc
-  :unless noninteractive
-  :commands (ibuffer-vc-set-filter-groups-by-vc-root)
-  :hook (ibuffer . (lambda ()
-                     (ibuffer-vc-set-filter-groups-by-vc-root)
-                     (unless (eq ibuffer-sorting-mode 'filename/process)
-                       (ibuffer-do-sort-by-filename/process)))))
-
-;; (unless noninteractive
-;;   (require 'popper)
-;;   (setq popper-reference-buffers
-;;         '("\\*Messages\\*"
-;;           "Output\\*$"
-;;           "\\*Async Shell Command\\*"
-;; 	  "\\*Warnings\\*"
-;; 	  "\\*Compile-Log\\*"
-;;           help-mode
-;; 	  helpful-mode
-;;           compilation-mode
-;; 	  flymake-diagnostics-buffer-mode
-;; 	  flymake-project-diagnostics-mode
-;; 	  Man-mode
-;; 	  woman-mode))
-;;   (global-set-key (kbd "C-`") 'popper-toggle)
-;;   (global-set-key (kbd "M-`") 'popper-cycle)
-;;   (global-set-key (kbd "C-M-`") 'popper-toggle-type)
-;;   (popper-mode +1)
-;; 
-;;   ;; For echo-area hints
-;;   (require 'popper-echo)
-;;   (popper-echo-mode +1))
-
-(use-package goto-addr
-  :hook ((text-mode . goto-address-mode)
-         (prog-mode . goto-address-prog-mode)))
-
-(provide 'config-buffers)
-;;; config-buffers.el ends here

@@ -1,104 +0,0 @@
-;;; config-compile.el --- -*- lexical-binding: t; -*-
-;;; Commentary:
-;;; Generic compilation configuration
-;;; Code:
-
-(defun my-recompile (args)
-  (interactive "P")
-  (cond
-   ((eq major-mode #'emacs-lisp-mode)
-    (call-interactively 'eros-eval-defun))
-   ((bound-and-true-p my-vterm-command)
-    (my-vterm-execute-region-or-current-line my-vterm-command))
-   ((get-buffer "*compilation*")
-    (with-current-buffer"*compilation*"
-      (recompile)))
-   ((get-buffer "*Go Test*")
-    (with-current-buffer "*Go Test*"
-      (recompile)))
-   ((and (eq major-mode #'go-mode)
-         buffer-file-name
-         (string-match
-          "_test\\'" (file-name-sans-extension buffer-file-name)))
-    (my-gotest-maybe-ts-run))
-   ((and (get-buffer "*cargo-test*")
-         (boundp 'my-rustic-current-test-compile)
-         my-rustic-current-test-compile)
-    (with-current-buffer "*cargo-test*"
-      (rustic-cargo-test-run my-rustic-current-test-compile)))
-   ((get-buffer "*cargo-run*")
-    (with-current-buffer "*cargo-run*"
-      (rustic-cargo-run-rerun)))
-   ((get-buffer "*pytest*")
-    (with-current-buffer "*pytest*"
-      (recompile)))
-   ((eq major-mode #'python-mode)
-    (compile (concat python-shell-interpreter " " (buffer-file-name))))
-   ((call-interactively 'compile))))
-
-;; UseCompile
-(use-package compile
-  :unless noninteractive
-  :commands (compile)
-  :preface
-  (autoload 'ansi-color-apply-on-region "ansi-color")
-
-  (defvar compilation-filter-start)
-
-  (defun vde/colorize-compilation-buffer ()
-    (unless (or (derived-mode-p 'grep-mode)
-                (derived-mode-p 'ag-mode)
-                (derived-mode-p 'rg-mode))
-      (let ((inhibit-read-only t))
-        (ansi-color-apply-on-region compilation-filter-start (point)))))
-  :config
-  (setq-default compilation-scroll-output t
-                ;; I'm not scared of saving everything.
-                compilation-ask-about-save nil
-                ;; Automatically scroll and jump to the first error
-                ;; compilation-scroll-output 'next-error
-                ;; compilation-scroll-output 'first-error
-                ;; compilation-auto-jump-to-first-error t
-                ;; Skip over warnings and info messages in compilation
-                compilation-skip-threshold 2
-                ;; Don't freeze when process reads from stdin
-                compilation-disable-input t
-                ;; Show three lines of context around the current message
-                compilation-context-lines 3
-                )
-  (add-hook 'compilation-finish-functions #'alert-after-finish-in-background)
-  (add-hook 'comint-output-filter-functions
-            'comint-watch-for-password-prompt)
-  (setq-default comint-password-prompt-regexp
-                (concat
-                 "\\("
-                 "^Enter passphrase.*:"
-                 "\\|"
-                 "^Repeat passphrase.*:"
-                 "\\|"
-                 "[Pp]assword for '[a-z0-9_-.]+':"
-                 "\\|"
-                 "\\[sudo\\] [Pp]assword for [a-z0-9_-.]+:"
-                 "\\|"
-                 "[a-zA-Z0-9]'s password:"
-                 "\\|"
-                 "^[Pp]assword:"
-                 "\\|"
-                 "^[Pp]assword (again):"
-                 "\\|"
-                 ".*\\([Ww]ork\\|[Pp]ersonal\\).* password:"
-                 "\\|"
-                 "Password for '([^()]+)' GNOME keyring"
-                 "\\|"
-                 "Password for 'http.*github.*':"
-                 "\\)"))
-  (add-hook 'compilation-filter-hook #'vde/colorize-compilation-buffer))
-
-(use-package emacs
-  :bind
-  (:map prog-mode-map
-        ("C-M-<return>" . compile)
-        ("C-<return>"   . my-recompile)))
-
-(provide 'config-compile)
-;;; config-compile.el ends here

@@ -1,342 +0,0 @@
-;;; config-completion.el --- -*- lexical-binding: t -*-
-;;; Commentary:
-;;; Setup completion framework
-;;; Code
-
-(use-package which-key
-  :custom
-  (which-key-separator " → " )
-  :hook
-  (after-init . which-key-mode)
-  :config
-  
-  ;; Define custom, concise descriptions for `tab-bar` commands under "C-x t"
-  (which-key-add-key-based-replacements
-    "C-x t C-f" "Open file in new tab"
-    "C-x t RET" "Switch tabs"
-    "C-x t C-r" "Open file (read-only) in new tab"
-    "C-x t 0"   "Close current tab"
-    "C-x t 1"   "Close other tabs"
-    "C-x t 2"   "New empty tab"
-    "C-x t G"   "Group tabs"
-    "C-x t M"   "Move tab to position"
-    "C-x t N"   "New tab and switch to it"
-    "C-x t O"   "Previous tab"
-    "C-x t b"   "Switch buffer in new tab"
-    "C-x t d"   "Dired in new tab"
-    "C-x t f"   "Open file in new tab"
-    "C-x t m"   "Move tab left/right"
-    "C-x t n"   "Duplicate tab"
-    "C-x t o"   "Next tab"
-    "C-x t p"   "Project in new tab"
-    "C-x t r"   "Rename tab"
-    "C-x t t"   "Switch to other tab"
-    "C-x t u"   "Undo tab close"
-    "C-x t ^ f" "Detach tab window"))
-
-(use-package consult
-  :bind
-  ("M-g M-g" . consult-goto-line)
-  ("M-K" . consult-keep-lines)
-  ("M-s M-b" . consult-buffer)
-  ("M-s M-f" . consult-find)
-  ("M-s M-g" . consult-grep)
-  ("M-s M-r" . consult-ripgrep)
-  ("M-s M-h" . consult-history)
-  ("M-s M-l" . consult-line)
-  ("M-s M-m" . consult-mark)
-  ("M-s M-y" . consult-yank-pop)
-  ("M-s M-s" . consult-outline)
-  :config
-  ;; (general-leader
-  ;;   "y"  #'(consult-yank-pop :which-key "Clipboard history")
-  ;;   "b"  '(:ignore t :which-key "buffer")
-  ;;   "bb" #'(consult-buffer :which-key "switch buffer")
-  ;;   "bd" #'(kill-current-buffer :which-key "kill buffer")
-  ;;   "bD" #'((lambda ()(interactive)(kill-current-buffer)(tab-close)) :wk "Kill buffer and tab")
-  ;;   "bn" #'(next-buffer :which-key "next buffer")
-  ;;   "bp" #'(previous-buffer :which-key "previous buffer")
-  ;;   "s"  '(:ignore t :which-key "search")
-  ;;   "sg" #'(consult-grep :which-key "Consult grep in current directory")
-  ;;   "sR" #'(consult-ripgrep :which-key "Consult ripgrep in current directory")
-  ;;   "sr" '(:ignore t :which-key "rg.el")'
-  ;;   "srp" #'(rg-project :which-key "rg.el in current project")
-  ;;   "srs" #'(rg-dwim :which-key "rg.el Do What I Mean")
-  ;;   "sh"  #'(Info-goto-emacs-command-node :wk "Search help")
-  ;;   "sc"  #'(consult-mode-command :wk "Mode Command")
-  ;;   "s/"  #'(consult-isearch-history :wk "Consult Isearch history")
-  ;;   "g"  '(:ignore t :which-key "go")
-  ;;   "gu" #'(ffap-next-url :which-key "next url")
-  ;;   "gd" #'(xref-find-definitions :which-key "find definition")
-  ;;   "gD" #'(xref-find-definitions-other-window :which-key "find definition (other window)"))
-  )
-
-(use-package consult-imenu
-  :after (consult)
-  :commands (consult-imenu)
-  :bind
-  ("M-s M-i" . consult-imenu))
-
-(use-package consult-xref
-  :after (consult)
-  :commands (consult-xref)
-  :config
-  (setq xref-show-xrefs-function #'consult-xref
-        xref-show-definitions-function #'consult-xref)
-  (defvar consult--xref-history nil
-    "History for the `consult-recent-xref' results.")
-
-  (defun consult-recent-xref (&optional markers)
-    "Jump to a marker in MARKERS list (defaults to `xref--history'.
-
-The command supports preview of the currently selected marker position.
-The symbol at point is added to the future history."
-    (interactive)
-    (consult--read
-     (consult--global-mark-candidates
-      (or markers (flatten-list xref--history)))
-     :prompt "Go to Xref: "
-     :annotate (consult--line-prefix)
-     :category 'consult-location
-     :sort nil
-     :require-match t
-     :lookup #'consult--lookup-location
-     :history '(:input consult--xref-history)
-     :add-history (thing-at-point 'symbol)
-     :state (consult--jump-state))))
-
-;; https://github.com/oantolin/embark/blob/master/embark-consult.el
-(use-package embark
-  :unless noninteractive
-  :commands (emark-act embark-dwim embark-prefix-help-command)
-  :bind
-  ("C-." . embark-act)
-  ("M-." . embark-dwim)
-  ("C-h b" . embark-bindings)
-  ("C-h B" . embark-bindings-at-point)
-  ("C-h M" . embark-bindings-in-keymap)
-  ("C-h E" . embark-on-last-message)
-  (:map completion-list-mode-map
-        ("." . embark-act))
-  (:map embark-collect-mode-map
-        ("a") ; I don't like my own default :)
-        ("." . embark-act)
-        ("F" . consult-focus-lines))
-  (:map embark-package-map
-        ("t" . try))
-  (:map embark-identifier-map
-        ("(" . insert-parentheses)
-        ("[" . insert-pair-map))
-  (:map embark-expression-map
-        ("(" . insert-parentheses)
-        ("[" . insert-pair-map))
-  (:map embark-region-map
-        ("(" . insert-parentheses)
-        ("[" . insert-pair-map)
-        ("D" . dictionary-search))
-  (:map embark-email-map
-        ("+" . add-email-to-ecomplete)
-        ("\\" . remove-email-from-ecomplete))
-  (:map embark-encode-map
-        ("p" . topaz-paste-region))
-  (:map embark-url-map
-        ("x" . browse-url-generic)
-        ("p" . pocket-lib-add-urls))
-  (:map embark-identifier-map
-        ("D" . dictionary-lookup-definition))
-  :custom
-  (embark-quit-after-action t)
-  (prefix-help-command #'embark-prefix-help-command)
-  (embark-indicators '(embark-minimal-indicator
-                       embark-highlight-indicator
-                       embark-isearch-highlight-indicator))
-  (embark-cycle-key ".")
-  (embark-help-key "?")
-  (embark-confirm-act-all nil)
-  :config
-  (setq embark-candidate-collectors
-        (cl-substitute 'embark-sorted-minibuffer-candidates
-                       'embark-minibuffer-candidates
-                       embark-candidate-collectors))
-  (dolist (cmd '(comment-dwim
-                 insert-parentheses
-                 insert-pair
-                 markdown-insert-code
-                 markdown-insert-italic
-                 markdown-insert-bold
-                 org-emphasize
-                 cdlatex-math-modify
-                 TeX-font))
-    (push #'embark--mark-target (alist-get cmd embark-around-action-hooks)))
-  (push #'embark--xref-push-marker
-        (alist-get 'find-file embark-pre-action-hooks))
-  (defun embark-on-last-message (arg)
-    "Act on the last message displayed in the echo area."
-    (interactive "P")
-    (with-current-buffer "*Messages*"
-      (goto-char (1- (point-max)))
-      (embark-act arg)))
-
-  (defmacro ct/embark-display-in-side-window (side)
-    `(defun ,(intern (concat "display-in-side-window--" (symbol-name side))) (&optional buffer)
-       (interactive "b")
-       (when-let* ((buffer (or buffer (current-buffer)))
-                   (display-buffer-overriding-action '((display-buffer-in-side-window)
-                                                       (dedicated . t)
-                                                       (side . ,side)
-                                                       (window-parameters . ((no-delete-other-windows . t))))))
-	 (display-buffer buffer))))
-  (define-key embark-buffer-map (kbd "s b") (ct/embark-display-in-side-window bottom))
-  (define-key embark-buffer-map (kbd "s l") (ct/embark-display-in-side-window left))
-  (define-key embark-buffer-map (kbd "s r") (ct/embark-display-in-side-window right))
-  
-  (defun embark-which-key-indicator ()
-    "An embark indicator that displays keymaps using which-key.
-The which-key help message will show the type and value of the
-current target followed by an ellipsis if there are further
-targets."
-    (lambda (&optional keymap targets prefix)
-      (if (null keymap)
-          (which-key--hide-popup-ignore-command)
-	(which-key--show-keymap
-	 (if (eq (plist-get (car targets) :type) 'embark-become)
-             "Become"
-           (format "Act on %s '%s'%s"
-                   (plist-get (car targets) :type)
-                   (embark--truncate-target (plist-get (car targets) :target))
-                   (if (cdr targets) "…" "")))
-	 (if prefix
-             (pcase (lookup-key keymap prefix 'accept-default)
-               ((and (pred keymapp) km) km)
-               (_ (key-binding prefix 'accept-default)))
-           keymap)
-	 nil nil t (lambda (binding)
-                     (not (string-suffix-p "-argument" (cdr binding))))))))
-
-  (setq embark-indicators
-	'(embark-which-key-indicator
-	  embark-highlight-indicator
-	  embark-isearch-highlight-indicator))
-
-  (defun embark-hide-which-key-indicator (fn &rest args)
-    "Hide the which-key indicator immediately when using the completing-read prompter."
-    (which-key--hide-popup-ignore-command)
-    (let ((embark-indicators
-           (remq #'embark-which-key-indicator embark-indicators)))
-      (apply fn args)))
-
-  (advice-add #'embark-completing-read-prompter
-              :around #'embark-hide-which-key-indicator))
-
-(use-package embark-consult
-  :after (embark consult)
-  :unless noninteractive
-  :hook
-  (embark-collect-mode . consult-preview-at-point-mode))
-
-(setq minibuffer-prompt-properties
-      '(read-only t cursor-intangible t face minibuffer-prompt))
-(add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
-
-(use-package emacs
-  :unless noninteractive
-  :custom
-  (completion-cycle-threshold 2)
-  (completion-ignore-case t)
-  (completion-show-inline-help nil)
-  (completions-detailed t)
-  (enable-recursive-minibuffers t)
-  (read-buffer-completion-ignore-case t)
-  (read-file-name-completion-ignore-case t)
-  (resize-mini-windows t)
-  (tab-always-indent 'complete)
-  :config
-  (minibuffer-depth-indicate-mode 1)
-  (minibuffer-electric-default-mode 1))
-
-(use-package vertico
-  :unless noninteractive
-  :hook (after-init . vertico-mode))
-
-(use-package marginalia
-  :unless noninteractive
-  :hook (after-init . marginalia-mode))
-
-(use-package corfu
-  :unless noninteractive
-  :bind (("C-<tab>" . corfu-candidate-overlay-complete-at-point))
-  :hook (after-init . global-corfu-mode)
-  :init
-  (require 'corfu-popupinfo)
-  (require 'corfu-history)
-  (require 'corfu-candidate-overlay)
-  :config
-  (setq corfu-popupinfo-delay '(1.25 . 0.5))
-  (corfu-popupinfo-mode 1)
-  (corfu-candidate-overlay-mode)
-  ;; Sort by input history (no need to modify `corfu-sort-function').
-  (with-eval-after-load 'savehist
-    (corfu-history-mode 1)
-    (add-to-list 'savehist-additional-variables 'corfu-history))
-
-  ;; Adapted from Corfu's manual.
-  (defun contrib/corfu-enable-always-in-minibuffer ()
-    "Enable Corfu in the minibuffer if MCT or Vertico is not active.
-Useful for prompts such as `eval-expression' and `shell-command'."
-    (unless (or (bound-and-true-p vertico--input)
-                (bound-and-true-p mct--active))
-      (corfu-mode 1)))
-
-  (add-hook 'minibuffer-setup-hook #'contrib/corfu-enable-always-in-minibuffer 1))
-
-;; Seems like it is a bit impacting the performance somehow.
-;; (use-package corfu-candidate-overlay
-;;   :after corfu
-;;   :bind (("C-<tab>" . corfu-candidate-overlay-complete-at-point))
-;;   :config
-;;   (corfu-candidate-overlay-mode +1))
-
-(use-package cape
-  :bind (("C-c p f" . cape-file)
-         ("C-c p /" . cape-dabbrev)
-         :map corfu-map
-         ("M-/" . cape-dabbrev)
-         ("C-x C-f" . cape-file))
-  :config
-  (add-to-list 'completion-at-point-functions #'cape-file))
-
-(use-package orderless
-  :unless noninteractive
-  :config
-  (setq completion-styles
-	'(orderless basic substring initials flex partial-completion))
-  (setq completion-category-defaults nil)
-  (setq completion-category-overrides nil)
-  )
-
-(use-package tempel
-  :bind (("M-+" . tempel-complete) ;; Alternative tempel-expand
-         ("M-*" . tempel-insert))
-  :init
-  ;; (defun tempel-setup-capf ()
-  ;;   ;; Add the Tempel Capf to `completion-at-point-functions'.
-  ;;   ;; `tempel-expand' only triggers on exact matches. Alternatively use
-  ;;   ;; `tempel-complete' if you want to see all matches, but then you
-  ;;   ;; should also configure `tempel-trigger-prefix', such that Tempel
-  ;;   ;; does not trigger too often when you don't expect it. NOTE: We add
-  ;;   ;; `tempel-expand' *before* the main programming mode Capf, such
-  ;;   ;; that it will be tried first.
-  ;;   (setq-local completion-at-point-functions
-  ;;               (cons #'tempel-expand
-  ;;                     completion-at-point-functions)))
-  (setq tempel-path (expand-file-name "templates" user-emacs-directory))
-  ;; (add-hook 'conf-mode-hook 'tempel-setup-capf)
-  ;; (add-hook 'prog-mode-hook 'tempel-setup-capf)
-  ;; (add-hook 'text-mode-hook 'tempel-setup-capf)
-  )
-
-(use-package tempel-collection
-  :after tempel)
-
-(provide 'config-completion)
-;;; config-completion.el ends here

@@ -1,244 +0,0 @@
-;;; config-dired.el --  -*- lexical-binding: t; -*-
-;;; Commentary:
-;;; Configuration of Dired
-;;; Code:
-
-(defun my-substspaces (str)
-  (subst-char-in-string ?\s ?_ str))
-
-(defmacro vde/dired-fd (name doc prompt &rest flags)
-  "Make commands for selecting 'fd' results with completion.
-NAME is how the function should be named.  DOC is the function's
-documentation string.  PROMPT describes the scope of the query.
-FLAGS are the command-line arguments passed to the 'fd'
-executable, each of which is a string."
-  `(defun ,name (&optional arg)
-     ,doc
-     (interactive "P")
-     (let* ((vc (vc-root-dir))
-            (dir (expand-file-name (if vc vc default-directory)))
-            (regexp (read-regexp
-                     (format "%s matching REGEXP in %s: " ,prompt
-                             (propertize dir 'face 'bold))))
-            (names (process-lines "fd" ,@flags regexp dir))
-            (buf "*FD Dired*"))
-       (if names
-           (if arg
-               (dired (cons (generate-new-buffer-name buf) names))
-	     (find-file
-	      (completing-read (format "Items matching %s (%s): "
-				       (propertize regexp 'face 'success)
-				       (length names))
-			       names nil t))))
-       (user-error (format "No matches for « %s » in %s" regexp dir)))))
-
-(use-package dired
-  :unless noninteractive
-  :commands (dired find-name-dired)
-  :hook ((dired-mode . dired-hide-details-mode)
-	 (dired-mode . toggle-truncate-lines)
-	 (dired-mode . hl-line-mode))
-  :bind (("C-c RET" . vde/open-in-external-app)
-         ("C-c f g" . vde/dired-get-size)
-         ("M-s d" . vde/dired-fd-dirs)
-         ("M-s z" . vde/dired-fd-files-and-dirs)
-         ("C-c f f"    . find-name-dired)
-         (:map dired-mode-map
-               ("M-p"         . vde/dired-up)
-               ("^"           . vde/dired-up)
-               ("<backspace>" . vde/dired-up)
-               ("M-n"         . vde/dired-down)
-               ("!"           . vde/sudired)
-               ("<prior>"     . beginend-dired-mode-goto-beginning)
-               ("<next>"      . beginend-dired-mode-goto-end)
-	       ("b"           . dired-do-open)))
-  :config
-  (setq-default dired-auto-revert-buffer t
-                dired-recursive-copies 'always
-                dired-recursive-deletes 'always
-                dired-isearch-filenames 'dwim
-                delete-by-moving-to-trash t
-                dired-listing-switches "-lFaGh1v --group-directories-first"
-                dired-ls-F-marks-symlinks t
-                dired-dwim-target t)
-
-  (when (string= system-type "darwin")
-    (setq dired-use-ls-dired t
-          insert-directory-program "/usr/local/bin/gls"))
-
-  ;; Enable dired-find-alternate-file
-  (put 'dired-find-alternate-file 'disabled nil)
-
-  (defun vde/dired-substspaces (&optional arg)
-    "Rename all marked (or next ARG) files so that spaces are replaced with underscores."
-    (interactive "P")
-    (dired-rename-non-directory #'my-substspaces "Rename by substituting spaces" arg))
-  (if (keymap-lookup dired-mode-map "% s")
-    (message "Error: %% s already defined in dired-mode-map")
-  (define-key dired-mode-map "%s" 'vde/dired-substspaces))
-
-  (defun vde/dired-up ()
-    "Go to previous directory."
-    (interactive)
-    (find-alternate-file ".."))
-
-  (defun vde/dired-down ()
-    "Enter directory."
-    (interactive)
-    (dired-find-alternate-file))
-
-  (defun vde/open-in-external-app ()
-    "Open the file(s) at point with an external application."
-    (interactive)
-    (let* ((file-list
-            (dired-get-marked-files)))
-      (mapc
-       (lambda (file-path)
-         (let ((process-connection-type nil))
-           (start-process "" nil "xdg-open" file-path))) file-list)))
-
-  (defun find-file-reuse-dir-buffer ()
-    "Like `dired-find-file', but reuse Dired buffers."
-    (interactive)
-    (set-buffer-modified-p nil)
-    (let ((file (dired-get-file-for-visit)))
-      (if (file-directory-p file)
-          (find-alternate-file file)
-        (find-file file))))
-
-  (defun vde/sudired ()
-    "Open directory with sudo in Dired."
-    (interactive)
-    (require 'tramp)
-    (let ((dir (expand-file-name default-directory)))
-      (if (string-match "^/sudo:" dir)
-          (user-error "Already in sudo")
-        (dired (concat "/sudo::" dir)))))
-
-  (defun vde/dired-get-size ()
-    "Quick and easy way to get file size in Dired."
-    (interactive)
-    (let ((files (dired-get-marked-files)))
-      (with-temp-buffer
-        (apply 'call-process "du" nil t nil "-sch" files)
-        (message
-         "Size of all marked files: %s"
-         (progn
-           (re-search-backward "\\(^[0-9.,]+[A-Za-z]+\\).*total$")
-           (match-string 1))))))
-
-  (vde/dired-fd
-   vde/dired-fd-dirs
-   "Search for directories in VC root or PWD.
-With \\[universal-argument] put the results in a `dired' buffer.
-This relies on the external 'fd' executable."
-   "Subdirectories"
-   "-i" "-H" "-a" "-t" "d" "-c" "never")
-
-  (vde/dired-fd
-   vde/dired-fd-files-and-dirs
-   "Search for files and directories in VC root or PWD.
-With \\[universal-argument] put the results in a `dired' buffer.
-This relies on the external 'fd' executable."
-   "Files and dirs"
-   "-i" "-H" "-a" "-t" "d" "-t" "f" "-c" "never")
-  )
-
-(use-package find-dired
-  :after dired
-  :commands (find-name-dired)
-  :config
-  (setq-default find-ls-option ;; applies to `find-name-dired'
-                '("-ls" . "-AFhlv --group-directories-first")
-                find-name-arg "-iname"))
-
-(use-package dired-x
-  :after dired
-  :bind (("C-x C-j" . dired-jump))
-  :commands (dired-jump dired-omit-mode)
-  :config
-  (setq-default dired-omit-files (concat dired-omit-files "\\|^\\.+$\\|^\\..+$")
-                dired-omit-verbose nil
-                dired-clean-confirm-killing-deleted-buffers nil))
-
-(use-package dired-aux
-  :unless noninteractive
-  :after dired
-  :config
-  (setq-default
-   ;; Ask for creation of missing directories when copying/moving
-   dired-create-destination-dirs 'ask
-   dired-create-destination-dirs-on-trailing-dirsep t
-   ;; Search only file names when point is on a file name
-   dired-isearch-filenames'dwim))
-
-(use-package async)
-(use-package dired-async
-  :unless noninteractive
-  :after (dired async)
-  :commands (dired-async-mode)
-  :hook (dired-mode . dired-async-mode))
-
-(use-package dired-narrow
-  :unless noninteractive
-  :after dired
-  :commands (dired-narrow)
-  :bind (:map dired-mode-map
-              ("M-s n" . dired-narrow))
-  :config
-  (setq-default dired-narrow-exit-when-one-left t
-                dired-narrow-enable-blinking t
-                dired-narrow-blink-time 0.3))
-
-(use-package wdired
-  :unless noninteractive
-  :after dired
-  :commands (wdired-mode
-             wdired-change-to-wdired-mode)
-  :bind (:map dired-mode-map
-	      ("E" . wdired-change-to-wdired-mode))
-  :config
-  (setq-default wdired-allow-to-change-permissions t
-                wdired-create-parent-directories t))
-
-(use-package dired-rsync
-  :unless noninteractive
-  :after dired
-  :commands (dired-rsync)
-  :bind (:map dired-mode-map
-              ("r" . dired-rsync)))
-
-(use-package trashed
-  :unless noninteractive
-  :commands (trashed)
-  :config
-  (setq trashed-action-confirmer 'y-or-n-p)
-  (setq trashed-use-header-line t)
-  (setq trashed-sort-key '("Date deleted" . t))
-  (setq trashed-date-format "%Y-%m-%d %H:%M:%S"))
-
-;; (use-package dired-sidebar
-;;   :unless noninteractive
-;;   :commands (dired-sidebar-toggle-sidebar)
-;;   :bind ("C-c C-n" . dired-sidebar-toggle-sidebar)
-;;   :init
-;;   (add-hook 'dired-sidebar-mode-hook
-;;             (lambda ()
-;;               (unless (file-remote-p default-directory)
-;;                 (auto-revert-mode))))
-;;   :config
-;;   (push 'toggle-window-split dired-sidebar-toggle-hidden-commands)
-;;   (push 'rotate-windows dired-sidebar-toggle-hidden-commands)
-;; 
-;;   ;; (setq dired-sidebar-subtree-line-prefix "__")
-;;   ;;(setq dired-sidebar-use-custom-font t)
-;;   (setq dired-sidebar-theme 'arrow)
-;;   (setq dired-sidebar-use-term-integration t))
-
-(use-package casual-dired
-  :after dired
-  :commands (casual-dired-tmenu)
-  :bind (:map dired-mode-map ("C-o" . 'casual-dired-tmenu)))
-
-(provide 'config-dired)
-;; config-dired.el ends here

@@ -1,164 +0,0 @@
-;;; config-editing.el --- -*- lexical-binding: t; -*-
-;; Time-stamp: <Last changed 2025-05-07 22:55:12 by vincent>
-;;; Commentary:
-;;; Editing configuration
-;;; Code:
-
-(setq-default enable-remote-dir-locals t)
-
-;; When finding file in non-existing directory, offer to create the
-;; parent directory.
-(defun with-buffer-name-prompt-and-make-subdirs ()
-  (let ((parent-directory (file-name-directory buffer-file-name)))
-    (when (and (not (file-exists-p parent-directory))
-               (y-or-n-p (format "Directory `%s' does not exist! Create it? " parent-directory)))
-      (make-directory parent-directory t))))
-
-(add-to-list 'find-file-not-found-functions #'with-buffer-name-prompt-and-make-subdirs)
-
-;; Fix long line "problems"
-;; Disable some right-to-left behavior that might not be needed.
-;; Learning arabic might make me change this, but for now..
-(setq-default bidi-paragraph-direction 'left-to-right)
-(if (version<= "27.1" emacs-version)
-    (setq bidi-inhibit-bpa t))
-;; Detect if the line in a buffer are so long they could have a performance impact
-(if (version<= "27.1" emacs-version)
-    (global-so-long-mode 1))
-
-(use-package saveplace
-  :unless noninteractive
-  :config
-  (save-place-mode 1))
-
-(use-package vundo
-  :bind (("M-u"   . undo)
-         ("M-U"   . undo-redo)
-         ("C-x u" . vundo)))
-
-(use-package whitespace
-  :unless noninteractive
-  :commands (whitespace-mode vde/toggle-invisibles)
-  :config
-  (setq-default whitespace-style '(face tabs spaces trailing space-before-tab newline indentation empty space-after-tab space-mark tab-mark newline-mark))
-  (defun vde/toggle-invisibles ()
-    "Toggles the display of indentation and space characters."
-    (interactive)
-    (if (bound-and-true-p whitespace-mode)
-        (whitespace-mode -1)
-      (whitespace-mode)))
-  :bind ("<f6>" . vde/toggle-invisibles))
-
-(use-package easy-kill
-  :unless noninteractive
-  :commands (easy-kill easy-mark)
-  :bind
-  (([remap kill-ring-save] . easy-kill)
-   ([remap mark-sexp] . easy-mark)
-   ("M-r" . easy-mark)))
-
-(use-package display-line-numbers
-  :unless noninteractive
-  :hook (prog-mode . display-line-numbers-mode)
-  :config
-  (setq-default display-line-numbers-type 'relative)
-  (defun vde/toggle-line-numbers ()
-    "Toggles the display of line numbers.  Applies to all buffers."
-    (interactive)
-    (if (bound-and-true-p display-line-numbers-mode)
-        (display-line-numbers-mode -1)
-      (display-line-numbers-mode)))
-  :bind ("<f7>" . vde/toggle-line-numbers))
-
-(add-hook 'prog-mode-hook 'toggle-truncate-lines)
-
-;; (use-package comment-dwim-2
-;;   :bind (([remap comment-dwim] . comment-dwim-2)))
-(use-package newcomment
-  :unless noninteractive
-  :config
-  (setq-default comment-empty-lines t
-                comment-fill-column nil
-                comment-multi-line t
-                comment-style 'multi-line)
-  (defun prot/comment-dwim (&optional arg)
-    "Alternative to `comment-dwim': offers a simple wrapper
-around `comment-line' and `comment-dwim'.
-
-If the region is active, then toggle the comment status of the
-region or, if the major mode defines as much, of all the lines
-implied by the region boundaries.
-
-Else toggle the comment status of the line at point."
-    (interactive "*P")
-    (if (use-region-p)
-        (comment-dwim arg)
-      (save-excursion
-        (comment-line arg))))
-
-  :bind (("C-;" . prot/comment-dwim)
-         ("C-:" . comment-kill)
-         ("M-;" . comment-indent)
-         ("C-x C-;" . comment-box)))
-
-(use-package delsel
-  :unless noninteractive
-  :config
-  (delete-selection-mode 1))
-
-(use-package emacs
-  :unless noninteractive
-  :custom
-  (repeat-on-final-keystroke t)
-  (set-mark-command-repeat-pop t)
-  :bind (("M-z" . zap-up-to-char)
-	 ("M-S-<up>" . duplicate-dwim)))
-
-(use-package visual-regexp
-  :unless noninteractive
-  :commands (vr/replace vr/query-replace)
-  :bind (("C-c r"   . vr/replace)
-         ("C-c %"   . vr/query-replace)))
-
-(use-package emacs
-  :config
-  :bind (("M-SPC" . cycle-spacing)
-         ("M-o" . delete-blank-lines)
-         ("<C-f6>" . tear-off-window)))
-
-(use-package subword
-  :diminish
-  :hook (prog-mode-hook . subword-mode))
-
-(use-package surround
-  :bind-keymap ("M-'" . surround-keymap))
-
-(use-package substitute
-  :bind (("M-<insert> s" . substitute-target-below-point)
-	 ("M-<insert> r" . substitute-target-above-point)
-	 ("M-<insert> d" . substitute-target-in-defun)
-	 ("M-<insert> b" . substitute-target-in-buffer)))
-
-(use-package jinx
-  :hook (emacs-startup . global-jinx-mode)
-  :bind (([remap ispell-word] . jinx-correct) ;; ("M-$" . jinx-correct)
-         ("C-M-$" . jinx-languages)))
-
-(use-package re-builder)
-(use-package casual-re-builder
-  :bind (:map
-	 reb-mode-map ("C-o" . casual-re-builder-tmenu)
-	 :map
-	 reb-lisp-mode-map ("C-o" . casual-re-builder-tmenu))
-  :after (re-builder))
-
-(use-package time-stamp
-  :custom
-  (time-stamp-active t)
-  (time-stamp-line-limit 10)     ; Check first 10 buffer lines for Time-stamp: <>
-  (time-stamp-format "Last changed %Y-%02m-%02d %02H:%02M:%02S by %u")
-  :hook
-  (before-save . time-stamp))
-
-(provide 'config-editing)
-;;; config-editing.el ends here

@@ -1,78 +0,0 @@
-;;; config-emms.el --- EMMS configuration to play music from Emacs -*- lexical-binding: t -*-
-
-;; Author: Vincent Demeester
-
-;; This file is not part of GNU Emacs
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This configuration is used for controlling playing music from Emacs.
-
-;;; Code:
-
-(use-package emms
-  :custom
-  (emms-player-list '(emms-player-mpv))
-  (emms-source-file-default-directory "~/desktop/music")
-  (emms-player-mpv-parameters '("--quiet" "--really-quiet" "--no-audio-display" "--force-window=no" "--vo=null"))
-  :config
-  (require 'emms-source-file)
-  (require 'emms-source-playlist)
-  (require 'emms-player-simple)
-  (require 'emms-player-mpv)
-  (require 'emms-playlist-mode)
-  (require 'emms-info)
-  (require 'emms-info-mp3info)
-  (require 'emms-info-ogginfo)
-  (require 'emms-info-opusinfo)
-  (require 'emms-info-metaflac)
-  (require 'emms-info-tinytag)
-  (require 'emms-info-exiftool)
-  (require 'emms-info-native)
-  (require 'emms-cache)
-  (require 'emms-mode-line)
-  (require 'emms-mark)
-  (require 'emms-show-all)
-  (require 'emms-streams)
-  (require 'emms-playing-time)
-  (require 'emms-browser)
-  (require 'emms-mode-line-icon)
-  (require 'emms-cue)
-  (require 'emms-bookmarks)
-  (require 'emms-last-played)
-  (require 'emms-metaplaylist-mode)
-  (require 'emms-stream-info)
-  (require 'emms-history)
-  (require 'emms-i18n)
-  (require 'emms-volume)
-  (require 'emms-playlist-limit)
-  (require 'emms-mpris)
-  (require 'emms-idapi-musicbrainz)
-  (require 'emms-idapi-browser)
-  
-  (setq emms-playlist-default-major-mode #'emms-playlist-mode)
-  (add-to-list 'emms-track-initialize-functions #'emms-info-initialize-track)
-  (setq emms-info-functions '(emms-info-native emms-info-cueinfo))
-  (setq emms-track-description-function #'emms-info-track-description)
-  (when (fboundp 'emms-cache)		; work around compiler warning
-    (emms-cache 1))
-  (emms-mode-line-mode 1)
-  (emms-mode-line-blank)
-  (emms-playing-time-mode 1)
-  (add-hook 'emms-player-started-hook #'emms-last-played-update-current))
-
-(provide 'config-emms)
-;;; config-emms.el ends here

@@ -1,89 +0,0 @@
-;;; config-files.el --- -*- lexical-binding: t; -*-
-;;; Commentary:
-;;; Files related configurations
-;;; Code:
-(use-package ffap
-  :hook
-  (after-init . ffap-bindings))
-;; (use-package autoinsert
-;;   :init
-;;   (setq-default auto-insert-query nil
-;;                 auto-insert-alist nil)
-;;   :config
-;;   (auto-insert-mode 1))
-
-(require 'hardhat)
-(global-hardhat-mode)
-
-(use-package files
-  :commands (revert-buffer)
-  :bind (("<f5>" . revert-buffer))
-  :config
-  (setq-default view-read-only t))
-
-(use-package envrc
-  :defer 2
-  :if (executable-find "direnv")
-  :bind (:map envrc-mode-map
-              ("C-c e" . envrc-command-map))
-  :config (envrc-global-mode))
-
-(use-package highlight-indentation
-  :unless noninteractive
-  :commands (highlight-indentation-mode highlight-indentation-current-column-mode)
-  :config
-  (set-face-background 'highlight-indentation-face "#e3e3d3")
-  (set-face-background 'highlight-indentation-current-column-face "#c3b3b3"))
-
-(defun vde/delete-this-file ()
-  "Delete the current file, and kill the buffer."
-  (interactive)
-  (or (buffer-file-name) (error "No file is currently being edited"))
-  (when (yes-or-no-p (format "Really delete '%s'?"
-                             (file-name-nondirectory buffer-file-name)))
-    (delete-file (buffer-file-name))
-    (kill-this-buffer)))
-
-(defun vde/rename-this-file-and-buffer (new-name)
-  "Renames both current buffer and file it's visiting to NEW-NAME."
-  (interactive "sNew name: ")
-  (let ((name (buffer-name))
-        (filename (buffer-file-name)))
-    (unless filename
-      (error "Buffer '%s' is not visiting a file!" name))
-    (if (get-buffer new-name)
-        (message "A buffer named '%s' already exists!" new-name)
-      (progn
-        (when (file-exists-p filename)
-          (rename-file filename new-name 1))
-        (rename-buffer new-name)
-        (set-visited-file-name new-name)))))
-
-(bind-key "C-c f D" #'vde/delete-this-file)
-(bind-key "C-c f R" #'vde/rename-this-file-and-buffer)
-
-;; Additional bindings for built-ins
-(bind-key "C-c f v d" #'add-dir-local-variable)
-(bind-key "C-c f v l" #'add-file-local-variable)
-(bind-key "C-c f v p" #'add-file-local-variable-prop-line)
-
-(defun vde/reload-dir-locals-for-current-buffer ()
-  "Reload dir locals for the current buffer."
-  (interactive)
-  (let ((enable-local-variables :all))
-    (hack-dir-local-variables-non-file-buffer)))
-
-(defun vde/reload-dir-locals-for-all-buffers-in-this-directory ()
-  "Reload dir-locals for all buffers in current buffer's `default-directory'."
-  (interactive)
-  (let ((dir default-directory))
-    (dolist (buffer (buffer-list))
-      (with-current-buffer buffer
-        (when (equal default-directory dir))
-        (vde/reload-dir-locals-for-current-buffer)))))
-
-(bind-key "C-c f v r" #'vde/reload-dir-locals-for-current-buffer)
-(bind-key "C-c f v r" #'vde/reload-dir-locals-for-all-buffers-in-this-directory)
-
-(provide 'config-files)
-;;; config-files.el ends here

@@ -1,61 +0,0 @@
-;;; config-keybindings.el --- -*- lexical-binding: t -*-
-;;; Commentary:
-;;; Key binding specific configuration
-;;; Code:
-
-;; Disable C-x C-n to avoid the disabled command buffer
-(unbind-key "C-x C-n" global-map)
-
-;; Remap dynamic-abbrev to hippie-expand
-;; See https://www.masteringemacs.org/article/text-expansion-hippie-expand
-(global-set-key [remap dabbrev-expand] 'hippie-expand)
-
-(use-package vde-simple
-  :demand t
-  :preface
-  (dolist (key '("C-M-<SPC>" "M-<SPC>"))
-    (global-unset-key (kbd key)))
-  :bind
-  (("M-<SPC> e" . dired-jump)
-   ("M-<SPC> x" . execute-extended-command)
-   ("M-<SPC> :" . eval-expression)
-   ("M-<SPC> <SPC>" . (lambda()(interactive)
-			(let ((consult-buffer-filter))
-			  (add-to-list 'consult-buffer-filter "\\*")
-			  (call-interactively 'consult-buffer))))
-   ("M-<SPC> f f" . project-find-file)
-   ("M-<SPC> f o" . ffap)
-   ("M-<SPC> f q" . read-only-mode)
-   ("M-<SPC> f r" . consult-recent-file)
-   ("M-<SPC> q q" . save-buffers-kill-terminal)))
-
-;; TODO add general configuration here
-;; (use-package general
-;;   :config
-;;   (dolist (key '("C-M-<SPC>" "M-<SPC>"))
-;;     (global-unset-key (kbd key)))
-;;   (general-create-definer general-leader :prefix "M-<SPC>")
-;;   (general-def "C-M-<SPC>" 'cycle-spacing)
-;; 
-;;   (general-leader
-;;     "z"   #'(repeat :which-key "Repeat")
-;;     "u"   #'(universal-argument :which-key "Universal argument")
-;;     "e"   #'(dired-jump :which-key "Dired")
-;;     "x"   #'(execute-extended-command :which-key "M-x")
-;;     "f"   '(:ignore t :which-key "File")
-;;     "SPC" #'((lambda()(interactive)
-;;                (let ((consult-buffer-filter))
-;;                  (add-to-list 'consult-buffer-filter "\\*")
-;;                  (call-interactively 'consult-buffer))) :wk "Switch to Buffer")
-;;     ":"   #'(eval-expression :wk "Eval expression")
-;;     "ff"  #'(project-find-file :which-key "Find in Project")
-;;     "fo"  #'(ffap :which-key "Find with context")
-;;     "fq"  #'(read-only-mode :which-key "Toggle Read Only")
-;;     "fr"  #'(consult-recent-file :which-key "Recent File")
-;;     "q"   #'(:ignore t :wk "Quit")
-;;     "qq"  #'(save-buffers-kill-terminal :wk "Quit Emacs")
-;;    ))
-
-;; 
-(provide 'config-keybindings)
-;;; config-keybindings.el ends here

@@ -1,283 +0,0 @@
-;;; config-llm.el --- -*- lexical-binding: t -*-
-;;; Commentary:
-;;; LLM configuration
-;;; Code:
-
-(use-package copilot
-  ;; :hook
-  ;; (prog-mode . copilot-mode)
-  ;; (markdown-mode . copilot-mode) ;; Enable this on-demand only
-  ;; (text-mode . copilot-mode) ;; I may not want copilot in org-mode for example.
-  ;; (log-edit-mode . copilot-mode)
-  ;; (vc-git-log-edit-mode . copilot-mode)
-  :bind
-  (:map copilot-completion-map
-        ("C-g" . copilot-clear-overlay)
-        ("C-j" . copilot-next-completion)
-        ("C-k" . copilot-previous-completion)
-        ("M-RET" . copilot-accept-completion)
-        ("C-f" . copilot-accept-completion)
-        ("C-l" . copilot-panel-complete))
-  :custom
-  (copilot-idle-delay 1)
-  (copilot-max-char -1)
-  (copile-indent-offset-warning-disable t))
-
-(setq copilot-chat-commit-prompt "Here is the result of running `git diff --cached`. Based on this, suggest a **Conventional Commit message**. Ensure the message includes both a clear title describing the change and a body explaining the change. Do not invent anything new; just comprehend the diff and explain it.
-
-- Do not add extra markdown formatting.
-- Always make sure the commit message is in markdown format.
-- Do not include any additional text outside the commit message.
-- Make sure the title is a max of 50 characters long and not more.
-- The summaries need to be wrapped to 80 characters long and not more (or break the line).
-- Avoid overused words and phrases often associated with AI-generated text. Do not use the following words: *delve, tapestry, vibrant, landscape, realm, embark, excels, vital, comprehensive, intricate, pivotal, moreover, arguably, notably.*
-- Avoid the following phrases: *dive into, it’s important to note, it’s important to remember, certainly, here are, important to consider, based on the information provided, remember that, navigating the [landscape]/[complexities of], delving into the intricacies of, a testament to.*
-- Do not include any generic AI disclaimers or self-references (e.g., \"As an AI language model...\").
-
-# Conventional Commits 1.0.0
-
-## Summary
-
-Conventional Commits is a specification for commit messages that follows these rules to ensure clarity and consistency:
-
-### Format
-
-`<type>[optional scope]: <description>`
-
-`[body]`
-
-### Types
-
-1. **fix:** A bug fix correlating to a PATCH version.
-2. **feat:** A new feature correlating to a MINOR version.
-
-Other types include:
-
-- **build:** Changes to build systems or dependencies.
-- **chore:** Maintenance tasks (e.g., dependency updates).
-- **ci:** Changes to CI configuration.
-- **refactor:** Code changes not adding features or fixing bugs.
-- **test:** Changes to or addition of tests.
-
-Here is the result of `git diff --cached`:")
-
-(use-package copilot-chat
-  :custom
-  (copilot-chat-model "claude-3.7-sonnet")
-  :bind
-  (("C-c a c p" . copilot-chat-prompt-transient-menu)
-   ("C-c a c c" . copilot-chat-insert-commit-message)
-   ("C-c a c o" . copilot-chat-optimize)
-   ("C-c a c m" . copilot-chat-set-model)
-   ("C-c a c w" . my-copilot-chat-copy-source-block)
-   ("C-c a c y" . copilot-chat-yank)
-   ("C-c a c Y" . copilot-chat-yank-pop)
-   ("C-c a c b" . copilot-chat-display)
-   ("C-c a c a" . copilot-chat-switch-to-buffer)
-   ("C-c a c f" . copilot-chat-custom-prompt-function)
-   ("C-c a c s" . copilot-chat-custom-prompt-selection)
-   (:map embark-general-map
-	 ("M a d" . copilot-chat-doc)
-	 ("M a e" . copilot-chat-explain)
-	 ("M a o" . copilot-chat-optimize)
-	 ("M a p" . copilot-chat-custom-prompt-selection)
-	 ("M a r" . copilot-chat-review))
-   (:map copilot-chat-prompt-mode-map
-         ("C-M-w" . my-copilot-chat-copy-source-block)
-         ("C-q" . delete-window)))
-  :config
-  (setq copilot-chat-prompts copilot-chat-markdown-prompt)
-  (defun my-copilot-chat-copy-source-block ()
-    "Copy the source block at point to kill ring."
-    (interactive)
-    (let* ((temp-buffer-name "*copilot-kr-temp*"))
-      (with-current-buffer (get-buffer-create temp-buffer-name)
-        (erase-buffer)
-        (copilot-chat-yank)
-        (kill-ring-save (point-min) (point-max))
-        (kill-buffer))
-      (message "Source block copied to kill ring")))
-
-  (defun copilot-chat-prompt-transient-menu ()
-    "Show a transient menu for Copilot Chat actions."
-    (interactive)
-    (unless (use-region-p)
-      (mark-defun))
-    (transient-define-prefix copilot-chat-prompt-menu ()
-      "Copilot Chat Menu"
-      ["Copilot Chat Actions"
-       ["Target"
-        ("c" "Commit" copilot-chat-insert-commit-message)
-        ("o" "Optimize" copilot-chat-optimize)
-        ("r" "Review" copilot-chat-review)
-        ("f" "Fix" copilot-chat-fix)
-        ("e" "Explain" copilot-chat-explain)
-        ("d" "Doc" copilot-chat-doc)]
-       ["Commands"
-        ("d" "Display chat" copilot-chat-display)
-        ("h" "Hide chat" copilot-chat-hide)
-        ("R" "Reset & reopen" (lambda ()
-                                (interactive)
-                                (copilot-chat-reset)
-                                (copilot-chat-display)))
-        ("x" "Reset" copilot-chat-reset)
-        ("g" "Go to buffer" copilot-chat-switch-to-buffer)
-        ("m" "Set model" copilot-chat-set-model)
-        ("q" "Quit" transient-quit-one)]
-       ["Actions"
-        ("p" "Custom prompt" copilot-chat-custom-prompt-selection)
-        ("i" "Ask and insert" copilot-chat-ask-and-insert)
-        ("m" "Insert commit message" copilot-chat-insert-commit-message)
-        ("b" "Buffers" copilot-chat-transient-buffers)]
-       ["Data"
-        ("y" "Yank last code block" copilot-chat-yank)
-        ("s" "Send code to buffer" copilot-chat-send-to-buffer)]])
-    (copilot-chat-prompt-menu))
-  :after (copilot embark)
-  :commands
-  (copilot-chat-mode))
-
-(use-package aidermacs
-  :bind (("C-c a a m" . aidermacs-transient-menu))
-  :custom
-  (aidermacs-use-architect-mode t)
-  (aidermacs-auto-commits nil)
-  :config
-  (aidermacs-setup-minor-mode))
-
-(use-package gptel
-  :commands (gptel gptel-mode)
-  :bind (("C-c a g" . gptel))
-  :hook
-  (gptel-mode . visual-line-mode)
-  :bind
-  (:map gptel-mode-map
-        ("C-c C-k" . gptel-abort)
-        ("C-c C-m" . gptel-menu)
-        ("C-c C-c" . gptel-send))
-  :custom
-  (gptel-default-mode #'markdown-mode)
-  :config
-  ;; (general-leader
-  ;;   "o"   '(:ignore t :wk "GPTel")
-  ;;   "o o" '(gptel :wk "Start GPTel")
-  ;;   "o m" '(gptel-menu :wk "GPTel menu"))
-  (setq mcp-hub-servers
-	`(("jira" :command "/home/vincent/src/github.com/chmouel/jayrah/.venv/bin/jayrah" :args ("mcp"))
-	  ("github" :command "github-mcp-server" :args ("stdio")
-	   :env (:GITHUB_PERSONAL_ACCESS_TOKEN ,(passage-get "github/vdemeester/github-mcp-server")))))
-  (require 'gptel-curl)
-  (require 'gptel-gemini)
-  (require 'gptel-ollama)
-  (require 'gptel-transient)
-  (require 'gptel-integrations)
-  (require 'gptel-rewrite)
-  (require 'gptel-org)
-  (require 'gptel-openai)
-  (require 'gptel-openai-extras)
-  (require 'gptel-autoloads)
-  (gptel-mcp-connect)
-  (setq gptel-model 'gemini-2.0-flash
-	gptel-backend (gptel-make-gemini "Gemini"
-			:key (passage-get "ai/gemini/api_key"))
-	)
-
-  (gptel-make-deepseek "Deepseek"
-		       :key  (passage-get "ai/deepseek/api_key")
-		       ;; :models '("deepseek-reasoner" "deepseek-chat" )
-		       )
-
-  (gptel-make-openai "MistralLeChat"
-    :host "api.mistral.ai/v1"
-    :endpoint "/chat/completions"
-    :protocol "https"
-    :key (passage-get "ai/mistralai/api_key")
-    :models '("mistral-small"))
-  
-  (gptel-make-openai "OpenRouter"
-    :host "openrouter.ai"
-    :endpoint "/api/v1/chat/completions"
-    :stream t
-    :key (passage-get "ai/openroute/api_key")
-    :models '(cognitivecomputations/dolphin3.0-mistral-24b:free
-	      cognitivecomputations/dolphin3.0-r1-mistral-24b:free
-	      deepseek/deepseek-r1-zero:free
-	      deepseek/deepseek-chat:free
-	      deepseek/deepseek-r1-distill-qwen-32b:free
-	      deepseek/deepseek-r1-distill-llama-70b:free
-	      google/gemini-2.0-flash-lite-preview-02-05:free
-	      google/gemini-2.0-pro-exp-02-05:free
-	      google/gemini-2.5-pro-exp-03-25
-	      google/gemini-2.5-pro-exp-03-25:free
-	      google/gemma-3-12b-it:free
-	      google/gemma-3-27b-it:free
-	      google/gemma-3-4b-it:free
-	      mistralai/mistral-small-3.1-24b-instruct:free
-	      open-r1/olympiccoder-32b:free
-	      qwen/qwen2.5-vl-3b-instruct:free
-	      qwen/qwen-2.5-coder-32b-instruct:free
-	      qwen/qwq-32b:free
-              codellama/codellama-70b-instruct
-              google/gemini-pro
-              google/palm-2-codechat-bison-32k
-              meta-llama/codellama-34b-instruct
-              mistralai/mixtral-8x7b-instruct
-	      openai/gpt-3.5-turbo))
-
-  (gptel-make-openai "Groq"
-    :host "api.groq.com"
-    :endpoint "/openai/v1/chat/completions"
-    :stream t
-    :key (passage-get "ai/groq/wakasu")
-    :models '("llama-3.3-70b-versatile"
-              "llama-3.1-70b-versatile"
-              "llama-3.1-8b-instant"
-              "llama3-70b-8192"
-              "llama3-8b-8192"
-              "deepseek-r1-distill-qwen-32b"
-              "deepseek-r1-distill-llama-70b-specdec"
-              "qwen-2.5-coder-32b"
-              "mixtral-8x7b-32768"
-              "gemma-7b-it"))
-  
-  (gptel-make-ollama "Ollama"
-    :host "localhost:11434"
-    :stream t
-    :models '("smollm:latest"
-              "llama3.1:latest"
-              "deepseek-r1:latest"
-              "mistral-small:latest"
-              "deepseek-r1:7b"
-              "nomic-embed-text:latest")))
-
-(use-package gptel-context
-  :after gptel
-  :config
-  ;; (general-leader
-  ;;   "o c" '(:ignore t :which-key "GPTel Context")
-  ;;   "o c a" 'gptel-context-add
-  ;;   "o c r" 'gptel-context-remove
-  ;;   "o c s" '(lambda ()
-  ;;              (interactive)
-  ;;              (gptel-context-remove-all nil)
-  ;;              (unless (use-region-p)
-  ;;                (mark-defun))
-  ;;              (gptel-context-add)
-  ;;              (my-switch-to-gptel-buffer)))
-  )
-
-(defun my-switch-to-gptel-buffer (&optional arg)
-  "Switch to the most recent buffer with gptel-mode enabled or start it."
-  (interactive "P")
-  (let (target-buffer)
-    (setq target-buffer (cl-find-if 
-                         (lambda (buf)
-                           (with-current-buffer buf
-                             (bound-and-true-p gptel-mode)))
-                         (buffer-list)))
-    (unless target-buffer
-      (call-interactively 'gptel))
-    (pop-to-buffer target-buffer)))
-
-(provide 'config-llm)
-;;; config-llm.el ends here