dev: merging from master

This commit is contained in:
Matt Nish-Lapidus 2024-06-26 11:38:43 -04:00
commit e6f02b4485
4 changed files with 9 additions and 7 deletions

View file

@ -86,6 +86,7 @@
:config
(vimish-fold-global-mode +1))
(use-package! ts-fold
:when (modulep! :tools tree-sitter)
:after tree-sitter
@ -97,4 +98,4 @@
:inherit font-lock-comment-face
:weight light))
(setq ts-fold-replacement " [...] ")
(ts-fold-mode +1))
(global-ts-fold-mode +1))

View file

@ -7,5 +7,5 @@
(when (modulep! :editor evil)
(package! evil-vimish-fold :pin "b6e0e6b91b8cd047e80debef1a536d9d49eef31a"))
(when (modulep! :tools tree-sitter)
(package! ts-fold :pin "6ce584d1ac39f1e2bc2f66f815964e3047bd6f16"
(package! ts-fold :pin "5b8abb69cdef3128f1fdb69176b9963b13ceaf02"
:recipe (:host github :repo "emacs-tree-sitter/ts-fold")))

View file

@ -14,13 +14,13 @@
(package! parseedn :pin "3407e4530a367b6c2b857dae261cdbb67a440aaa")
;;; Core packages
(package! clojure-mode :pin "222fdafa2add56a171ded245339a383e5e3078ec")
(package! clj-refactor :pin "fa3efe18e7150df5153a7d05c54e96d59398a0a8")
(package! cider :pin "aa26d62ac59930079e47e652ccd73e8e447defd5")
(package! clojure-mode :pin "59888c84b61081e9b0085e388f55132925a66e7a")
(package! clj-refactor :pin "dc1bbc8cdaa723bdbb6669ea7d280625c370755d")
(package! cider :pin "105da319b09a436552f1b3c6194cbbc833017dd2")
(when (and (modulep! :checkers syntax)
(not (modulep! :checkers syntax +flymake)))
(package! flycheck-clj-kondo :pin "9089ade9e01b091139321c78ad75946944ff845d"))
(package! flycheck-clj-kondo :pin "e38c67ba9db1ea1cbe1b61ab39b506c05efdcdbf"))
(package! jet :pin "7d5157aac692fc761d8ed7a9f820fa6522136254")
(package! neil
:recipe (:host github :repo "babashka/neil" :files ("*.el"))
:pin "a1db63d420b85db814207113ca4a0b4b959073cc")
:pin "a38be9f0821b828f7c75a527bc4cfb256f6aa8af")

View file

@ -14,6 +14,7 @@
:mode ("\\.bats\\'" . sh-mode)
:mode ("\\.\\(?:zunit\\|env\\)\\'" . sh-mode)
:mode ("/bspwmrc\\'" . sh-mode)
:magic ("#compdef " . sh-mode)
:config
(set-docsets! 'sh-mode "Bash")
(set-electric! 'sh-mode :words '("else" "elif" "fi" "done" "then" "do" "esac" ";;"))