Compare commits

...

6 commits

Author SHA1 Message Date
Henrik Lissner
459906d447
bump: :lang beancount dart elixir fsharp go graphviz
ananthakumaran/exunit.el@9a7cfc3d78 -> ananthakumaran/exunit.el@12a1efd003
beancount/beancount-mode@eb8b9b72a7 -> beancount/beancount-mode@8a564f5a26
emacs-lsp/lsp-dart@34e2a1191f -> emacs-lsp/lsp-dart@fd82395180
emacsorphanage/dart-mode@edb45cb709 -> emacsorphanage/dart-mode@9fbf703e1f
fsharp/emacs-fsharp-mode@91abae13e8 -> fsharp/emacs-fsharp-mode@c0f4df4747
ppareit/graphviz-dot-mode@2c7ba85d19 -> ppareit/graphviz-dot-mode@516c151b84
weijiangan/flycheck-golangci-lint@14bf143ea7 -> weijiangan/flycheck-golangci-lint@38cc30eb8b
2025-12-02 21:46:22 -05:00
Henrik Lissner
3a2c394a0a
bump: :lang php python raku rest swift zig
Raku/raku-mode@14f9b9bba0 -> Raku/raku-mode@d06baaa2e8
emacs-lsp/lsp-pyright@0e59c00c7f -> emacs-lsp/lsp-pyright@21b8f48785
emacs-lsp/lsp-sourcekit@30918cd1ae -> emacs-lsp/lsp-sourcekit@b4666e7deb
emacs-php/php-mode@40b8abed30 -> emacs-php/php-mode@d9858333e4
emacsorphanage/restclient@ad97f666b6 -> emacsorphanage/restclient@426507f8f7
ljos/jq-mode@3275c3f53f -> ljos/jq-mode@39acc77a63
necaris/conda.el@8a1a934a2d -> necaris/conda.el@82b9f77a7f
pythonic-emacs/pyenv-mode@364bddb8f0 -> pythonic-emacs/pyenv-mode@8e5128ff7f
rechsteiner/swift-ts-mode@43a0be79f9 -> rechsteiner/swift-ts-mode@17806f6f56
swift-emacs/swift-mode@fc7df7bd90 -> swift-emacs/swift-mode@cfae3b85ad
ziglang/zig-mode@dab3c37c2d -> ziglang/zig-mode@20e395f940
2025-12-02 21:44:55 -05:00
Henrik Lissner
45339fd8b6
bump: :lang org
emacs-jupyter/jupyter@3615c2de16 -> emacs-jupyter/jupyter@de89cbeca8
emacs-straight/org-mode@8b15a0d0b4 -> emacs-straight/org-mode@b7bc0ede67
emacsmirror/org-contrib@f1f6b6ec81 -> emacsmirror/org-contrib@90e1d6bd62
emacsorphanage/htmlize@c9a8196a59 -> emacsorphanage/htmlize@fa64488069
hakimel/reveal.js@4cf184924d -> hakimel/reveal.js@becc9bd19e
magit/orgit-forge@5a0dbe2601 -> magit/orgit-forge@15f8e91083
magit/orgit@8493c24808 -> magit/orgit@e0b3fca9f3
minad/org-modern@d5e1f5af65 -> minad/org-modern@567b702ad0
oer/org-re-reveal@4eb0f71474 -> oer/org-re-reveal@fea255aef7
org-roam/org-roam@89dfaef38b -> org-roam/org-roam@f4ba41cf3d
2025-12-02 21:22:11 -05:00
Henrik Lissner
8c615cc333
bump: :lang gdscript lua rust sh
emacs-rustic/rustic@2b4ac5de3b -> emacs-rustic/rustic@e77f62facc
godotengine/emacs-gdscript-mode@a0d25b46d8 -> godotengine/emacs-gdscript-mode@79739fc80f
jschaf/powershell.el@99e0e73082 -> jschaf/powershell.el@ae60e11c96
rust-lang/rust-mode@9915b3a585 -> rust-lang/rust-mode@2d31814676
technomancy/fennel-mode@0d638f6133 -> technomancy/fennel-mode@c1bccdec9e
2025-12-02 21:21:58 -05:00
Henrik Lissner
15db7620e4
fix(haskell): lsp activation w/ treesit & eglot
Fixed an issue where eglot wouldn't activate if lsp-haskell was disabled
or the user had +tree-sitter enabled.

Fix: #8528
2025-12-02 21:13:35 -05:00
Henrik Lissner
f727456a27
fix(lsp): set-eglot-client!: single client declarations
Also mentions that MODE can be a list of major modes.

Fix: #8528
2025-12-02 19:48:33 -05:00
19 changed files with 44 additions and 39 deletions

View file

@ -4,4 +4,4 @@
(package! beancount
:recipe (:host github
:repo "beancount/beancount-mode")
:pin "eb8b9b72a750b8d5db97dec909298162ae798e33")
:pin "8a564f5a26e6245860188ebf71db0262dd78e068")

View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*-
;;; lang/dart/packages.el
(package! dart-mode :pin "edb45cb7095b1e4f62eaae33e56fe9af5b010213")
(package! dart-mode :pin "9fbf703e1f8f32be4f864bc532490c6bcd71a746")
(when (and (modulep! +tree-sitter) (treesit-available-p))
(package! dart-ts-mode
@ -11,7 +11,7 @@
(when (and (modulep! +lsp)
(modulep! :tools lsp -eglot))
(package! lsp-dart :pin "34e2a1191f723792d5f366b314cd6b07de4f1566"))
(package! lsp-dart :pin "fd8239518026041a07305e88c15ad40faf3c3038"))
(when (modulep! +flutter)
(package! flutter :pin "e71235d400787d977da7ed792709437899c2a03c")

View file

@ -3,6 +3,6 @@
;; +elixir.el
(package! elixir-mode :pin "00d6580a040a750e019218f9392cf9a4c2dac23a")
(package! exunit :pin "9a7cfc3d7893cba3b2955be7399a2158bbed4d8b")
(package! exunit :pin "12a1efd003d3fbe6d91816fcec4b8d10bdba8d8d")
(when (modulep! :checkers syntax -flymake)
(package! flycheck-credo :pin "e285bd042a535d0f13e0b4c5226df404cdda4033"))

View file

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

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*-
;;; lang/gdscript/packages.el
(package! gdscript-mode :pin "a0d25b46d80cb3d242f70555ac68c32661ca0b80")
(package! gdscript-mode :pin "79739fc80f836b37aae81bc66437ba7e5edac1bb")

View file

@ -7,4 +7,4 @@
(package! go-gen-test :pin "af00a9abbaba2068502327ecdef574fd894a884b")
(when (modulep! :checkers syntax -flymake)
(package! flycheck-golangci-lint :pin "14bf143ea7ae190544326576a156de9c915a4751"))
(package! flycheck-golangci-lint :pin "38cc30eb8b3056260993bd085f5ae6bc90af177f"))

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*-
;;; lang/graphviz/packages.el
(package! graphviz-dot-mode :pin "2c7ba85d19cbed4984d0cab31aa33800ffa89f78")
(package! graphviz-dot-mode :pin "516c151b845a3eb2da73eb4ee648ad99172087ac")

View file

@ -28,6 +28,10 @@
#'haskell-collapse-mode ; support folding haskell code blocks
#'interactive-haskell-mode)
(when (modulep! +lsp)
(add-hook 'haskell-mode-local-vars-hook #'lsp! 'append)
(add-hook 'haskell-literate-mode-local-vars-hook #'lsp! 'append))
(add-to-list 'completion-ignored-extensions ".hi")
(map! :map haskell-mode-map
@ -52,15 +56,14 @@
'((haskell :url "https://github.com/tree-sitter/tree-sitter-haskell")))
:config
(set-repl-handler! 'haskell-ts-mode #'run-haskell :persist t)
(set-eglot-client! 'haskell-ts-mode '("haskell-language-server-wrapper" "--lsp")))
(set-eglot-client! 'haskell-ts-mode '("haskell-language-server-wrapper" "--lsp"))
(when (modulep! +lsp)
(add-hook 'haskell-ts-mode-local-vars-hook #'lsp! 'append)))
(use-package! lsp-haskell
:when (modulep! +lsp)
:defer t
:init
(add-hook 'haskell-mode-local-vars-hook #'lsp! 'append)
(add-hook 'haskell-literate-mode-local-vars-hook #'lsp! 'append)
:config
;; Does some strange indentation if it pastes in the snippet
(setq-hook! 'haskell-mode-hook yas-indent-line 'fixed))

View file

@ -11,7 +11,7 @@
:pin "fcb99e5efcf31db05f236f02eaa575986a57172d")))
(when (modulep! +fennel)
(package! fennel-mode :pin "0d638f6133cb1d9dc09754a198625f2b698c76a1"))
(package! fennel-mode :pin "c1bccdec9e8923247c9b1a5ffcf14039d2ddb227"))
(when (modulep! :completion company)
(package! company-lua :pin "29f6819de4d691e5fd0b62893a9f4fbc1c6fcb52"))

View file

@ -31,14 +31,14 @@
(format "(defun org-git-version (&rest _) \"%s-??-%s\")\n"
version (cdr (doom-call-process "git" "rev-parse" "--short" "HEAD")))
"(provide 'org-version)\n")))))
:pin "8b15a0d0b48a0e3ce09be0d208d74a01743cbbe0") ; release_9.7.34
:pin "b7bc0ede67f3e2a477f4d6ad0c46a6d80bca5aea") ; release_9.7.39
(package! org-contrib
:recipe (:host github
:repo "emacsmirror/org-contrib")
:pin "f1f6b6ec812803ff99693255555a82960fb3545a")
:pin "90e1d6bd6288615233dae273f0525a43a9d8779d")
(package! avy)
(package! htmlize :pin "c9a8196a59973fabb3763b28069af9a4822a5260")
(package! htmlize :pin "fa644880699adea3770504f913e6dddbec90c076")
(package! ox-clip :pin "a549cc8e1747beb6b7e567ffac27e31ba45cb8e8")
(package! toc-org :pin "6d3ae0fc47ce79b1ea06cabe21a3c596395409cd")
(package! org-cliplink :pin "13e0940b65d22bec34e2de4bc8cba1412a7abfbc")
@ -66,9 +66,9 @@
(when (modulep! :tools pdf)
(package! org-pdftools :pin "2b3357828a4c2dfba8f87c906d64035d8bf221f2"))
(when (modulep! :tools magit)
(package! orgit :pin "8493c248081a9ed71ad6fd61e4d6b48c8a0039ec")
(package! orgit :pin "e0b3fca9f328065af52b81a619445b6a45a3ab25")
(when (modulep! :tools magit +forge)
(package! orgit-forge :pin "5a0dbe26012b2e7885895f80283ba8974a1e8b38")))
(package! orgit-forge :pin "15f8e91083969117cb14521b9b8b9e7af2016771")))
(when (modulep! +brain)
(package! org-brain :pin "2bad7732aae1a3051e2a14de2e30f970bbe43c25"))
(when (modulep! +dragndrop)
@ -77,7 +77,7 @@
(package! gnuplot :pin "4c6b18f71ff7604e2640033207f5a882ddce78af")
(package! gnuplot-mode :pin "601f6392986f0cba332c87678d31ae0d0a496ce7"))
(when (modulep! +jupyter)
(package! jupyter :pin "3615c2de16988c4dd9d1978bfa10ee3092e85b33"))
(package! jupyter :pin "de89cbeca890db51ba84aee956658f89aaa0b642"))
(when (modulep! +journal)
(package! org-journal :pin "c72d7c75f8a05d1032250e307d35797ceee7e578"))
(when (modulep! +noter)
@ -85,21 +85,21 @@
(when (modulep! +pomodoro)
(package! org-pomodoro :pin "3f5bcfb80d61556d35fc29e5ddb09750df962cc6"))
(when (modulep! +pretty)
(package! org-modern :pin "d5e1f5af65cce53113e017d319edaff25641e15b")
(package! org-modern :pin "567b702ad0aedbab3451a9e064abb23d1bb275c2")
(package! org-appear :pin "32ee50f8fdfa449bbc235617549c1bccb503cb09"))
(when (modulep! +present)
(package! centered-window
:recipe (:host github :repo "nullvec/centered-window-mode")
:pin "701f56cd1d2b68352d29914f05ca1b0037bb2595")
(package! org-tree-slide :pin "e2599a106a26ce5511095e23df4ea04be6687a8a")
(package! org-re-reveal :pin "4eb0f7147447c956231f5c178fa454b7cb76741b")
(package! org-re-reveal :pin "fea255aef79169f0dcb2ff049ace35523cfc4bcd")
(package! revealjs
:recipe (:host github :repo "hakimel/reveal.js"
:files ("css" "dist" "js" "plugin"))
:pin "4cf184924d59e3d2b6552190c740ea5c7ab07981"))
:pin "becc9bd19e418b75027b541c41952105a1425c96"))
(when (or (modulep! +roam)
(modulep! +roam2))
(package! org-roam :pin "89dfaef38b6caa3027f20f96a551dc8f194ac533"))
(package! org-roam :pin "f4ba41cf3d59084e182a5186d432afc9aa3fc423"))
;;; Babel
(package! ob-async :pin "9aac486073f5c356ada20e716571be33a350a982")

View file

@ -2,7 +2,7 @@
;;; lang/php/packages.el
(package! psysh :pin "223bf55975d148f65f66bb8980c14c1230f067ff")
(package! php-mode :pin "40b8abed3079771e060dd99a56703520dabf5be4")
(package! php-mode :pin "d9858333e42f42c1486a84bc5277e9d8e37e40cc")
(package! php-refactor-mode :pin "7a794b0618df2882b1bd586fdd698dba0bc5130d")
(package! phpunit :pin "650a50898de1fa4eeb47360b12aeb1126b2448c2")
(package! composer :pin "eba6b953a4a68bc22b957d59eb3159c6d5cff39d")

View file

@ -12,15 +12,15 @@
(when (modulep! +lsp)
(unless (modulep! :tools lsp +eglot)
(when (modulep! +pyright)
(package! lsp-pyright :pin "0e59c00c7ffcf74e27da085ae33afdb9a48b9470"))))
(package! lsp-pyright :pin "21b8f487855feb08f7df669b8884fbd5861dca25"))))
;; Environment management
(package! pipenv :pin "3af159749824c03f59176aff7f66ddd6a5785a10")
(package! pyvenv :pin "31ea715f2164dd611e7fc77b26390ef3ca93509b")
(when (modulep! +pyenv)
(package! pyenv-mode :pin "364bddb8f0c8ec022796210d8d3625a520e984b0"))
(package! pyenv-mode :pin "8e5128ff7f722a4d68ddaa22022cb99ef9ddcf9a"))
(when (modulep! +conda)
(package! conda :pin "8a1a934a2de576d4158b1b12329be4f5be931a4a"))
(package! conda :pin "82b9f77a7f7d5c6ea91e06c5bd54d8a43a75f977"))
(when (modulep! +poetry)
(package! poetry :pin "1dff0d4a51ea8aff5f6ce97b154ea799902639ad"))

View file

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

View file

@ -1,10 +1,10 @@
;; -*- no-byte-compile: t; -*-
;;; lang/rest/packages.el
(package! restclient :pin "ad97f666b607b1947aae4bcfb5b91fb3b0d97b87")
(package! restclient :pin "426507f8f7029347fbbc78ce3b963df718abc3ce")
(when (modulep! :completion company)
(package! company-restclient :pin "e5a3ec54edb44776738c13e13e34c85b3085277b"))
(when (modulep! +jq)
(package! jq-mode :pin "3275c3f53fdc60c8065a8b05395b559ecb9edfaf")
(package! restclient-jq :pin "ad97f666b607b1947aae4bcfb5b91fb3b0d97b87"))
(package! jq-mode :pin "39acc77a63555b8556b8163be3d9b142d173c795")
(package! restclient-jq :pin "426507f8f7029347fbbc78ce3b963df718abc3ce"))

View file

@ -1,5 +1,5 @@
;; -*- no-byte-compile: t; -*-
;;; lang/rust/packages.el
(package! rust-mode :pin "9915b3a585a7a75e9126df9e0e9d1df8057ae3cf")
(package! rustic :pin "2b4ac5de3b5f084b45449bbe35d5823b332b3b1e")
(package! rust-mode :pin "2d3181467699b18d2556d3008f379455595e23be")
(package! rustic :pin "e77f62facc1f6287bc62c1dd41a996b8fb25fea2")

View file

@ -11,4 +11,4 @@
(package! fish-mode :pin "2526b1803b58cf145bc70ff6ce2adb3f6c246f89"))
(when (modulep! +powershell)
(package! powershell :pin "99e0e73082fd48314a9825254dac45f318e5bb59"))
(package! powershell :pin "ae60e11c96cc1767f05ce0cab6a917240ce2e37a"))

View file

@ -1,15 +1,15 @@
;; -*- no-byte-compile: t; -*-
;;; lang/swift/packages.el
(package! swift-mode :pin "fc7df7bd906a2bb04aac6e0de47fc7acf33ceed3")
(package! swift-mode :pin "cfae3b85ad09bd293df941261afbc21e41bbb5f8")
(if (modulep! +lsp)
(unless (modulep! :tools lsp +eglot)
(package! lsp-sourcekit :pin "30918cd1aeeda5cfbc0fd615f97cf1bf388d8f2d"))
(package! lsp-sourcekit :pin "b4666e7deb7a13cf74ed1c52ca301559d9dc263c"))
(when (modulep! :completion company)
(package! company-sourcekit :pin "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c"))
(when (modulep! :checkers syntax -flymake)
(package! flycheck-swift :pin "4c5ad401252400a78da395fd56a71e67ff8c2761")))
(when (and (modulep! +tree-sitter) (treesit-available-p))
(package! swift-ts-mode :pin "43a0be79f9758fc444f5fafdff6023c4c7bf80f7"))
(package! swift-ts-mode :pin "17806f6f56f09c86c5e70af239bea4313aaaf0b8"))

View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*-
;;; lang/zig/packages.el
(package! zig-mode :pin "dab3c37c2d045040e3a7ce970731b66c9d5fb29b")
(package! zig-mode :pin "20e395f940afe1e19e965050b0284ec418d6a9d5")
(when (and (modulep! +tree-sitter) (treesit-available-p))
(package! zig-ts-mode :pin "3898b70d6f72da688e086323fa2922f1542d1318"))

View file

@ -5,6 +5,8 @@
(defun set-eglot-client! (mode &rest alternatives)
"Set ALTERNATIVES as the given eglot lsp server for given major MODE.
MODE can be a list of major modes symbol or a single one.
MODE and ALTERNATIVES take after MAJOR-MODE and CONTACT in
`eglot-server-programs'. MODE can be one major mode symbol or a list thereof.
ALTERNATIVES specifies how to connect to a server in those modes."
@ -12,7 +14,7 @@ ALTERNATIVES specifies how to connect to a server in those modes."
(add-to-list 'eglot-server-programs
(cons mode (if (cdr alternatives)
(eglot-alternatives alternatives)
alternatives)))))
(car alternatives))))))
;; HACK Eglot removed `eglot-help-at-point' in joaotavora/eglot@a044dec for a
;; more problematic approach of deferred to eldoc. Here, I've restored it.