diff --git a/configuration.org b/configuration.org index ac762fa..49040ee 100644 --- a/configuration.org +++ b/configuration.org @@ -3,38 +3,6 @@ Now that we have package management configured we can set up defaults more easily. This includes every builtin packages, font faces, and the like. #+begin_src emacs-lisp -(use-package emacs - :ensure nil - :init - ;; Required for Consult/Vertico - (defun crm-indicator (args) - (cons (format "[CRM%s] %s" - (replace-regexp-in-string - "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" "" - crm-separator) - (car args)) - (cdr args))) - (advice-add #'completing-read-multiple :filter-args #'crm-indicator) - (setq frame-title-format '((:eval (concat system-name - ": " - (if (buffer-file-name) - (abbreviate-file-name (buffer-file-name)) - "%b"))))) - :custom - (user-full-name "Gergely Polonkai") - (user-mail-address "gergely@polonkai.eu") - (kill-read-only-ok t) - (use-dialog-box nil) - (cursor-type 'bar) - (echo-keystrokes .01) - (fill-column 120) - (initial-scratch-message "") - (minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt)) - (enable-recursive-minibuffers t) - (completion-cycle-threshold 3) - (tab-always-indent 'complete) - :hook - (minibuffer-setup . cursor-intangible-mode)) #+end_src ** Set Org’s main directory diff --git a/init.el b/init.el index b5f5919..28d622c 100644 --- a/init.el +++ b/init.el @@ -65,6 +65,46 @@ (load "gpolonkai/file-utils") (load "gpolonkai/magit-utils") +(defun crm-indicator (args) + "Generate a prompt for `completing-read-multiple'. + +ARGS is a cons cell of two strings, which will be used in the prompt in reverse +order." + (cons (format "[CRM%s] %s" + (replace-regexp-in-string + "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" + "" + crm-separator) + (car args)) + (cdr args))) + +(use-package emacs + :ensure nil + :init + ;; Required for Consult/Vertico + (advice-add #'completing-read-multiple :filter-args #'crm-indicator) + (setq frame-title-format + '((:eval (concat system-name + ": " + (if (buffer-file-name) + (abbreviate-file-name (buffer-file-name)) + "%b"))))) + :custom + (user-full-name "Gergely Polonkai") + (user-mail-address "gergely@polonkai.eu") + (kill-read-only-ok t) + (use-dialog-box nil) + (cursor-type 'bar) + (echo-keystrokes .01) + (fill-column 120) + (initial-scratch-message "") + (minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt)) + (enable-recursive-minibuffers t) + (completion-cycle-threshold 3) + (tab-always-indent 'complete) + :hook + (minibuffer-setup . cursor-intangible-mode)) + ;; I started moving my configuration to this Org file. It’s easier to document this way. (org-babel-load-file (expand-file-name "configuration.org" user-emacs-directory))