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

dev: merge branch 'pr7339' into emenel

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-03-09 09:26:27 -05:00
commit 6b57ada323
16 changed files with 97 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

40
modules/tools/biblio/config.el
View file

@ -3,9 +3,7 @@
;;
;;; `org-cite'
(use-package! oc
:defer t
:config
(after! oc
(setq org-cite-global-bibliography
(ensure-list
(or (bound-and-true-p citar-bibliography)
@ -13,16 +11,30 @@
;; Setup export processor; default csl/citeproc-el, with biblatex for
;; latex
org-cite-export-processors '((latex biblatex) (t csl))
org-support-shift-select t))
org-support-shift-select t)
(require 'oc-biblatex))
;; oc-csl requires citeproc, which requires the top-level org, so loading oc-csl
;; after oc interferes with incremental loading of Org
(after! org (require 'oc-csl))
(use-package! citar
:when (modulep! :completion vertico)
:no-require
:config
:defer t
:init
(setq org-cite-insert-processor 'citar
org-cite-follow-processor 'citar
org-cite-activate-processor 'citar)
:config
(after! embark
(citar-embark-mode))
(after! org-roam
(citar-org-roam-mode))
(when (modulep! :completion vertico +icons)
(defvar citar-indicator-files-icons
(citar-indicator-create
@ -65,22 +77,6 @@
citar-indicator-notes-icons
citar-indicator-cited-icons))))
(use-package! citar-embark
:when (modulep! :completion vertico)
:after citar embark
:config (citar-embark-mode))
(use-package! citar-org-roam
:when (and (modulep! +roam2)
(modulep! :completion vertico))
:after citar org-roam
:config (citar-org-roam-mode))
;; `org-cite' processors
(use-package! oc-biblatex :after oc)
(use-package! oc-csl :after oc)
(use-package! oc-natbib :after oc)
;;
;;; Third-party

6
modules/tools/lsp/packages.el
View file

@ -3,13 +3,13 @@
(if (modulep! +eglot)
(progn
(package! eglot :pin "cd4e45b700b117d360aac24d749c3c4a4be3d2e2")
(package! eglot :pin "24f2bf7b28c33e1d677b547956ade5560d27f55f")
(when (modulep! :completion vertico)
(package! consult-eglot :pin "049c6319b8a48ff66189d49592c7759f0b356596"))
(when (and (modulep! :checkers syntax)
(not (modulep! :checkers syntax +flymake)))
(package! flycheck-eglot :pin "9ff8d0068be59b1450964b390349d75a68af21ed")))
(package! lsp-mode :pin "fb88cc6b8bcad4df5dd1d4e5d785adc7663e5c76")
(package! flycheck-eglot :pin "114e1315aaf0dc3196da67da426bbe2b46384fe2")))
(package! lsp-mode :pin "a5f5ca9a8a4b2ceaf236457bf2524f94c183c2f2")
(package! lsp-ui :pin "bc58c6664577d1d79060c6b32b7ad20e70ee19d0")
(when (modulep! :completion ivy)
(package! lsp-ivy :pin "9ecf4dd9b1207109802bd1882aa621eb1c385106"))

8
modules/tools/magit/packages.el
View file

@ -1,12 +1,12 @@
;; -*- no-byte-compile: t; -*-
;;; tools/magit/packages.el
(when (package! magit :pin "b68e0a3c3388af8daac662f25ccfd3e980590e12")
(when (package! magit :pin "65ecb9c5fc7586a1c527b60d180a97ea230da99f")
(when (modulep! +forge)
(package! forge :pin "3fc6c362b0162082317c128c9c3226529f6965ae")
(package! forge :pin "03b48be2a12a282cd47b92287fc1701a81f1cece")
(package! code-review
:recipe (:host github
:repo "doomelpa/code-review"
:files ("graphql" "code-review*.el"))
:pin "2670a4beb6636e6ee596c5b7cb5e784cf33d5a98"))
(package! magit-todos :pin "debb77b3589f2d83c8b43706edc1f8f90bf1ad91"))
:pin "e4c34fa284da25d8e0bafbae4300f1db5bdcda44"))
(package! magit-todos :pin "1e9acc0ba63fbc297001bf334d63cb4326be80df"))