diff --git a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-langs.el b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-langs.el index cf3b7fe0..c93b49ed 100644 --- a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-langs.el +++ b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-langs.el @@ -79,7 +79,8 @@ (setq eglot-autoshutdown t)) ;;;; Handle performance for very long lines (so-long.el) -(global-so-long-mode 1) +(prot-emacs-configure + (global-so-long-mode 1)) ;;; Markdown (markdown-mode) (prot-emacs-configure @@ -87,7 +88,8 @@ (setq markdown-fontify-code-blocks-natively t)) ;;; csv-mode -(prot-emacs-install csv-mode) +(prot-emacs-configure + (prot-emacs-install csv-mode)) ;;; SXHKDRC mode (one of my many packages) (prot-emacs-configure @@ -284,7 +286,8 @@ retroactively follow that order." (consult-denote-mode 1)))) ;;;; Denote Org extras (denote-org) -(prot-emacs-install denote-org) +(prot-emacs-configure + (prot-emacs-install denote-org)) ;;;; Denote Sequence notes or folgezettel (denote-sequence) (prot-emacs-configure @@ -299,7 +302,8 @@ retroactively follow that order." (setq denote-sequence-scheme 'alphanumeric)) ;;;; Denote Markdown extras (denote-markdown) -(prot-emacs-install denote-markdown) +(prot-emacs-configure + (prot-emacs-install denote-markdown)) ;;;; Denote Journal extras (denote-journal) (prot-emacs-configure diff --git a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-org.el b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-org.el index 0b6b9bb1..6f8e09c4 100644 --- a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-org.el +++ b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-org.el @@ -125,10 +125,11 @@ pulsar))) ;;;; `org-indent-mode' and related -(with-eval-after-load 'org - (setq org-adapt-indentation nil) ; No, non, nein, όχι to literal indentation! - (setq org-indent-mode-turns-on-hiding-stars nil) - (setq org-indent-indentation-per-level 4)) +(prot-emacs-configure + (with-eval-after-load 'org + (setq org-adapt-indentation nil) ; No, non, nein, όχι to literal indentation! + (setq org-indent-mode-turns-on-hiding-stars nil) + (setq org-indent-indentation-per-level 4))) ;;;; refile, todo (with-eval-after-load 'org @@ -187,35 +188,39 @@ (setq org-enforce-todo-checkbox-dependencies t)) ;;;; tags -(with-eval-after-load 'org - (setq org-tag-alist nil) - (setq org-auto-align-tags nil) - (setq org-tags-column 0)) +(prot-emacs-configure + (with-eval-after-load 'org + (setq org-tag-alist nil) + (setq org-auto-align-tags nil) + (setq org-tags-column 0))) ;;;; log -(with-eval-after-load 'org - (setq org-log-done 'time) - (setq org-log-into-drawer t) - (setq org-log-note-clock-out nil) - (setq org-log-redeadline 'time) - (setq org-log-reschedule 'time)) +(prot-emacs-configure + (with-eval-after-load 'org + (setq org-log-done 'time) + (setq org-log-into-drawer t) + (setq org-log-note-clock-out nil) + (setq org-log-redeadline 'time) + (setq org-log-reschedule 'time))) ;;;; links -(with-eval-after-load 'org - (setq org-return-follows-link t) - (setq org-link-context-for-files t) - (setq org-link-keep-stored-after-insertion nil) - (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id)) +(prot-emacs-configure + (with-eval-after-load 'org + (setq org-return-follows-link t) + (setq org-link-context-for-files t) + (setq org-link-keep-stored-after-insertion nil) + (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id))) ;;;; code blocks -(with-eval-after-load 'org - (setq org-confirm-babel-evaluate nil) - (setq org-src-window-setup 'current-window) - (setq org-edit-src-persistent-message nil) - (setq org-src-fontify-natively t) - (setq org-src-preserve-indentation t) - (setq org-src-tab-acts-natively t) - (setq org-edit-src-content-indentation 0)) +(prot-emacs-configure + (with-eval-after-load 'org + (setq org-confirm-babel-evaluate nil) + (setq org-src-window-setup 'current-window) + (setq org-edit-src-persistent-message nil) + (setq org-src-fontify-natively t) + (setq org-src-preserve-indentation t) + (setq org-src-tab-acts-natively t) + (setq org-edit-src-content-indentation 0))) ;;;; export (prot-emacs-configure diff --git a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-window.el b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-window.el index 6e3d89e9..8f374ed9 100644 --- a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-window.el +++ b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-window.el @@ -146,9 +146,11 @@ (setq window-min-height 3) (setq window-min-width 30)) -(prot-emacs-hook (epa-info-mode-hook help-mode-hook custom-mode-hook) visual-line-mode) +(prot-emacs-configure + (prot-emacs-hook (epa-info-mode-hook help-mode-hook custom-mode-hook) visual-line-mode)) -(prot-emacs-hook (world-clock-mode-hook calendar-mode-hook) prot-common-truncate-lines-silently) +(prot-emacs-configure + (prot-emacs-hook (world-clock-mode-hook calendar-mode-hook) prot-common-truncate-lines-silently)) (prot-emacs-configure (prot-emacs-keybind global-map diff --git a/emacs/.emacs.d/prot-emacs.org b/emacs/.emacs.d/prot-emacs.org index 4d8f9575..0cfb64fe 100644 --- a/emacs/.emacs.d/prot-emacs.org +++ b/emacs/.emacs.d/prot-emacs.org @@ -6423,7 +6423,8 @@ For the cases where I am fine with ~visual-line-mode~, I enable the mode by adding it to these mode hooks. #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-window.el" -(prot-emacs-hook (epa-info-mode-hook help-mode-hook custom-mode-hook) visual-line-mode) +(prot-emacs-configure + (prot-emacs-hook (epa-info-mode-hook help-mode-hook custom-mode-hook) visual-line-mode)) #+end_src *** The =prot-emacs-window.el= settings to truncate some buffers silently @@ -6447,7 +6448,8 @@ The whole point of using hooks is to make these decisions on a case-by-case basis. #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-window.el" -(prot-emacs-hook (world-clock-mode-hook calendar-mode-hook) prot-common-truncate-lines-silently) +(prot-emacs-configure + (prot-emacs-hook (world-clock-mode-hook calendar-mode-hook) prot-common-truncate-lines-silently)) #+end_src *** The =prot-emacs-window.el= section key bindings @@ -7570,10 +7572,11 @@ instead of =2=. #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-org.el" ;;;; `org-indent-mode' and related -(with-eval-after-load 'org - (setq org-adapt-indentation nil) ; No, non, nein, όχι to literal indentation! - (setq org-indent-mode-turns-on-hiding-stars nil) - (setq org-indent-indentation-per-level 4)) +(prot-emacs-configure + (with-eval-after-load 'org + (setq org-adapt-indentation nil) ; No, non, nein, όχι to literal indentation! + (setq org-indent-mode-turns-on-hiding-stars nil) + (setq org-indent-indentation-per-level 4))) #+end_src *** The =prot-emacs-org.el= Org to-do and refile settings @@ -7728,10 +7731,11 @@ it. #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-org.el" ;;;; tags -(with-eval-after-load 'org - (setq org-tag-alist nil) - (setq org-auto-align-tags nil) - (setq org-tags-column 0)) +(prot-emacs-configure + (with-eval-after-load 'org + (setq org-tag-alist nil) + (setq org-auto-align-tags nil) + (setq org-tags-column 0))) #+end_src *** The =prot-emacs-org.el= Org time/state logging @@ -7749,12 +7753,13 @@ mistakes or figure out intent in the absence of further clarification #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-org.el" ;;;; log -(with-eval-after-load 'org - (setq org-log-done 'time) - (setq org-log-into-drawer t) - (setq org-log-note-clock-out nil) - (setq org-log-redeadline 'time) - (setq org-log-reschedule 'time)) +(prot-emacs-configure + (with-eval-after-load 'org + (setq org-log-done 'time) + (setq org-log-into-drawer t) + (setq org-log-note-clock-out nil) + (setq org-log-redeadline 'time) + (setq org-log-reschedule 'time))) #+end_src *** The =prot-emacs-org.el= Org link settings @@ -7803,11 +7808,12 @@ I bind ~org-store-link~ in main section of the Org configuration: #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-org.el" ;;;; links -(with-eval-after-load 'org - (setq org-return-follows-link t) - (setq org-link-context-for-files t) - (setq org-link-keep-stored-after-insertion nil) - (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id)) +(prot-emacs-configure + (with-eval-after-load 'org + (setq org-return-follows-link t) + (setq org-link-context-for-files t) + (setq org-link-keep-stored-after-insertion nil) + (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id))) #+end_src *** The =prot-emacs-org.el= Org code block settings @@ -7877,14 +7883,15 @@ This is a wonderful world of possibilities! #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-org.el" ;;;; code blocks -(with-eval-after-load 'org - (setq org-confirm-babel-evaluate nil) - (setq org-src-window-setup 'current-window) - (setq org-edit-src-persistent-message nil) - (setq org-src-fontify-natively t) - (setq org-src-preserve-indentation t) - (setq org-src-tab-acts-natively t) - (setq org-edit-src-content-indentation 0)) +(prot-emacs-configure + (with-eval-after-load 'org + (setq org-confirm-babel-evaluate nil) + (setq org-src-window-setup 'current-window) + (setq org-edit-src-persistent-message nil) + (setq org-src-fontify-natively t) + (setq org-src-preserve-indentation t) + (setq org-src-tab-acts-natively t) + (setq org-edit-src-content-indentation 0))) #+end_src *** The =prot-emacs-org.el= Org export settings @@ -8691,7 +8698,8 @@ in case. #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-langs.el" ;;;; Handle performance for very long lines (so-long.el) -(global-so-long-mode 1) +(prot-emacs-configure + (global-so-long-mode 1)) #+end_src *** The =prot-emacs-langs.el= settings for ~markdown-mode~ @@ -8726,7 +8734,8 @@ or space) and shows a tab stop in its stead. #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-langs.el" ;;; csv-mode -(prot-emacs-install csv-mode) +(prot-emacs-configure + (prot-emacs-install csv-mode)) #+end_src *** The =prot-emacs-langs.el= settings for ~sxhkdrc-mode~ @@ -9152,7 +9161,8 @@ Watch: #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-langs.el" ;;;; Denote Org extras (denote-org) -(prot-emacs-install denote-org) +(prot-emacs-configure + (prot-emacs-install denote-org)) #+end_src **** The =prot-emacs-langs.el= extension for Denote sequence notes or folgezettel (~denote-sequence~) @@ -9206,7 +9216,8 @@ standardised way to define custom link types). #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-langs.el" ;;;; Denote Markdown extras (denote-markdown) -(prot-emacs-install denote-markdown) +(prot-emacs-configure + (prot-emacs-install denote-markdown)) #+end_src **** The =prot-emacs-langs.el= extension for Denote Journal extras (~denote-journal~)