From 2db4ce76077ebda573a03ab44cfab6c3e5243145 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Thu, 7 Aug 2025 17:01:23 +0200 Subject: [PATCH] Move shortcut function to utilities package This is where it should be, all time long. --- init.el | 33 +-------------------------------- site-lisp/db-utils.el | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/init.el b/init.el index 45f18e9..1c877f6 100644 --- a/init.el +++ b/init.el @@ -465,6 +465,7 @@ split horizontally again, but this extra work should not matter much." db/find-default-org-file db/find-default-refile-file db/ement-connect + db/shortcuts db/hex-to-ascii db/text-to-hex turn-on-lispy-when-available @@ -2488,38 +2489,6 @@ Note that this workaround is incomplete, as explained in this comment." ;; * Navigation -(defun db/shortcuts () - "Open helm completion on common locations." - (interactive) - (let (sources) - (push (list :name "Frequently Used" - :items (mapcar #'(lambda (entry) - (cons (car entry) - (caddr entry))) - db/frequently-used-features) - :annotate #'(lambda (_) "") - :action #'call-interactively) - sources) - (push 'consult--source-bookmark - sources) - (when (file-directory-p db/important-documents-path) - (let ((search-path (expand-file-name db/important-documents-path))) - (push (list :name "Important Files" - :narrow ?f - :items (mapcar #'(lambda (file) - ;; Display only relative path, - ;; but keep absolute path for - ;; actions - (cons (string-remove-prefix search-path file) - file)) - (directory-files-recursively search-path "")) - :annotate #'(lambda (_) "") - :action #'db/system-open) - sources))) - (consult--multi (nreverse sources) - :require-match t - :sort nil))) - (use-package ace-window :ensure t :commands (ace-window diff --git a/site-lisp/db-utils.el b/site-lisp/db-utils.el index 511ea1a..1b3a0e3 100644 --- a/site-lisp/db-utils.el +++ b/site-lisp/db-utils.el @@ -30,6 +30,7 @@ (autoload 'find-libary-name "find-func") (autoload 'lm-header "lisp-mnt") (autoload 'rectangle-exchange-point-and-mark "rect") +(autoload 'consult--multi "consult") (declare-function w32-shell-execute "w32fns.c") (declare-function org-password-manager-get-password-by-id nil) @@ -88,6 +89,38 @@ (ement-connect :user-id db/matrix-user-id :password password))) +(defun db/shortcuts () + "Open helm completion on common locations." + (interactive) + (let (sources) + (push (list :name "Frequently Used" + :items (mapcar #'(lambda (entry) + (cons (car entry) + (caddr entry))) + db/frequently-used-features) + :annotate #'(lambda (_) "") + :action #'call-interactively) + sources) + (push 'consult--source-bookmark + sources) + (when (file-directory-p db/important-documents-path) + (let ((search-path (expand-file-name db/important-documents-path))) + (push (list :name "Important Files" + :narrow ?f + :items (mapcar #'(lambda (file) + ;; Display only relative path, + ;; but keep absolute path for + ;; actions + (cons (string-remove-prefix search-path file) + file)) + (directory-files-recursively search-path "")) + :annotate #'(lambda (_) "") + :action #'db/system-open) + sources))) + (consult--multi (nreverse sources) + :require-match t + :sort nil))) + ;;; General Utilities