mirror of
https://github.com/doomemacs/doomemacs.git
synced 2025-12-05 18:20:29 -08:00
Compare commits
11 commits
f9664ae058
...
ead254e152
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ead254e152 | ||
|
|
d9e444bb22 | ||
|
|
073937d355 | ||
|
|
bbaa5f49f4 | ||
|
|
6aed2e7160 | ||
|
|
7b75983b30 | ||
|
|
347dd9f57b | ||
|
|
5efa6e90d1 | ||
|
|
5f0ebdf2e0 | ||
|
|
2ac5787cc9 | ||
|
|
b22a3a6d7a |
24 changed files with 80 additions and 63 deletions
|
|
@ -552,6 +552,15 @@ on."
|
|||
(bound-and-true-p comment-use-syntax)))
|
||||
(so-long-detected-long-line-p))))
|
||||
(setq so-long-predicate #'doom-buffer-has-long-lines-p))
|
||||
|
||||
;; HACK: so-long triggers in places where we don't want it, like special
|
||||
;; buffers (e.g. magit status) or temp buffers.
|
||||
(defadvice! doom--exclude-special-modes-a (&rest _)
|
||||
:before-while #'so-long-statistics-excessive-p
|
||||
:before-while #'so-long-detected-long-line-p
|
||||
(not (or (doom-temp-buffer-p (current-buffer))
|
||||
(doom-special-buffer-p (current-buffer)))))
|
||||
|
||||
;; Don't disable syntax highlighting and line numbers, or make the buffer
|
||||
;; read-only, in `so-long-minor-mode', so we can have a basic editing
|
||||
;; experience in them, at least. It will remain off in `so-long-mode',
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@
|
|||
:desc "Soft line wrapping" "w" #'visual-line-mode
|
||||
(:when (modulep! :editor word-wrap)
|
||||
:desc "Soft line wrapping" "w" #'+word-wrap-mode)
|
||||
(:when (modulep! :checkers syntax)
|
||||
(:when (modulep! :checkers syntax -flymake)
|
||||
:desc "Flycheck" "f" #'flycheck-mode)
|
||||
(:when (modulep! :ui indent-guides)
|
||||
:desc "Indent guides" "i" #'indent-bars-mode)
|
||||
|
|
|
|||
|
|
@ -324,8 +324,8 @@ Continues comments if executed from a commented line."
|
|||
"s-c" (if (featurep 'evil) #'evil-yank #'copy-region-as-kill)
|
||||
"s-v" #'yank
|
||||
"s-s" #'save-buffer
|
||||
"s-x" #'execute-extended-command
|
||||
:v "s-x" #'kill-region
|
||||
"s-x" (cmds! (doom-region-active-p) #'kill-region
|
||||
#'execute-extended-command)
|
||||
"s-0" #'doom/reset-font-size
|
||||
;; Global font scaling
|
||||
"s-=" #'doom/increase-font-size
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
;;; config/default/packages.el
|
||||
|
||||
(package! avy :pin "933d1f36cca0f71e4acb5fac707e9ae26c536264")
|
||||
(package! link-hint :pin "826993a0ab736ab09f53a0623fb44edf2182b07c")
|
||||
(package! link-hint :pin "8fda5dcb9caff5a3c49d22b82e570ac9e29af7dd")
|
||||
|
||||
(unless (modulep! :editor evil)
|
||||
(package! drag-stuff :pin "6d06d846cd37c052d79acd0f372c13006aa7e7c8")
|
||||
|
|
|
|||
|
|
@ -8,4 +8,4 @@
|
|||
:recipe (:files ("bind-key.el"))
|
||||
:pin "ec9d0505febe2556b47457355763f5f1408a35ac")
|
||||
|
||||
(package! use-package :pin "29552cf3af755f17e297862a7f635c469a28b09f")
|
||||
(package! use-package :pin "c80c883deac67a3ff3dda2d2af6d947a15062aff")
|
||||
|
|
|
|||
|
|
@ -87,5 +87,5 @@ Advanced examples:
|
|||
(t args))))
|
||||
(setf (alist-get name apheleia-formatters) formatter))
|
||||
(when modes
|
||||
(dolist (mode modes)
|
||||
(dolist (mode (ensure-list modes))
|
||||
(setf (alist-get mode apheleia-mode-alist) name))))))
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ This function is called by `org-babel-execute-src-block'."
|
|||
;; REVIEW Refactor me
|
||||
(let* ((body (replace-regexp-in-string
|
||||
"^[[:blank:]\n]*\\(@start\\)"
|
||||
"\\\\\\1"
|
||||
"\\1"
|
||||
body))
|
||||
(fullbody (org-babel-plantuml-make-body body params))
|
||||
(out-file (or (cdr (assq :file params))
|
||||
|
|
|
|||
|
|
@ -33,19 +33,7 @@
|
|||
|
||||
(when (modulep! +lsp)
|
||||
(add-hook 'python-mode-local-vars-hook #'lsp! 'append)
|
||||
(add-hook 'python-ts-mode-local-vars-hook #'lsp! 'append)
|
||||
|
||||
;; REVIEW: PR this upstream, which assumes the wrong names for the
|
||||
;; (based)pyright executables.
|
||||
(set-eglot-client! '(python-mode python-ts-mode)
|
||||
"pylsp" "pyls"
|
||||
'("basedpyright-langserver" "--stdio")
|
||||
'("pyright" "--stdio")
|
||||
'("pyright-langserver" "--stdio")
|
||||
'("pyrefly" "lsp")
|
||||
"jedi-language-server"
|
||||
'("ruff" "server")
|
||||
"ruff-lsp"))
|
||||
(add-hook 'python-ts-mode-local-vars-hook #'lsp! 'append))
|
||||
|
||||
(set-repl-handler! '(python-mode python-ts-mode) #'+python/open-repl
|
||||
:persist t
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
(package! bibtex-completion :pin "6064e8625b2958f34d6d40312903a85c173b5261")
|
||||
(package! helm-bibtex :pin "6064e8625b2958f34d6d40312903a85c173b5261"))
|
||||
(when (modulep! :completion vertico)
|
||||
(package! citar :pin "75a85d8d8612ec2097248524eecff3d096fc5dd5")
|
||||
(package! citar-embark :pin "75a85d8d8612ec2097248524eecff3d096fc5dd5")
|
||||
(package! citar :pin "427432d490f116c6b10b7459593cff1b2a9ca9de")
|
||||
(package! citar-embark :pin "427432d490f116c6b10b7459593cff1b2a9ca9de")
|
||||
(when (or (modulep! :lang org +roam)
|
||||
(modulep! :lang org +roam2))
|
||||
(package! citar-org-roam :pin "9750cfbbf330ab3d5b15066b65bd0a0fe7c296fb")))
|
||||
|
||||
(package! parsebib :pin "7bfde4e4679413424a9a9af099203d5c23e32cd2")
|
||||
(package! citeproc :pin "9f16f2eee4586404b88a7b8cf46e1c158477bc33")
|
||||
(package! parsebib :pin "4a9df6f1b4f37bbf4f8712eac99c8a25698f1c0e")
|
||||
(package! citeproc :pin "a3d62ab8e40a75fcfc6e4c0c107e3137b4db6db8")
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; tools/debugger/packages.el
|
||||
|
||||
(package! dape :pin "a2d7dc9a8dd599adf61553a73abb880d62150306")
|
||||
(package! dape :pin "b5a4daaf1400aab35b453fe6863b1822c88647d4")
|
||||
|
||||
;; DEPRECATED
|
||||
(when (modulep! +lsp)
|
||||
(package! dap-mode :pin "c81014ccc390e8994b061bd2d9f8b5dd84498a3d")
|
||||
(package! dap-mode :pin "6c74027e39fca229eeb1d0d59698219ae7d0aa41")
|
||||
(package! posframe :pin "12f540c9ad5da09673b2bca1132b41f94c134e82"))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; tools/direnv/packages.el
|
||||
|
||||
(package! envrc :pin "4fc7b657ea62c29eff5b8bf4356427e96cc99c93")
|
||||
(package! envrc :pin "de1ae6e538764f74659f358b04af0d84fa0fef42")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; tools/docker/packages.el
|
||||
|
||||
(package! docker :pin "91233a7c559d87c47de6193a64913732756f0799")
|
||||
(package! docker :pin "375e0ed45bb1edc655d9ae2943a09864bec1fcba")
|
||||
;; tramp-container (included with Emacs 29+) replaces docker-tramp
|
||||
(when (< emacs-major-version 29)
|
||||
(package! docker-tramp :pin "19d0771db4e6b89e19c00af5806438e315779c15"))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; tools/llm/packages.el
|
||||
|
||||
(package! gptel :pin "f66e44368fd085f958f5d34cdbcbfb649abfc5eb")
|
||||
(package! gptel :pin "7c8d9c8496afa50bf03f2dd7fabeefe9449cf381")
|
||||
|
||||
(package! gptel-quick
|
||||
:recipe (:host github :repo "karthink/gptel-quick")
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
(package! helm))
|
||||
|
||||
;;
|
||||
(package! dumb-jump :pin "21545d3b8637b38f1930176f1c4782943ce3c0bd")
|
||||
(package! dumb-jump :pin "0632bdb4186cb0b58199679bfa5e64a5b409be22")
|
||||
(when (modulep! :completion ivy)
|
||||
(package! ivy-xref :pin "a82e8e117d2dd62c28b6a3e3d6e4cfb11c0bda38"))
|
||||
(when (modulep! :completion helm)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
(if (modulep! +eglot)
|
||||
(progn
|
||||
(package! eglot :pin "d2f34e5ce44dcf10c9bf2aab93278d1a8cb88655")
|
||||
(package! eglot :pin "a35ebe774d09421ea891593f8cb671b1656f8b86")
|
||||
(when (modulep! :completion vertico)
|
||||
(package! consult-eglot :pin "d8b444aac39edfc6473ffbd228df3e9119451b51"))
|
||||
(when (modulep! :checkers syntax -flymake)
|
||||
|
|
@ -15,15 +15,15 @@
|
|||
|
||||
;; lsp-mode must be rebuilt if this variable is changed, so expose it here so
|
||||
;; users can change it from $DOOMDIR/packages.el.
|
||||
(defvar lsp-use-plists t)
|
||||
(eval-and-compile (defvar lsp-use-plists t))
|
||||
|
||||
(package! lsp-mode
|
||||
:pin "c74a723870f86cf9d1b7aee5e6e2add10d9ce127"
|
||||
:pin "c3b5fea5d6c3227801a69ea14080be29b6c3080e"
|
||||
:env `(("LSP_USE_PLISTS" . ,(and lsp-use-plists "1"))))
|
||||
(package! lsp-ui :pin "030d36960338fd633a98b332bc3734c412c25ca6")
|
||||
(package! lsp-ui :pin "8547cd6abf3b474b3111911bc8ee1452afdfec8f")
|
||||
(when (modulep! :completion ivy)
|
||||
(package! lsp-ivy :pin "2927cbc776477e23d4a1062568d55793eed33c51"))
|
||||
(when (modulep! :completion helm)
|
||||
(package! helm-lsp :pin "95f21f3f672a3260806531878e7684cde23616b2"))
|
||||
(when (modulep! :completion vertico)
|
||||
(package! consult-lsp :pin "aef321d03907ca6926b0cf20ca85f672c4744000")))
|
||||
(package! consult-lsp :pin "d11102c9db33c4ca7817296a2edafc3e26a61117")))
|
||||
|
|
|
|||
|
|
@ -1,15 +1,18 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; tools/magit/packages.el
|
||||
|
||||
(package! transient :pin "1d109f34b7c6af7af830c141bb0a3b4d33803e75") ; 0.10.0
|
||||
(package! magit :pin "dc0094bd88a5307fdfa1c2a48f3ec5b33891f1f0") ; 4.4.0
|
||||
;; HACK: Fixes magit/magit#5462. Remove when addressed upstream.
|
||||
(defvar magit-auto-revert-mode nil)
|
||||
|
||||
(package! transient :pin "053d56e4de2dd78bf32f7af7ed5f289a91cdb6ac") ; 0.10.1
|
||||
(package! magit :pin "b828afbb4b45641998fb6483a08effb1efb214e1") ; 4.4.2
|
||||
(when (modulep! +forge)
|
||||
(package! forge
|
||||
:pin "bbecd8947a190894570b8344490a50ebf0efd394" ; 0.6.0
|
||||
:pin "71910a26e360bfe88eb81b47f377f7694161fe9b" ; 0.6.2
|
||||
;; forge depends on ghub, which requires Emacs 29.1+
|
||||
:disable (version< emacs-version "29.1"))
|
||||
(package! ghub
|
||||
:pin "d76cdac69f9afb5c462c88bdc37c6192b43ac615" ; 5.0.0
|
||||
:pin "447cb51fa7d19e1fb3844acdd2c540be04299ffb" ; 5.0.2
|
||||
;; ghub requires Emacs 29.1+
|
||||
:disable (version< emacs-version "29.1"))
|
||||
(package! code-review
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; ui/doom/packages.el
|
||||
|
||||
(package! doom-themes :pin "3152c60bb55365ebd3b042a40aa68c9b756667f7")
|
||||
(package! doom-themes :pin "376cf4bdd7d296a3da94aa9a6c68761e7c38a252")
|
||||
(package! solaire-mode :pin "c9334666bd208f3322e6118d30eba1b2438e2bb9")
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; ui/hl-todo/packages.el
|
||||
|
||||
(package! hl-todo :pin "862d903e7242f3cf90e05846aa52a4270851d496")
|
||||
(package! hl-todo :pin "94893087e0aca6642a3ebf11f46b3d5f47c1eb22")
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@
|
|||
|
||||
(package! indent-bars
|
||||
:recipe (:host github :repo "jdtsmith/indent-bars")
|
||||
:pin "aa07a3d812c64445d44796b85fca07044864f64b")
|
||||
:pin "c3384ec7ff6250f78b118c452458f1a7121841cf")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; ui/ligeratures/packages.el
|
||||
;;; ui/ligatures/packages.el
|
||||
|
||||
(when (and (or (featurep 'ns)
|
||||
(featurep 'harfbuzz))
|
||||
|
|
|
|||
|
|
@ -23,22 +23,30 @@ feature found in many other editors.
|
|||
# This section will be machine generated. Don't edit it by hand.
|
||||
/This module does not have a changelog yet./
|
||||
|
||||
* TODO Usage
|
||||
#+begin_quote
|
||||
/This module's usage documentation is incomplete./ [[doom-contrib-module:][Complete it?]]
|
||||
#+end_quote
|
||||
* Usage
|
||||
Press [[kbd:][SPC t m]] to toggle the minimap.
|
||||
|
||||
A minimap which provides an overview of the current buffer to the side,
|
||||
displaying the currently visible region and the current line. You can left-click
|
||||
and drag to scroll along the buffer, or right-click anywhere to jump to there.
|
||||
A minimap provides an overview of the current buffer to the side, displaying the
|
||||
currently visible region and the current line. You can left-click inside the
|
||||
minimap to create a region, or scroll to move the minimap up & down.
|
||||
|
||||
* TODO Configuration
|
||||
#+begin_quote
|
||||
/This module's configuration documentation is incomplete./ [[doom-contrib-module:][Complete it?]]
|
||||
#+end_quote
|
||||
* Configuration
|
||||
There are a number of options provided by the =demap.el= package this module
|
||||
is based on. The easiest way to see all of them is [[kbd:][SPC h v demap]].
|
||||
|
||||
There are a number of options provided by the =minimap.el= package this module
|
||||
is based on. The easiest way to see all of them is [[kbd:][SPC h v minimap]].
|
||||
** Changing the side that the minimap window opens in
|
||||
You can change the variable [[var:demap-minimap-window-side][demap-minimap-window-side]] which controls the side of
|
||||
the frame the minimap window opens in, it supports these options:
|
||||
- =right=
|
||||
- =left=
|
||||
|
||||
** Changing the width of the minimap window
|
||||
The [[var:demap-minimap-window-width][demap-minimap-window-width]] variable controls the width of the minimap
|
||||
window, by default it is set to =20=.
|
||||
|
||||
** Changing the name of the minimap buffer
|
||||
The [[var:demap-minimap-default-name][demap-minimap-default-name]] variable controls the name of the minimap buffer,
|
||||
by default it is set to ="**Minimap**"=.
|
||||
|
||||
* Troubleshooting
|
||||
/There are no known problems with this module./ [[doom-report:][Report one?]]
|
||||
|
|
@ -47,6 +55,15 @@ is based on. The easiest way to see all of them is [[kbd:][SPC h v minimap]].
|
|||
/This module has no FAQs yet./ [[doom-suggest-faq:][Ask one?]]
|
||||
|
||||
* TODO Appendix
|
||||
#+begin_quote
|
||||
This module has no appendix yet. [[doom-contrib-module:][Write one?]]
|
||||
#+end_quote
|
||||
** Variables
|
||||
- demap-minimap-change-major-mode-hook
|
||||
- demap-minimap-default-name
|
||||
- demap-minimap-window-width
|
||||
- demap-minimap-window-side
|
||||
- demap-minimap-kill-hook
|
||||
- demap-minimap-construct-hook
|
||||
- demap-minimap-window-set-hook
|
||||
- demap-minimap-change-functions
|
||||
- demap-minimap-window-sleep-hook
|
||||
- demap-minimap-protected-variables
|
||||
- demap-minimap-close-kill-minimap-p
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
;;; ui/modeline/packages.el
|
||||
|
||||
(unless (modulep! +light)
|
||||
(package! doom-modeline :pin "7182b612d97cd4b72d814f709abfd96bb8e62700"))
|
||||
(package! doom-modeline :pin "20de9feaa0ba3cb498cb9b06de9877ab41928747"))
|
||||
(package! anzu :pin "21cb5ab2295614372cb9f1a21429381e49a6255f")
|
||||
(when (modulep! :editor evil)
|
||||
(package! evil-anzu :pin "7309650425797420944075c9c1556c7c1ff960b3"))
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@
|
|||
|
||||
(if (modulep! :editor evil)
|
||||
(package! evil-goggles :pin "34ca276a85f615d2b45e714c9f8b5875bcb676f3")
|
||||
(package! goggles :pin "791140df23e11436ba825043e85c47a41fd65c5c"))
|
||||
(package! goggles :pin "6f87a700137c838568966bc8099dc15786897c32"))
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; ui/treemacs/packages.el
|
||||
|
||||
(package! treemacs :pin "5fa84199501fd43e5573b1277a2b1699c7473cc1")
|
||||
(package! treemacs-nerd-icons :pin "eac9fb5d92b8b29e7c4fcf9f3baddb2cb0b04575")
|
||||
(package! treemacs :pin "05333cc23ca4349cd839cf1c18e1eaef1f6b70ec")
|
||||
(package! treemacs-nerd-icons :pin "0c5ddcb978da639f01ddb023febc40fc755171e5")
|
||||
;; These packages have no :pin because they're in the same repo
|
||||
(when (modulep! :editor evil +everywhere)
|
||||
(package! treemacs-evil))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue