emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dev: merging from master

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-06-29 15:17:15 -04:00
commit 6bcf221716
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/lang/org/config.el
View file

@ -1153,15 +1153,12 @@ between the two."
(use-package! org-crypt ; built-in (use-package! org-crypt ; built-in
:when (modulep! +crypt) :when (modulep! +crypt)
:commands org-encrypt-entries org-encrypt-entry org-decrypt-entries org-decrypt-entry :commands org-encrypt-entries org-encrypt-entry org-decrypt-entries org-decrypt-entry
:hook (org-reveal-start . org-decrypt-entry) :hook (org-load . org-crypt-use-before-save-magic)
:preface :preface
;; org-crypt falls back to CRYPTKEY property then `epa-file-encrypt-to', which ;; org-crypt falls back to CRYPTKEY property then `epa-file-encrypt-to', which
;; is a better default than the empty string `org-crypt-key' defaults to. ;; is a better default than the empty string `org-crypt-key' defaults to.
(defvar org-crypt-key nil) (defvar org-crypt-key nil)
(after! org (after! org (add-to-list 'org-tags-exclude-from-inheritance "crypt")))
(add-to-list 'org-tags-exclude-from-inheritance "crypt")
(add-hook! 'org-mode-hook
(add-hook 'before-save-hook 'org-encrypt-entries nil t))))
(use-package! org-clock ; built-in (use-package! org-clock ; built-in
@ -1462,6 +1459,9 @@ between the two."
(setq org-num-face '(:inherit org-special-keyword :underline nil :weight bold) (setq org-num-face '(:inherit org-special-keyword :underline nil :weight bold)
org-num-skip-tags '("noexport" "nonum")) org-num-skip-tags '("noexport" "nonum"))
;; Other org properties are all-caps. Be consistent.
(setq org-effort-property "EFFORT")
;; Prevent modifications made in invisible sections of an org document, as ;; Prevent modifications made in invisible sections of an org document, as
;; unintended changes can easily go unseen otherwise. ;; unintended changes can easily go unseen otherwise.
(setq org-catch-invisible-edits 'smart) (setq org-catch-invisible-edits 'smart)

2
modules/lang/org/packages.el
View file

@ -66,7 +66,7 @@
(when (modulep! :editor evil +everywhere) (when (modulep! :editor evil +everywhere)
(package! evil-org (package! evil-org
:recipe (:host github :repo "hlissner/evil-org-mode") :recipe (:host github :repo "doomelpa/evil-org-mode")
:pin "a9706da260c45b98601bcd72b1d2c0a24a017700")) :pin "a9706da260c45b98601bcd72b1d2c0a24a017700"))
(when (modulep! :tools pdf) (when (modulep! :tools pdf)
(package! org-pdftools :pin "4e420233a153a9c4ab3d1a7e1d7d3211c836f0ac")) (package! org-pdftools :pin "4e420233a153a9c4ab3d1a7e1d7d3211c836f0ac"))

7
modules/tools/lsp/+eglot.el
View file

@ -62,9 +62,12 @@ server an expensive restart when its buffer is reverted."
(use-package! consult-eglot (use-package! consult-eglot
:defer t
:when (modulep! :completion vertico) :when (modulep! :completion vertico)
:init (define-key eglot-mode-map [remap xref-find-apropos] #'consult-eglot-symbols)) :defer t
:init
(map! :after eglot
:map eglot-mode-map
[remap xref-find-apropos] #'consult-eglot-symbols))
(use-package! flycheck-eglot (use-package! flycheck-eglot