dev: merge branch 'master' into emenel

This commit is contained in:
Matt Nish-Lapidus 2024-06-27 19:59:12 -04:00
commit 4a16c8dfcf
41 changed files with 166 additions and 83 deletions

View file

@ -225,7 +225,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
(when (or ;; if there aren't more real buffers than visible buffers, (when (or ;; if there aren't more real buffers than visible buffers,
;; then there are no real, non-visible buffers left. ;; then there are no real, non-visible buffers left.
(not (cl-set-difference (doom-real-buffer-list) (not (cl-set-difference (doom-real-buffer-list)
(doom-visible-buffers))) (doom-visible-buffers nil t)))
;; if we end up back where we start (or previous-buffer ;; if we end up back where we start (or previous-buffer
;; returns nil), we have nowhere left to go ;; returns nil), we have nowhere left to go
(memq (switch-to-prev-buffer nil t) (list buf 'nil))) (memq (switch-to-prev-buffer nil t) (list buf 'nil)))

View file

@ -179,9 +179,13 @@ If DERIVED-P, test with `derived-mode-p', otherwise use `eq'."
collect window)) collect window))
;;;###autoload ;;;###autoload
(defun doom-visible-buffers (&optional buffer-list) (defun doom-visible-buffers (&optional buffer-list all-frames)
"Return a list of visible buffers (i.e. not buried)." "Return a list of visible buffers (i.e. not buried)."
(let ((buffers (delete-dups (mapcar #'window-buffer (window-list))))) (let ((buffers
(delete-dups
(cl-loop for frame in (if all-frames (visible-frame-list) (list (selected-frame)))
if (window-list frame)
nconc (mapcar #'window-buffer it)))))
(if buffer-list (if buffer-list
(cl-delete-if (lambda (b) (memq b buffer-list)) (cl-delete-if (lambda (b) (memq b buffer-list))
buffers) buffers)

View file

@ -59,6 +59,69 @@
(end-of-line) (end-of-line)
,@body)) ,@body))
(defun +fold--union ()
"Get the combined region covered by all folds at point."
;; We are supporting four folding systems that weren't really designed to work
;; together. No doubt users will find novel, unanticipated ways to nest
;; different types of folds (especially easy to do with `outline-minor-mode').
;; So, we need code that can deal with any arbitrary overlap.
(cl-reduce
(lambda (&optional acc cur)
(when (and acc cur)
(cons (min (car acc) (car cur))
(max (cdr acc) (cdr cur)))))
(nconc
(when (+fold--vimish-fold-p)
(mapcar (lambda (ov)
(cons (overlay-start ov) (overlay-end ov)))
(seq-filter #'vimish-fold--vimish-overlay-p
(or (overlays-at (point)) '()))))
(when (+fold--outline-fold-p)
(save-excursion
(let ((beg (progn (outline-back-to-heading) (point)))
(end (progn (outline-end-of-subtree) (point))))
(list (cons beg end)))))
(when-let ((start (+fold--hideshow-fold-p)))
;; `start' could be start of the block, or 't' if that wasn't found.
;; In either case, we know the fold is on the same line.
(let* ((start (or (and (numberp start) start)
(line-beginning-position)))
(end (line-end-position))
(ov (hs-overlay-at start)))
(while (and (not ov) (< start end))
(setq start (next-overlay-change start)
ov (hs-overlay-at start)))
(when ov
(list (cons (overlay-start ov) (overlay-end ov))))))
(when (+fold--ts-fold-p)
(when-let* ((node (ts-fold--foldable-node-at-pos))
(beg (tsc-node-start-position node))
(end (tsc-node-end-position node)))
(list (cons beg end)))))))
(defun +fold--open-rec-between (beg end)
"Recursively open all folds betwen BEG and END."
(when (featurep 'vimish-fold)
;; from `vimish-fold-unfold-all'
(mapc #'vimish-fold--unfold
(vimish-fold--folds-in
(point-min)
(point-max))))
(and (+fold--outline-fold-p)
(outline-show-subtree))
(hs-life-goes-on
;; from `hs-show-all'
(let ((hs-allow-nesting nil))
(hs-discard-overlays beg end))
(run-hooks 'hs-show-hook))
(when (bound-and-true-p ts-fold-mode)
;; from `ts-fold-open-all'
(ts-fold--ensure-ts
(thread-last (overlays-in (point-min) (point-max))
(seq-filter
(lambda (ov)
(eq (overlay-get ov 'invisible) 'ts-fold)))
(mapc #'delete-overlay)))))
;; ;;
;;; Commands ;;; Commands
@ -84,11 +147,8 @@ Targets `vimmish-fold', `hideshow', `ts-fold' and `outline' folds."
Targets `vimmish-fold', `hideshow', `ts-fold' and `outline' folds." Targets `vimmish-fold', `hideshow', `ts-fold' and `outline' folds."
(interactive) (interactive)
(save-excursion (cl-destructuring-bind (beg . end) (+fold--union)
(cond ((+fold--vimish-fold-p) (vimish-fold-unfold)) (+fold--open-rec-between beg end)))
((+fold--outline-fold-p) (outline-show-subtree))
((+fold--hideshow-fold-p) (+fold-from-eol (hs-show-block)))
((+fold--ts-fold-p) (ts-fold-open)))))
;;;###autoload ;;;###autoload
(defun +fold/open () (defun +fold/open ()
@ -129,9 +189,9 @@ Targets `vimmish-fold', `hideshow', `ts-fold' and `outline' folds."
(+fold--ensure-hideshow-mode) (+fold--ensure-hideshow-mode)
(if (integerp level) (if (integerp level)
(progn (progn
(outline-hide-sublevels (max 1 (1- level))) (outline-hide-sublevels (max 1 level))
(hs-life-goes-on (hs-life-goes-on
(hs-hide-level-recursive (1- level) (point-min) (point-max)))) (hs-hide-level-recursive level (point-min) (point-max))))
(hs-show-all) (hs-show-all)
(when (fboundp 'outline-show-all) (when (fboundp 'outline-show-all)
(outline-show-all))))))) (outline-show-all)))))))
@ -151,15 +211,16 @@ Targets `vimmish-fold', `hideshow', `ts-fold' and `outline' folds."
(hs-life-goes-on (hs-life-goes-on
(if (integerp level) (if (integerp level)
(progn (progn
(outline--show-headings-up-to-level (1+ level)) (outline--show-headings-up-to-level level)
(hs-hide-level-recursive (1- level) (point-min) (point-max))) (hs-hide-level-recursive level (point-min) (point-max)))
(hs-hide-all) (hs-hide-all)
(when (fboundp 'outline-hide-sublevels) (when (fboundp 'outline-hide-sublevels)
(outline-show-only-headings)))))))) (outline-show-only-headings))))))))
;;;###autoload ;;;###autoload
(defun +fold/next (count) (defun +fold/next (count)
"Jump to the next vimish fold, outline heading or folded region." "Jump to the next vimish fold, folded outline heading or folded
region."
(interactive "p") (interactive "p")
(cl-loop with orig-pt = (point) (cl-loop with orig-pt = (point)
for fn for fn
@ -169,9 +230,28 @@ Targets `vimmish-fold', `hideshow', `ts-fold' and `outline' folds."
(lambda () (lambda ()
(when (featurep 'vimish-fold) (when (featurep 'vimish-fold)
(if (> count 0) (if (> count 0)
(evil-vimish-fold/next-fold count) (dotimes (_ count) (vimish-fold-next-fold))
(evil-vimish-fold/previous-fold (- count)))) (dotimes (_ count)
(vimish-fold-previous-fold (- count)))))
(if (/= (point) orig-pt) (point))) (if (/= (point) orig-pt) (point)))
(lambda ()
(when (or (bound-and-true-p outline-minor-mode)
(derived-mode-p 'outline-mode))
(cl-destructuring-bind
(count fn bound-fn)
(if (> count 0)
(list count
#'outline-next-visible-heading #'eobp)
(list (- count)
#'outline-previous-visible-heading #'bobp))
(dotimes (_ count)
(funcall fn 1)
(outline-end-of-heading)
(while (and (not (funcall bound-fn))
(not (outline-invisible-p)))
(funcall fn 1)
(outline-end-of-heading))))
(point)))
(lambda () (lambda ()
;; ts-fold does not define movement functions so we need to do it ourselves ;; ts-fold does not define movement functions so we need to do it ourselves
(when (+fold--ts-fold-p) (when (+fold--ts-fold-p)

View file

@ -1,7 +1,6 @@
;;; lang/beancount/config.el -*- lexical-binding: t; -*- ;;; lang/beancount/config.el -*- lexical-binding: t; -*-
(use-package! beancount (use-package! beancount
:mode ("\\.beancount\\'" . beancount-mode)
:hook (beancount-mode . outline-minor-mode) :hook (beancount-mode . outline-minor-mode)
:init :init
(after! nerd-icons (after! nerd-icons

View file

@ -4,4 +4,4 @@
(package! beancount (package! beancount
:recipe (:host github :recipe (:host github
:repo "beancount/beancount-mode") :repo "beancount/beancount-mode")
:pin "546163fd2ccc007f28812faf5170eb954d3ca979") :pin "71c16222461d947b82e45e4b986d01880b492bbb")

View file

@ -8,7 +8,7 @@
(package! demangle-mode :pin "04f545adab066708d6151f13da65aaf519f8ac4e") (package! demangle-mode :pin "04f545adab066708d6151f13da65aaf519f8ac4e")
(package! disaster :pin "16bba9afb92aacf06c088c29ba47813b65a80d87") (package! disaster :pin "16bba9afb92aacf06c088c29ba47813b65a80d87")
(package! modern-cpp-font-lock :pin "43c6b68ff58fccdf9deef11674a172e4eaa8455c") (package! modern-cpp-font-lock :pin "43c6b68ff58fccdf9deef11674a172e4eaa8455c")
(package! opencl-mode :pin "15091eff92c33ee0d1ece40eb99299ef79fee92d") (package! opencl-mode :pin "10ae7742d57ae79d96cf52753800b3490589b3f6")
(when (package! glsl-mode :pin "9b2e5f28e489a1f73c4aed734105618ac0dc0c43") (when (package! glsl-mode :pin "9b2e5f28e489a1f73c4aed734105618ac0dc0c43")
(when (modulep! :completion company) (when (modulep! :completion company)
@ -19,7 +19,7 @@
(if (modulep! +lsp) (if (modulep! +lsp)
(unless (modulep! :tools lsp +eglot) (unless (modulep! :tools lsp +eglot)
;; ccls package is necessary only for lsp-mode. ;; ccls package is necessary only for lsp-mode.
(package! ccls :pin "9b4a47e0418de8cc2fc93317e27cbdde75286df1")) (package! ccls :pin "8648238a92e5fd1ca1b693c99d2824f8804736b0"))
(when (package! irony :pin "40e0ce19eb850bdf1f77225f11713cc816250d95") (when (package! irony :pin "40e0ce19eb850bdf1f77225f11713cc816250d95")
(package! irony-eldoc :pin "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978") (package! irony-eldoc :pin "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978")
(when (and (modulep! :checkers syntax) (when (and (modulep! :checkers syntax)
@ -28,7 +28,7 @@
(when (modulep! :completion company) (when (modulep! :completion company)
(package! company-irony :pin "b44711dfce445610c1ffaec4951c6ff3882b216a") (package! company-irony :pin "b44711dfce445610c1ffaec4951c6ff3882b216a")
(package! company-irony-c-headers :pin "72c386aeb079fb261d9ec02e39211272f76bbd97"))) (package! company-irony-c-headers :pin "72c386aeb079fb261d9ec02e39211272f76bbd97")))
(when (package! rtags :pin "05117a9a293a729e30013a586c9e3437d9b856c0") (when (package! rtags :pin "bd1c818a993aebdfa22053cdd816ef0e3df7cfa1")
(when (modulep! :completion ivy) (when (modulep! :completion ivy)
(package! ivy-rtags)) (package! ivy-rtags))
(when (modulep! :completion helm) (when (modulep! :completion helm)

View file

@ -1,11 +1,11 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/common-lisp/packages.el ;;; lang/common-lisp/packages.el
(when (package! sly :pin "ed17d2c2bd7aead0fbb09c3d22861c80a522a097") (when (package! sly :pin "ba40c8f054ec3b7040a6c36a1ef3e9596b936421")
(package! sly-asdf :pin "6f9d751469bb82530db1673c22e7437ca6c95f45") (package! sly-asdf :pin "6f9d751469bb82530db1673c22e7437ca6c95f45")
(package! sly-quicklisp :pin "34c73d43dd9066262387c626c17a9b486db07b2d") (package! sly-quicklisp :pin "34c73d43dd9066262387c626c17a9b486db07b2d")
(package! sly-stepper :recipe (:host github :repo "joaotavora/sly-stepper" (package! sly-stepper :recipe (:host github :repo "joaotavora/sly-stepper"
:files (:defaults "*.lisp" "*.asd"))) :files (:defaults "*.lisp" "*.asd")))
(package! sly-macrostep :pin "5113e4e926cd752b1d0bcc1508b3ebad5def5fad") (package! sly-macrostep :pin "5113e4e926cd752b1d0bcc1508b3ebad5def5fad")
(package! sly-repl-ansi-color :pin "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048") (package! sly-repl-ansi-color :pin "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048")
(package! sly-overlay :pin "916b50297a1f3bb110f840b89b8717d194623e5f")) (package! sly-overlay :pin "4c6135c26051fa4cc87d57d7d127aaae5bd40860"))

View file

@ -1,5 +1,5 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/coq/packages.el ;;; lang/coq/packages.el
(package! proof-general :pin "a38857a6a099d0d94184a50093ea6ad331c5c52e") (package! proof-general :pin "99f91e873ec2fdc41079555db1130f07d9a9ce89")
(package! company-coq :pin "5affe7a96a25df9101f9e44bac8a828d8292c2fa") (package! company-coq :pin "5affe7a96a25df9101f9e44bac8a828d8292c2fa")

View file

@ -1,11 +1,11 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/dart/packages.el ;;; lang/dart/packages.el
(package! dart-mode :pin "dffc0209a19fdfac72b861d6adb445c1b6b464f7") (package! dart-mode :pin "44beb628e5b4774062f7486008e06ae663e1ced0")
(when (and (modulep! +lsp) (when (and (modulep! +lsp)
(not (modulep! :tools lsp +eglot))) (not (modulep! :tools lsp +eglot)))
(package! lsp-dart :pin "f51c80f5458d8ba4db9dd3781d190c6c32213250")) (package! lsp-dart :pin "1f52e81c9371055ff9188117ace81f009d1c79f2"))
(when (modulep! +flutter) (when (modulep! +flutter)
(package! flutter :pin "004c91e070a9b4a2a5042f5bb20015ec65453acf") (package! flutter :pin "004c91e070a9b4a2a5042f5bb20015ec65453acf")

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/data/packages.el ;;; lang/data/packages.el
(package! csv-mode :pin "81c1a9febd2adf79cfbdf939081ef7bf3a41ffd6") (package! csv-mode :pin "cdb73a771b0b9fa3cbae66dde5b934be6550a8b1")

View file

@ -3,7 +3,7 @@
;; +elixir.el ;; +elixir.el
(package! elixir-mode :pin "00d6580a040a750e019218f9392cf9a4c2dac23a") (package! elixir-mode :pin "00d6580a040a750e019218f9392cf9a4c2dac23a")
(package! exunit :pin "e008c89e01e5680473278c7e7bab42842e294e4d") (package! exunit :pin "ee06b14b61beaf59d847802b83b027ac991f3496")
(when (and (modulep! :checkers syntax) (when (and (modulep! :checkers syntax)
(not (modulep! :checkers syntax +flymake))) (not (modulep! :checkers syntax +flymake)))
(package! flycheck-credo :pin "e285bd042a535d0f13e0b4c5226df404cdda4033")) (package! flycheck-credo :pin "e285bd042a535d0f13e0b4c5226df404cdda4033"))

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/erlang/packages.el ;;; lang/erlang/packages.el
(package! erlang :pin "0ca7e064f5a948d68db12b5d9f9cfa2faf0f0ea3") (package! erlang :pin "2a64588d4a369ae40dd243aedaa62af68954ce1f")

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/factor/packages.el ;;; lang/factor/packages.el
(package! fuel :pin "12fc9d5071e46cac7b558204db5f4f09ea56e9c7") (package! fuel :pin "d1430077782d83b9acd17a959dda554afe3faa6e")

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/fsharp/packages.el ;;; lang/fsharp/packages.el
(package! fsharp-mode :pin "b4d31c3da018cfbb3d1f9e6fd416d8777f0835bd") (package! fsharp-mode :pin "677d78c4d6cb574086408082dedbcaef04a85359")

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/fstar/packages.el ;;; lang/fstar/packages.el
(package! fstar-mode :pin "7d353de89248f1df6edd1f5672ab4d39f5d1353d") (package! fstar-mode :pin "6e5d3ea858f3c8a9d01161d9089909c2b22fdfca")

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/gdscript/packages.el ;;; lang/gdscript/packages.el
(package! gdscript-mode :pin "8a28276daaa23f10e986367b80dc751c5d26829e") (package! gdscript-mode :pin "32086df83335ce0e5120b21b80cf7996edb2232e")

View file

@ -2,8 +2,8 @@
;;; lang/go/packages.el ;;; lang/go/packages.el
(package! go-eldoc :pin "cbbd2ea1e94a36004432a9ac61414cb5a95a39bd") (package! go-eldoc :pin "cbbd2ea1e94a36004432a9ac61414cb5a95a39bd")
(package! go-guru :pin "6f4ff9ef874d151ed8d297a80f1bf27db5d9dbf0") (package! go-guru :pin "636d36e37a0d2b6adb2e12d802ff4794ccbba336")
(package! go-mode :pin "6f4ff9ef874d151ed8d297a80f1bf27db5d9dbf0") (package! go-mode :pin "636d36e37a0d2b6adb2e12d802ff4794ccbba336")
(package! gorepl-mode :pin "6a73bf352e8d893f89cad36c958c4db2b5e35e07") (package! gorepl-mode :pin "6a73bf352e8d893f89cad36c958c4db2b5e35e07")
(package! go-tag :pin "33f2059551d5298ca228d90f525b99d1a8d70364") (package! go-tag :pin "33f2059551d5298ca228d90f525b99d1a8d70364")
(package! go-gen-test :pin "af00a9abbaba2068502327ecdef574fd894a884b") (package! go-gen-test :pin "af00a9abbaba2068502327ecdef574fd894a884b")

View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/graphql/packages.el ;;; lang/graphql/packages.el
(package! graphql-mode :pin "49a391b5290e3354b07f7b77ded97a154c084f46") (package! graphql-mode :pin "ef4aecaeada77f46d1f0465ab62b9e9f537ec260")
(package! graphql-doc :pin "d37140267e0c426c7c18aff31900aa1650257394") (package! graphql-doc :pin "d37140267e0c426c7c18aff31900aa1650257394")
(unless (modulep! +lsp) (unless (modulep! +lsp)
(package! company-graphql (package! company-graphql

View file

@ -1,8 +1,8 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/haskell/packages.el ;;; lang/haskell/packages.el
(package! haskell-mode :pin "43b4036bf02b02de75643a1a2a31e28efac1c50b") (package! haskell-mode :pin "727f72a2a4b8e4fd0a7b62129668baea55a2c3e0")
(when (and (modulep! +lsp) (when (and (modulep! +lsp)
(not (modulep! :tools lsp +eglot))) (not (modulep! :tools lsp +eglot)))
(package! lsp-haskell :pin "89d16370434e9a247e95b8b701f524f5abfc884b")) (package! lsp-haskell :pin "18a7c7881fb249d9b4cb5f376dfa84682022dc83"))

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/idris/packages.el ;;; lang/idris/packages.el
(package! idris-mode :pin "37c6b819903191acd85c56ef6f7ccf579b57eea4") (package! idris-mode :pin "38dd2380dca5025311cee669cce2361fb8725f51")

View file

@ -19,5 +19,5 @@
;; enabled (i.e. lsp-treemacs isn't installed). This needs to be tackled ;; enabled (i.e. lsp-treemacs isn't installed). This needs to be tackled
;; upstream, but for now: ;; upstream, but for now:
(unless (alist-get 'lsp-treemacs doom-packages) (unless (alist-get 'lsp-treemacs doom-packages)
(package! lsp-treemacs :pin "e54e74deb8150964e3c3024e1ec14295a34e2a3b")) (package! lsp-treemacs :pin "1d43e9e0307f84496a4a7ddf9dba481000391dbd"))
(package! lsp-java :pin "c962a3b3ac2beabdf1ce83b815396d6c38e3cefa"))) (package! lsp-java :pin "4909c14b9012eed669a9c3f11a8df055d5bb8a0e")))

View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/json/packages.el ;;; lang/json/packages.el
(package! json-mode :pin "bfd1557aaa20b7518b808fdc869f094b52205234") (package! json-mode :pin "77125b01c0ddce537085201098bea9b4b8ba6be3")
(package! json-snatcher :pin "b28d1c0670636da6db508d03872d96ffddbc10f2") (package! json-snatcher :pin "b28d1c0670636da6db508d03872d96ffddbc10f2")
(when (modulep! :completion ivy) (when (modulep! :completion ivy)
(package! counsel-jq :pin "8cadd2e96470402ede4881b4e955872976443689")) (package! counsel-jq :pin "8cadd2e96470402ede4881b4e955872976443689"))

View file

@ -1,8 +1,8 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/julia/packages.el ;;; lang/julia/packages.el
(package! julia-mode :pin "2dfc869ff6b3878407fe7226669dfaae8d38d541") (package! julia-mode :pin "d360ad5285b8a0be1818fd6c2b4307c34e468c6e")
(package! julia-repl :pin "4947319bc948b3f80d61b0d65a719737275949b8") (package! julia-repl :pin "801d0fc3d8f6f08f66a11515e6517739a0b312a1")
(when (modulep! +lsp) (when (modulep! +lsp)
(if (modulep! :tools lsp +eglot) (if (modulep! :tools lsp +eglot)
@ -10,4 +10,4 @@
(package! lsp-julia :pin "c869b2f6c05a97e5495ed3cc6710a33b4faf41a2"))) (package! lsp-julia :pin "c869b2f6c05a97e5495ed3cc6710a33b4faf41a2")))
(when (modulep! +snail) (when (modulep! +snail)
(package! julia-snail :pin "a25ce847480a0c2bed24fad3f1ee62904c9c93a5")) (package! julia-snail :pin "f7784c50078332aeeb8e388bf5b8f13042b7406b"))

View file

@ -4,8 +4,8 @@
(package! auctex (package! auctex
:recipe (:files ("*.el" "*.info" "dir" :recipe (:files ("*.el" "*.info" "dir"
"doc" "etc" "images" "latex" "style")) "doc" "etc" "images" "latex" "style"))
:pin "86b2397abdc20a638e5751251026727bc6282022") :pin "280cd4a0ca5a9c80e67efc2bec354b3052258e8d")
(package! adaptive-wrap :pin "70005d2012ab57c20be03c05aebd49318fe49c99") (package! adaptive-wrap :pin "a3b179ea21aeb4e8cfaf5646bb66d9d045263780")
(package! latex-preview-pane :pin "5297668a89996b50b2b62f99cba01cc544dbed2e") (package! latex-preview-pane :pin "5297668a89996b50b2b62f99cba01cc544dbed2e")
(when (modulep! :editor evil +everywhere) (when (modulep! :editor evil +everywhere)
(package! evil-tex :pin "2a3177c818f106e6c11032ac261f8691f5e11f74")) (package! evil-tex :pin "2a3177c818f106e6c11032ac261f8691f5e11f74"))

View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/ledger/packages.el ;;; lang/ledger/packages.el
(package! ledger-mode :pin "11e748d4838d51772f531a75849349ed8cd939ed") (package! ledger-mode :pin "b0e65f74a5a0db98fd1aea2bd87fcf9e489cdacb")
(when (modulep! :editor evil) (when (modulep! :editor evil)
(package! evil-ledger :pin "7a9f9f5d39c42fffdba8004f8982642351f2b233")) (package! evil-ledger :pin "7a9f9f5d39c42fffdba8004f8982642351f2b233"))

View file

@ -12,7 +12,7 @@
:pin "fcb99e5efcf31db05f236f02eaa575986a57172d"))) :pin "fcb99e5efcf31db05f236f02eaa575986a57172d")))
(when (modulep! +fennel) (when (modulep! +fennel)
(package! fennel-mode :pin "5965c8fc693a49e65237a087e693690cf8c9fcb3")) (package! fennel-mode :pin "a4ddd1750fd397eb6bb3aa481d25cb9e056e712f"))
(when (modulep! :completion company) (when (modulep! :completion company)
(package! company-lua :pin "29f6819de4d691e5fd0b62893a9f4fbc1c6fcb52")) (package! company-lua :pin "29f6819de4d691e5fd0b62893a9f4fbc1c6fcb52"))

View file

@ -1,12 +1,12 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/markdown/packages.el ;;; lang/markdown/packages.el
(package! markdown-mode :pin "e096bb97a91fcd4dc2b46d8b6e093194b03b7364") (package! markdown-mode :pin "8aab017f4790f7a1e0d8403239cce989c88412f6")
(package! markdown-toc :pin "3d724e518a897343b5ede0b976d6fb46c46bcc01") (package! markdown-toc :pin "3d724e518a897343b5ede0b976d6fb46c46bcc01")
(package! edit-indirect :pin "82a28d8a85277cfe453af464603ea330eae41c05") (package! edit-indirect :pin "82a28d8a85277cfe453af464603ea330eae41c05")
(when (modulep! +grip) (when (modulep! +grip)
(package! grip-mode :pin "e145adb22593a88249d964f77174207bcf755493")) (package! grip-mode :pin "7c42b8f61d148305dd3949d247903f9daa951eb4"))
(when (modulep! :editor evil +everywhere) (when (modulep! :editor evil +everywhere)
(package! evil-markdown (package! evil-markdown

View file

@ -6,9 +6,9 @@
(package! opam-switch-mode :pin "1069e56a662f23ea09d4e05611bdedeb99257012") (package! opam-switch-mode :pin "1069e56a662f23ea09d4e05611bdedeb99257012")
(unless (modulep! +lsp) (unless (modulep! +lsp)
(package! merlin :pin "8404f96693727f7b0edc0d0b14db57843d79e27b") (package! merlin :pin "b6ff2d4d569c23dd8fa91639d26fb984e9411862")
(package! merlin-eldoc :pin "bf8edc63d85b35e4def352fa7ce4ea39f43e1fd8") (package! merlin-eldoc :pin "bf8edc63d85b35e4def352fa7ce4ea39f43e1fd8")
(package! merlin-company :pin "8404f96693727f7b0edc0d0b14db57843d79e27b") (package! merlin-company :pin "b6ff2d4d569c23dd8fa91639d26fb984e9411862")
(when (and (modulep! :checkers syntax) (when (and (modulep! :checkers syntax)
(not (modulep! :checkers syntax +flymake))) (not (modulep! :checkers syntax +flymake)))
(package! flycheck-ocaml :pin "77f8ddbd9bfc3a11957ac7ec7e45d5fa9179b192"))) (package! flycheck-ocaml :pin "77f8ddbd9bfc3a11957ac7ec7e45d5fa9179b192")))
@ -16,13 +16,13 @@
(package! ocp-indent :pin "f38578c25d62701847b1bcb45099a9020e2032fe") (package! ocp-indent :pin "f38578c25d62701847b1bcb45099a9020e2032fe")
(when (modulep! :tools eval) (when (modulep! :tools eval)
(package! utop :pin "8cc563282597abdb8f5cca64df41166c5ebca6b5")) (package! utop :pin "384b3098c8c4a2e26b87167053952b753aa8a63a"))
(when (modulep! :editor format) (when (modulep! :editor format)
(package! ocamlformat (package! ocamlformat
:recipe (:host github :repo "ocaml-ppx/ocamlformat" :files ("emacs/*.el")) :recipe (:host github :repo "ocaml-ppx/ocamlformat" :files ("emacs/*.el"))
:pin "b8b09566904cf290cca294d3bf06a4f51793dfb7")) :pin "c43f89bc0ebd536009151814214320bdf3988c50"))
(package! dune (package! dune
:recipe (:host github :repo "ocaml/dune" :files ("editor-integration/emacs/*.el")) :recipe (:host github :repo "ocaml/dune" :files ("editor-integration/emacs/*.el"))
:pin "64d19876ad6d2ca8b36d6158d5ac58c6eae8bc9a") :pin "aac3d84f1d5abdf276d72be3dccac23bf99b3c7c")

View file

@ -1,27 +1,27 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/php/packages.el ;;; lang/php/packages.el
(package! psysh :pin "c7dde979d9fd3ce59771f050bd38b2796cace446") (package! psysh :pin "ae15a36301a49e5ae03118ff815a6a511603ae13")
(package! php-extras (package! php-extras
:recipe (:host github :repo "arnested/php-extras") :recipe (:host github :repo "arnested/php-extras")
:pin "d410c5af663c30c01d461ac476d1cbfbacb49367") :pin "d410c5af663c30c01d461ac476d1cbfbacb49367")
(package! php-mode :pin "a0bcafbe30494b2c5a70c2fe05f2bb0859e83645") (package! php-mode :pin "4792988a120d6ac515ba16605278d04cb8be0d69")
(package! php-refactor-mode :pin "7a794b0618df2882b1bd586fdd698dba0bc5130d") (package! php-refactor-mode :pin "7a794b0618df2882b1bd586fdd698dba0bc5130d")
(package! phpunit :pin "650a50898de1fa4eeb47360b12aeb1126b2448c2") (package! phpunit :pin "650a50898de1fa4eeb47360b12aeb1126b2448c2")
(package! composer :pin "91945f1bdb655be272320d14dab306b661a128a1") (package! composer :pin "42cf9848d438f8dc4c07ac684a83280ace7bb94c")
(when (modulep! +hack) (when (modulep! +hack)
(package! hack-mode (package! hack-mode
:recipe (:host github :repo "hhvm/hack-mode") :recipe (:host github :repo "hhvm/hack-mode")
:pin "278e4cc4032bff92060496cf1179643cfc6f9c0f")) :pin "ccf20511f0f2ed45d00d423c703bb91ab6a8b80c"))
(unless (modulep! +lsp) (unless (modulep! +lsp)
(package! phpactor :pin "8733fef84b458457c1bfd188cfb861fc3150ee1c") (package! phpactor :pin "6b5269ff82785a9bd1e648b2f91e5128353d5a67")
(when (modulep! :completion company) (when (modulep! :completion company)
(package! company-phpactor :pin "8733fef84b458457c1bfd188cfb861fc3150ee1c"))) (package! company-phpactor :pin "6b5269ff82785a9bd1e648b2f91e5128353d5a67")))
(when (modulep! :editor format) (when (modulep! :editor format)
(package! php-cs-fixer :pin "efe4368d891f1eec6311363cfd6be3e9eadb5e0a")) (package! php-cs-fixer :pin "efe4368d891f1eec6311363cfd6be3e9eadb5e0a"))
;; For building php-extras ;; For building php-extras
(package! async :pin "d040f72cb0be5265d50ac541ddb09ebbc68b7908") (package! async :pin "cff2bd0be3c78a2eb76717eed60302972fe9b8c5")

View file

@ -2,7 +2,7 @@
;;; lang/python/packages.el ;;; lang/python/packages.el
;; Major modes ;; Major modes
(package! pip-requirements :pin "216cd1690f80cc965d4ae47b8753fc185f778ff6") (package! pip-requirements :pin "31e0dc62abb2d88fa765e0ea88b919d756cc0e4f")
(when (modulep! +cython) (when (modulep! +cython)
(package! cython-mode :pin "3e4790559d3168fe992cf2aa62f01423038cedb5") (package! cython-mode :pin "3e4790559d3168fe992cf2aa62f01423038cedb5")
(when (modulep! :checkers syntax) (when (modulep! :checkers syntax)
@ -12,28 +12,28 @@
(when (modulep! +lsp) (when (modulep! +lsp)
(unless (modulep! :tools lsp +eglot) (unless (modulep! :tools lsp +eglot)
(if (modulep! +pyright) (if (modulep! +pyright)
(package! lsp-pyright :pin "2f2631ae242d5770dbe6cb924e44c1ee5671789d") (package! lsp-pyright :pin "cc6df06aeaee3053eb800a24193483387b7b545b")
(package! lsp-python-ms :pin "7bda327bec7b219d140c34dab4b1e1fbd41bc516")))) (package! lsp-python-ms :pin "7bda327bec7b219d140c34dab4b1e1fbd41bc516"))))
;; Programming environment ;; Programming environment
(package! anaconda-mode :pin "efd42aa8736d855a3c95e06e6daf4aa797290a93") (package! anaconda-mode :pin "79fa9b4d2bda9f69857aeffb30c75276848a2810")
(when (modulep! :completion company) (when (modulep! :completion company)
(package! company-anaconda :pin "dabc0adc9a0e56357e046de5fd4dbd8fc797e542")) (package! company-anaconda :pin "1fe526163c265891cc20d971dc58b661ad8bcf23"))
;; Environment management ;; Environment management
(package! pipenv :pin "3af159749824c03f59176aff7f66ddd6a5785a10") (package! pipenv :pin "3af159749824c03f59176aff7f66ddd6a5785a10")
(package! pyvenv :pin "31ea715f2164dd611e7fc77b26390ef3ca93509b") (package! pyvenv :pin "31ea715f2164dd611e7fc77b26390ef3ca93509b")
(when (modulep! +pyenv) (when (modulep! +pyenv)
(package! pyenv-mode :pin "c93dc07e85494b4420e6c50160f38d6915c85684")) (package! pyenv-mode :pin "de0d750b9c3057fd7cecc72e6a290902a0475afe"))
(when (modulep! +conda) (when (modulep! +conda)
(package! conda :pin "60e14d1e9793431b91913a5688e278bd91d56224")) (package! conda :pin "60e14d1e9793431b91913a5688e278bd91d56224"))
(when (modulep! +poetry) (when (modulep! +poetry)
(package! poetry :pin "ca2cffb0b174e9d814ad95178af84b525dd2b64d")) (package! poetry :pin "1dff0d4a51ea8aff5f6ce97b154ea799902639ad"))
;; Testing frameworks ;; Testing frameworks
(package! nose :pin "f8528297519eba911696c4e68fa88892de9a7b72") (package! nose :pin "f8528297519eba911696c4e68fa88892de9a7b72")
(package! python-pytest :pin "bdfb3e81eedc6b76ed0c5f77079e7cc8adff7b00") (package! python-pytest :pin "9f850e22df93812a5b109968c549f9b3dd828ed1")
;; Import managements ;; Import managements
(package! pyimport :pin "c006a5fd0e5c9e297aa2ad71b2f02f463286b5e3") (package! pyimport :pin "4398ce8dd64fa0f685f4bf8683a35087649346d3")
(package! py-isort :pin "e67306f459c47c53a65604e4eea88a3914596560") (package! py-isort :pin "e67306f459c47c53a65604e4eea88a3914596560")

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/racket/packages.el ;;; lang/racket/packages.el
(package! racket-mode :pin "d3ab936af10909874443cadb2e6c952faf2f536f") (package! racket-mode :pin "40ecb87f409a9ef9a4e58c1e51243cce948ab3d7")

View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/raku/packages.el ;;; lang/raku/packages.el
(package! raku-mode :pin "977b14a7c1295ebf2aad2f807d3f8e7c27aeb47f") (package! raku-mode :pin "14f9b9bba08c0bbb7f3895380d0b1a9feb7a168d")
(when (and (modulep! :checkers syntax) (when (and (modulep! :checkers syntax)
(not (modulep! :checkers syntax +flymake))) (not (modulep! :checkers syntax +flymake)))

View file

@ -6,5 +6,5 @@
(package! company-restclient :pin "e5a3ec54edb44776738c13e13e34c85b3085277b")) (package! company-restclient :pin "e5a3ec54edb44776738c13e13e34c85b3085277b"))
(when (modulep! +jq) (when (modulep! +jq)
(package! jq-mode :pin "37028e120041a489eff352b79202361cb232377e") (package! jq-mode :pin "a0f79eba786d46f01aeabb5913aadc337e985d6c")
(package! restclient-jq :pin "e2a2b13482d72634f8e49864cd9e5c907a5fe137")) (package! restclient-jq :pin "e2a2b13482d72634f8e49864cd9e5c907a5fe137"))

View file

@ -6,13 +6,13 @@
(package! yard-mode :pin "de1701753a64544c3376b015805f3661136d8038") (package! yard-mode :pin "de1701753a64544c3376b015805f3661136d8038")
;; REPL ;; REPL
(package! inf-ruby :pin "dac615c7fdbb57587465b1c497f8be4c979439e1") (package! inf-ruby :pin "0cfe8b2fb1ab222ed423a8e6f339d398fa32966f")
(when (modulep! :completion company) (when (modulep! :completion company)
(package! company-inf-ruby :pin "fe3e4863bc971fbb81edad447efad5795ead1b17")) (package! company-inf-ruby :pin "fe3e4863bc971fbb81edad447efad5795ead1b17"))
;; Programming environment ;; Programming environment
(package! rubocop :pin "f5fd18aa810c3d3269188cbbd731ddc09006f8f5") (package! rubocop :pin "f5fd18aa810c3d3269188cbbd731ddc09006f8f5")
(package! robe :pin "4ecd868da9adb8565b42976b6035e36bd928acfe") (package! robe :pin "6bc8a07fc483407971de0966d367a11006b3ab80")
;; Project tools ;; Project tools
(package! bundler :pin "43efb6be4ed118b06d787ce7fbcffd68a31732a7") (package! bundler :pin "43efb6be4ed118b06d787ce7fbcffd68a31732a7")

View file

@ -1,5 +1,5 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/rust/packages.el ;;; lang/rust/packages.el
(package! rust-mode :pin "d8a09f218e24407acbc9f36c641be4f913f1a63c") (package! rust-mode :pin "d00d83d3a207a5b7c2994392b2781f627e3159ce")
(package! rustic :pin "39423d1cf4fa054c36bf9577356451f4c06ee148") (package! rustic :pin "39423d1cf4fa054c36bf9577356451f4c06ee148")

View file

@ -6,4 +6,4 @@
(when (and (modulep! +lsp) (when (and (modulep! +lsp)
(not (modulep! :tools lsp +eglot))) (not (modulep! :tools lsp +eglot)))
(package! lsp-metals :pin "e55d544996f7321622e1eeafdc3dd128f8e72ce5")) (package! lsp-metals :pin "fa4072cbe7a7061cdb218b9a3619979f7facba0e"))

View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/sml/packages.el ;;; lang/sml/packages.el
(package! sml-mode :pin "e5354371f361fb6b60e53d0e6743baf6088ad810") (package! sml-mode :pin "d114e5a27f3d213b3e32c02f9320cd2041b6376b")
(when (modulep! :completion company) (when (modulep! :completion company)
(package! company-mlton (package! company-mlton
:recipe (:host github :repo "MatthewFluet/company-mlton" :files ("*.el" "*.basis")) :recipe (:host github :repo "MatthewFluet/company-mlton" :files ("*.el" "*.basis"))

View file

@ -1,11 +1,11 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/swift/packages.el ;;; lang/swift/packages.el
(package! swift-mode :pin "84059659de4da89d3d2902611cebed6d0423bf06") (package! swift-mode :pin "b06c97b909418b5dca3d15351b2ce86a04df32fb")
(if (modulep! +lsp) (if (modulep! +lsp)
(unless (modulep! :tools lsp +eglot) (unless (modulep! :tools lsp +eglot)
(package! lsp-sourcekit :pin "1cd5e7d2699598a97bdbcd289d9a88b249db474c")) (package! lsp-sourcekit :pin "bb2b7e027824b8690cc6f95181d7abcec3c34a01"))
(when (modulep! :completion company) (when (modulep! :completion company)
(package! company-sourcekit :pin "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c")) (package! company-sourcekit :pin "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c"))
(when (and (modulep! :checkers syntax) (when (and (modulep! :checkers syntax)

View file

@ -2,7 +2,7 @@
;;; lang/web/packages.el ;;; lang/web/packages.el
;; +html.el ;; +html.el
(package! emmet-mode :pin "63b6932603184956b5ea8919036d2b307b48d7fd") (package! emmet-mode :pin "322d3bb112fced57d63b44863357f7a0b7eee1e3")
(package! haml-mode :pin "a64d58df8f098f858c6c11fa1629a90969f9c7e8") (package! haml-mode :pin "a64d58df8f098f858c6c11fa1629a90969f9c7e8")
(package! pug-mode :pin "73f8c2f95eba695f701df20c8436f49abadebdc1") (package! pug-mode :pin "73f8c2f95eba695f701df20c8436f49abadebdc1")
(package! slim-mode :pin "8c92169817f2fa59255f547f0a9fb4fbb8309db9") (package! slim-mode :pin "8c92169817f2fa59255f547f0a9fb4fbb8309db9")

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/yaml/packages.el ;;; lang/yaml/packages.el
(package! yaml-mode :pin "5b58248ab255dff6cfa4c4057a191bc4446ee5b6") (package! yaml-mode :pin "7b5ce294fb15c2c8926fa476d7218aa415550a2a")

View file

@ -237,7 +237,7 @@ This backend prefers \"just working\" over accuracy."
Uses and requires `+ivy-file-search', `+helm-file-search', or `+vertico-file-search'. Uses and requires `+ivy-file-search', `+helm-file-search', or `+vertico-file-search'.
Will return nil if neither is available. These require ripgrep to be installed." Will return nil if neither is available. These require ripgrep to be installed."
(unless identifier (when identifier
(let ((query (rxt-quote-pcre identifier))) (let ((query (rxt-quote-pcre identifier)))
(ignore-errors (ignore-errors
(cond ((modulep! :completion ivy) (cond ((modulep! :completion ivy)