diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el index ddad61092..c797303e2 100644 --- a/modules/completion/vertico/config.el +++ b/modules/completion/vertico/config.el @@ -229,7 +229,8 @@ orderless." (add-to-list 'consult-dir-sources 'consult-dir--source-tramp-local t)) (use-package! consult-flycheck - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after (consult flycheck)) diff --git a/modules/completion/vertico/packages.el b/modules/completion/vertico/packages.el index 645e26d6e..eb55266c4 100644 --- a/modules/completion/vertico/packages.el +++ b/modules/completion/vertico/packages.el @@ -10,7 +10,8 @@ (package! consult :pin "fe49dedd71802ff97be7b89f1ec4bd61b98c2b13") (package! consult-dir :pin "ed8f0874d26f10f5c5b181ab9f2cf4107df8a0eb") -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! consult-flycheck :pin "3f2a7c17cc2fe64e0c07e3bf90e33c885c0d7062")) (package! embark :pin "9a44418c349e41020cdc5ad1bd21e8c77a429062") (package! embark-consult :pin "9a44418c349e41020cdc5ad1bd21e8c77a429062") diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 788903f0f..c0fb46811 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -35,7 +35,7 @@ This is ignored by ccls.") (use-package! cc-mode :mode ("\\.mm\\'" . objc-mode) ;; Use `c-mode'/`c++-mode'/`objc-mode' depending on heuristics - :mode ("\\.h\\'" . +cc-c-c++-objc-mode) + :mode ("\\.h\\'" . +cc-c-c++-objc-mode) ;; Ensure find-file-at-point recognize system libraries in C modes. It must be ;; set up before the likes of irony/lsp are initialized. Also, we use ;; local-vars hooks to ensure these only run in their respective major modes, @@ -146,7 +146,8 @@ This is ignored by ccls.") :hook (irony-mode . irony-eldoc)) (use-package! flycheck-irony - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :config (flycheck-irony-setup)) (use-package! company-irony diff --git a/modules/lang/cc/packages.el b/modules/lang/cc/packages.el index 45f49ce95..ebf67ec56 100644 --- a/modules/lang/cc/packages.el +++ b/modules/lang/cc/packages.el @@ -22,7 +22,8 @@ (package! ccls :pin "29d231590fad39b4d658d9262859e60669edb9b0")) (when (package! irony :pin "870d1576fb279bb93f776a71e65f45283c423a9e") (package! irony-eldoc :pin "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978") - (when (modulep! :checkers syntax) + (when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-irony :pin "42dbecd4a865cabeb301193bb4d660e26ae3befe")) (when (modulep! :completion company) (package! company-irony :pin "b44711dfce445610c1ffaec4951c6ff3882b216a") diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el index c2ed10cab..dc51777e5 100644 --- a/modules/lang/clojure/config.el +++ b/modules/lang/clojure/config.el @@ -271,6 +271,7 @@ ;; clojure-lsp already uses clj-kondo under the hood (use-package! flycheck-clj-kondo :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake)) (not (modulep! +lsp))) :after flycheck) diff --git a/modules/lang/clojure/packages.el b/modules/lang/clojure/packages.el index 496b3ac63..5603afe85 100644 --- a/modules/lang/clojure/packages.el +++ b/modules/lang/clojure/packages.el @@ -17,7 +17,6 @@ (package! clojure-mode :pin "3453cd229b412227aaffd1dc2870fa8fa213c5b1") (package! clj-refactor :pin "b5abe655e572a6ecfed02bb8164b64716ef76b8e") (package! cider :pin "1ed5163433c991c00ea83fdd4447e8daf4aeccbe") - (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) (package! flycheck-clj-kondo :pin "ff7bed2315755cfe02ef471edf522e27b78cd5ca")) diff --git a/modules/lang/crystal/config.el b/modules/lang/crystal/config.el index aceb5ed58..255f1a89d 100644 --- a/modules/lang/crystal/config.el +++ b/modules/lang/crystal/config.el @@ -16,12 +16,14 @@ (use-package! flycheck-crystal - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after crystal-mode) (use-package! flycheck-ameba - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after crystal-mode :config (flycheck-ameba-setup)) diff --git a/modules/lang/crystal/packages.el b/modules/lang/crystal/packages.el index 1adb540d7..6fa5ef803 100644 --- a/modules/lang/crystal/packages.el +++ b/modules/lang/crystal/packages.el @@ -3,6 +3,7 @@ (package! crystal-mode :pin "9bfb9f0f566e937cc6a2f2913d1b56978b81dc99") (package! inf-crystal :pin "02007b2a2a3bea44902d7c83c4acba1e39d278e3") -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-crystal :pin "9bfb9f0f566e937cc6a2f2913d1b56978b81dc99") (package! flycheck-ameba :pin "0c4925ae0e998818326adcb47ed27ddf9761c7dc")) diff --git a/modules/lang/elixir/config.el b/modules/lang/elixir/config.el index f1b68ddef..5a6771cd7 100644 --- a/modules/lang/elixir/config.el +++ b/modules/lang/elixir/config.el @@ -51,7 +51,8 @@ (use-package! flycheck-credo - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after elixir-mode :config (flycheck-credo-setup)) diff --git a/modules/lang/elixir/packages.el b/modules/lang/elixir/packages.el index f4f6cb474..6521fcd40 100644 --- a/modules/lang/elixir/packages.el +++ b/modules/lang/elixir/packages.el @@ -4,5 +4,6 @@ ;; +elixir.el (package! elixir-mode :pin "7641373f0563cab67cc5459c34534a8176b5e676") (package! exunit :pin "e0a8c2b81f3d53885ed753b911b3cb6ee9229bec") -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-credo :pin "e88f11ead53805c361ec7706e44c3dfee1daa19f")) diff --git a/modules/lang/elm/config.el b/modules/lang/elm/config.el index b15018765..5423963c9 100644 --- a/modules/lang/elm/config.el +++ b/modules/lang/elm/config.el @@ -27,6 +27,7 @@ :desc "Compile JS (optimized)" "J" #'+elm/compile-js-optimized))) (use-package! flycheck-elm - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after elm-mode :config (add-to-list 'flycheck-checkers 'elm)) diff --git a/modules/lang/elm/packages.el b/modules/lang/elm/packages.el index dba6e810d..a9baf1486 100644 --- a/modules/lang/elm/packages.el +++ b/modules/lang/elm/packages.el @@ -2,5 +2,6 @@ ;;; lang/elm/packages.el (package! elm-mode :pin "5797500d74dd8544a89938c09d3cd5cdf7b5d7bc") -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-elm :pin "1b60050efd4729bfba548f3e5adbcb58436667cb")) diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index eece0fd9b..d6393e384 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -190,7 +190,8 @@ See `+emacs-lisp-non-package-mode' for details.") (use-package! flycheck-cask - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :defer t :init (add-hook! 'emacs-lisp-mode-hook @@ -198,7 +199,8 @@ See `+emacs-lisp-non-package-mode' for details.") (use-package! flycheck-package - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after flycheck :config (flycheck-package-setup)) diff --git a/modules/lang/emacs-lisp/packages.el b/modules/lang/emacs-lisp/packages.el index 9be18f03d..f739682e8 100644 --- a/modules/lang/emacs-lisp/packages.el +++ b/modules/lang/emacs-lisp/packages.el @@ -11,7 +11,8 @@ (package! overseer :pin "02d49f582e80e36b4334c9187801c5ecfb027789") (package! elisp-def :pin "1d2e88a232ec16bce036b49577c4d4d96035f9f7") (package! elisp-demos :pin "792be709c82101aea0585ece7429e2fdded74494") -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-package :pin "3a6aaed29ff61418c48c0251e1432c30748ae739") (package! flycheck-cask :pin "4b2ede6362ded4a45678dfbef1876faa42edbd58")) diff --git a/modules/lang/ess/config.el b/modules/lang/ess/config.el index 0bb2b84e4..91d36b59d 100644 --- a/modules/lang/ess/config.el +++ b/modules/lang/ess/config.el @@ -14,7 +14,8 @@ (add-to-list 'auto-mode-alist '("\\.jl\\'" . ess-julia-mode))) :config (setq ess-offset-continued 'straight - ess-use-flymake (not (modulep! :checkers syntax)) + ess-use-flymake (or (not (modulep! :checkers syntax)) + (modulep! :checkers syntax +flymake)) ess-nuke-trailing-whitespace-p t ess-style 'DEFAULT ess-history-directory (expand-file-name "ess-history/" doom-cache-dir)) @@ -104,6 +105,7 @@ :hook (stan-mode . company-stan-setup)) (use-package! flycheck-stan - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :hook (stan-mode . flycheck-stan-stanc2-setup) :hook (stan-mode . flycheck-stan-stanc3-setup))) diff --git a/modules/lang/ess/packages.el b/modules/lang/ess/packages.el index 019fd3792..aa731dc1f 100644 --- a/modules/lang/ess/packages.el +++ b/modules/lang/ess/packages.el @@ -11,5 +11,6 @@ (package! eldoc-stan :pin "150bbbe5fd3ad2b5a3dbfba9d291e66eeea1a581") (when (modulep! :completion company) (package! company-stan :pin "150bbbe5fd3ad2b5a3dbfba9d291e66eeea1a581")) - (when (modulep! :checkers syntax) + (when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-stan :pin "150bbbe5fd3ad2b5a3dbfba9d291e66eeea1a581"))) diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el index d29b966ca..525444a81 100644 --- a/modules/lang/go/config.el +++ b/modules/lang/go/config.el @@ -78,5 +78,6 @@ (setq company-go-show-annotation t)) (use-package! flycheck-golangci-lint - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :hook (go-mode . flycheck-golangci-lint-setup)) diff --git a/modules/lang/go/packages.el b/modules/lang/go/packages.el index e40feb28c..026a9b938 100644 --- a/modules/lang/go/packages.el +++ b/modules/lang/go/packages.el @@ -11,5 +11,6 @@ (when (modulep! :completion company) (package! company-go :pin "31948b463f2fc18f8801e5a8fe511fef300eb3dd")) -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-golangci-lint :pin "8e446c68311048f0b87febf8ef0379e29d358851")) diff --git a/modules/lang/java/+meghanada.el b/modules/lang/java/+meghanada.el index caec53729..449372e5b 100644 --- a/modules/lang/java/+meghanada.el +++ b/modules/lang/java/+meghanada.el @@ -6,7 +6,8 @@ :init (setq meghanada-server-install-dir (concat doom-data-dir "meghanada-server/") meghanada-use-company (modulep! :completion company) - meghanada-use-flycheck (modulep! :checkers syntax) + meghanada-use-flycheck (or (modulep! :checkers syntax +flymake) + (not (modulep! :checkers syntax))) meghanada-use-eldoc t meghanada-use-auto-start t) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index a64e4f5dc..212ba6dd0 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -106,7 +106,8 @@ #'typescript-tsx-mode #'typescript-mode))) - (when (modulep! :checkers syntax) + (when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (after! flycheck (flycheck-add-mode 'javascript-eslint 'web-mode) (flycheck-add-mode 'javascript-eslint 'typescript-mode) diff --git a/modules/lang/kotlin/config.el b/modules/lang/kotlin/config.el index 23514f267..289821ceb 100644 --- a/modules/lang/kotlin/config.el +++ b/modules/lang/kotlin/config.el @@ -15,5 +15,6 @@ (use-package! flycheck-kotlin - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :hook (kotlin-mode . flycheck-kotlin-setup)) diff --git a/modules/lang/kotlin/packages.el b/modules/lang/kotlin/packages.el index e2836f8c5..fedcb2021 100644 --- a/modules/lang/kotlin/packages.el +++ b/modules/lang/kotlin/packages.el @@ -3,5 +3,6 @@ (package! kotlin-mode :pin "fddd747e5b4736e8b27a147960f369b86179ddff") -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-kotlin :pin "a2a6abb9a7f85c6fb15ce327459ec3c8ff780188")) diff --git a/modules/lang/ledger/config.el b/modules/lang/ledger/config.el index d8a74bdc2..164ec46da 100644 --- a/modules/lang/ledger/config.el +++ b/modules/lang/ledger/config.el @@ -38,7 +38,8 @@ (use-package! flycheck-ledger - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after ledger-mode) diff --git a/modules/lang/ledger/packages.el b/modules/lang/ledger/packages.el index 0bd3f39cc..da9ff31a6 100644 --- a/modules/lang/ledger/packages.el +++ b/modules/lang/ledger/packages.el @@ -6,5 +6,6 @@ (when (modulep! :editor evil) (package! evil-ledger :pin "7a9f9f5d39c42fffdba8004f8982642351f2b233")) -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-ledger :pin "628e25ba66604946085571652a94a54f4d1ad96f")) diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el index 0fe4d6595..b87b6ad4d 100644 --- a/modules/lang/lua/config.el +++ b/modules/lang/lua/config.el @@ -56,7 +56,8 @@ lua-language-server.") (add-hook! 'moonscript-mode-hook #'+lua-moonscript-fix-single-quotes-h #'+lua-moonscript-fontify-interpolation-h) - (when (modulep! :checkers syntax) + (when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (require 'flycheck-moonscript nil t))) diff --git a/modules/lang/lua/packages.el b/modules/lang/lua/packages.el index e9e9922bf..1abe531a6 100644 --- a/modules/lang/lua/packages.el +++ b/modules/lang/lua/packages.el @@ -5,7 +5,8 @@ (when (modulep! +moonscript) (package! moonscript :pin "56f90471e2ced2b0a177aed4d8c2f854797e9cc7") - (when (modulep! :checkers syntax) + (when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-moonscript :recipe (:host github :repo "hlissner/emacs-flycheck-moonscript") :pin "fcb99e5efcf31db05f236f02eaa575986a57172d"))) diff --git a/modules/lang/nim/config.el b/modules/lang/nim/config.el index 257112e6a..377154627 100644 --- a/modules/lang/nim/config.el +++ b/modules/lang/nim/config.el @@ -34,6 +34,6 @@ windows." (use-package! flycheck-nim - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after nim-mode) - diff --git a/modules/lang/nim/packages.el b/modules/lang/nim/packages.el index e90c69ebc..b085dcde7 100644 --- a/modules/lang/nim/packages.el +++ b/modules/lang/nim/packages.el @@ -5,5 +5,6 @@ (package! nim-mode :pin "744e076f0bea1c5ddc49f92397d9aa98ffa7eff8") -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-nim :pin "ddfade51001571c2399f78bcc509e0aa8eb752a4")) diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el index 22d3ac30e..965955dce 100644 --- a/modules/lang/ocaml/config.el +++ b/modules/lang/ocaml/config.el @@ -64,7 +64,9 @@ "t" #'merlin-type-enclosing) (use-package! flycheck-ocaml - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) + :hook (merlin-mode . +ocaml-init-flycheck-h) :config (defun +ocaml-init-flycheck-h () diff --git a/modules/lang/ocaml/packages.el b/modules/lang/ocaml/packages.el index e6942bd75..b24f1fc9b 100644 --- a/modules/lang/ocaml/packages.el +++ b/modules/lang/ocaml/packages.el @@ -7,7 +7,8 @@ (package! merlin :pin "306af713e268d810ea0dc80bdf8e98265f96bd51") (package! merlin-eldoc :pin "bf8edc63d85b35e4def352fa7ce4ea39f43e1fd8") (package! merlin-company :pin "306af713e268d810ea0dc80bdf8e98265f96bd51") - (when (modulep! :checkers syntax) + (when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-ocaml :pin "77f8ddbd9bfc3a11957ac7ec7e45d5fa9179b192"))) (package! ocp-indent :pin "7c4d434132cebc15a8213c8be9e7323692eb0a2b") diff --git a/modules/lang/purescript/config.el b/modules/lang/purescript/config.el index 9ffa90be3..e05fd82bc 100644 --- a/modules/lang/purescript/config.el +++ b/modules/lang/purescript/config.el @@ -33,6 +33,7 @@ :hook (purescript-mode . psc-ide-mode) :config (remove-hook 'company-backends 'company-psc-ide-backend) - (when (modulep! :checkers syntax) + (when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (psc-ide-flycheck-setup)) (set-company-backend! 'purescript-mode 'company-psc-ide-backend)) diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el index 49bcfeda0..3014db9db 100644 --- a/modules/lang/python/config.el +++ b/modules/lang/python/config.el @@ -310,7 +310,8 @@ (use-package! flycheck-cython :when (modulep! +cython) - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after cython-mode) diff --git a/modules/lang/raku/config.el b/modules/lang/raku/config.el index 87b8a015d..c85694c00 100644 --- a/modules/lang/raku/config.el +++ b/modules/lang/raku/config.el @@ -9,5 +9,6 @@ (use-package! flycheck-raku - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after raku-mode) diff --git a/modules/lang/raku/packages.el b/modules/lang/raku/packages.el index f8055282c..e36fe2af7 100644 --- a/modules/lang/raku/packages.el +++ b/modules/lang/raku/packages.el @@ -3,7 +3,8 @@ (package! raku-mode :pin "977b14a7c1295ebf2aad2f807d3f8e7c27aeb47f") -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-raku :recipe (:host github :repo "widefox/flycheck-raku") :pin "b1acccd6e9d9753022571ee96d18b8e9f3227c65")) diff --git a/modules/lang/scheme/config.el b/modules/lang/scheme/config.el index 30af3bd86..0f93d615a 100644 --- a/modules/lang/scheme/config.el +++ b/modules/lang/scheme/config.el @@ -75,7 +75,8 @@ (use-package! flycheck-guile :when (modulep! +guile) - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :after geiser) ;; Add Guix channels to Guile load path diff --git a/modules/lang/scheme/packages.el b/modules/lang/scheme/packages.el index a3bd2c553..449e3c8a6 100644 --- a/modules/lang/scheme/packages.el +++ b/modules/lang/scheme/packages.el @@ -20,7 +20,8 @@ (package! geiser-gauche :pin "8ff743f6416f00751e24aef8b9791501a40f5421")) (when (modulep! +guile) (package! geiser-guile :pin "24ce15de235c105daf5ecfb818200dae1c9815ee") - (when (modulep! :checkers syntax) + (when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-guile :recipe (:host github :repo "flatwhatson/flycheck-guile") :pin "e23a4d7813179124fd98abf1c2f4190a72569bee"))) diff --git a/modules/lang/solidity/config.el b/modules/lang/solidity/config.el index e5e072c0c..d53d8ca3d 100644 --- a/modules/lang/solidity/config.el +++ b/modules/lang/solidity/config.el @@ -9,7 +9,8 @@ (set-company-backend! 'solidity-mode 'company-solidity) (use-package! solidity-flycheck ; included with solidity-mode - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :config (setq flycheck-solidity-solc-addstd-contracts t) (when (funcall flycheck-executable-find solidity-solc-path) diff --git a/modules/lang/solidity/packages.el b/modules/lang/solidity/packages.el index cc68a2859..cbe1f2fa2 100644 --- a/modules/lang/solidity/packages.el +++ b/modules/lang/solidity/packages.el @@ -4,5 +4,6 @@ (package! solidity-mode :pin "ddb4a901c33bd29ba2eefff3b7f7461849c6e833") (when (modulep! :completion company) (package! company-solidity)) -(when (modulep! :checkers syntax) +(when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! solidity-flycheck)) diff --git a/modules/lang/swift/packages.el b/modules/lang/swift/packages.el index 6ffa7c73a..4ff56d17d 100644 --- a/modules/lang/swift/packages.el +++ b/modules/lang/swift/packages.el @@ -7,5 +7,6 @@ (package! lsp-sourcekit :pin "468c641e35877e4e843f6b7c52a35937de562995") (when (modulep! :completion company) (package! company-sourcekit :pin "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c")) - (when (modulep! :checkers syntax) + (when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (package! flycheck-swift :pin "4c5ad401252400a78da395fd56a71e67ff8c2761"))) diff --git a/modules/lang/zig/config.el b/modules/lang/zig/config.el index 94aaaf232..71f2b7657 100644 --- a/modules/lang/zig/config.el +++ b/modules/lang/zig/config.el @@ -18,7 +18,8 @@ (when (modulep! +tree-sitter) (add-hook 'zig-mode-local-vars-hook #'tree-sitter! 'append)) - (when (modulep! :checkers syntax) + (when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) (flycheck-define-checker zig "A zig syntax checker using zig's `ast-check` command." :command ("zig" "ast-check" (eval (buffer-file-name))) @@ -26,7 +27,7 @@ ((error line-start (file-name) ":" line ":" column ": error: " (message) line-end)) :modes zig-mode) (add-to-list 'flycheck-checkers 'zig)) - + (map! :localleader :map zig-mode-map "b" #'zig-compile