From 448bc5cae2ce6f6b8533d1975c6601e4072207d7 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Sat, 19 Oct 2024 14:57:44 -0400
Subject: [PATCH] refactor: use negated flags

Ref: 7a806521a92c
---
 modules/checkers/spell/autoload/+spell-fu.el | 2 +-
 modules/checkers/spell/config.el             | 2 +-
 modules/checkers/spell/doctor.el             | 2 +-
 modules/checkers/spell/packages.el           | 2 +-
 modules/completion/ivy/autoload/ivy.el       | 2 +-
 modules/completion/ivy/config.el             | 2 +-
 modules/completion/vertico/config.el         | 3 +--
 modules/completion/vertico/packages.el       | 3 +--
 modules/config/default/+emacs-bindings.el    | 4 ++--
 modules/config/default/+evil-bindings.el     | 7 +++----
 modules/config/default/autoload/text.el      | 2 +-
 modules/lang/cc/config.el                    | 4 ++--
 modules/lang/cc/packages.el                  | 2 +-
 modules/lang/clojure/config.el               | 7 +++----
 modules/lang/clojure/doctor.el               | 2 +-
 modules/lang/clojure/packages.el             | 3 +--
 modules/lang/crystal/config.el               | 6 ++----
 modules/lang/crystal/packages.el             | 3 +--
 modules/lang/csharp/doctor.el                | 2 +-
 modules/lang/dart/packages.el                | 2 +-
 modules/lang/elixir/config.el                | 3 +--
 modules/lang/elixir/packages.el              | 3 +--
 modules/lang/elm/config.el                   | 3 +--
 modules/lang/elm/packages.el                 | 3 +--
 modules/lang/emacs-lisp/config.el            | 6 ++----
 modules/lang/emacs-lisp/packages.el          | 3 +--
 modules/lang/ess/config.el                   | 3 +--
 modules/lang/ess/packages.el                 | 3 +--
 modules/lang/fortran/doctor.el               | 2 +-
 modules/lang/go/config.el                    | 3 +--
 modules/lang/go/doctor.el                    | 2 +-
 modules/lang/go/packages.el                  | 3 +--
 modules/lang/graphviz/config.el              | 3 +--
 modules/lang/haskell/doctor.el               | 2 +-
 modules/lang/haskell/packages.el             | 2 +-
 modules/lang/idris/config.el                 | 3 +--
 modules/lang/java/+lsp.el                    | 2 +-
 modules/lang/javascript/config.el            | 3 +--
 modules/lang/json/doctor.el                  | 2 +-
 modules/lang/kotlin/config.el                | 3 +--
 modules/lang/kotlin/packages.el              | 3 +--
 modules/lang/ledger/config.el                | 3 +--
 modules/lang/ledger/packages.el              | 3 +--
 modules/lang/lua/config.el                   | 3 +--
 modules/lang/lua/packages.el                 | 3 +--
 modules/lang/nim/config.el                   | 3 +--
 modules/lang/nim/packages.el                 | 3 +--
 modules/lang/nix/doctor.el                   | 2 +-
 modules/lang/ocaml/config.el                 | 4 +---
 modules/lang/ocaml/packages.el               | 3 +--
 modules/lang/php/config.el                   | 2 +-
 modules/lang/purescript/config.el            | 3 +--
 modules/lang/python/config.el                | 5 ++---
 modules/lang/raku/config.el                  | 3 +--
 modules/lang/raku/packages.el                | 3 +--
 modules/lang/rust/config.el                  | 2 +-
 modules/lang/scala/packages.el               | 2 +-
 modules/lang/scheme/config.el                | 3 +--
 modules/lang/scheme/packages.el              | 3 +--
 modules/lang/sh/doctor.el                    | 2 +-
 modules/lang/solidity/config.el              | 3 +--
 modules/lang/solidity/packages.el            | 3 +--
 modules/lang/swift/config.el                 | 2 +-
 modules/lang/swift/doctor.el                 | 2 +-
 modules/lang/swift/packages.el               | 3 +--
 modules/lang/zig/config.el                   | 3 +--
 modules/lang/zig/doctor.el                   | 4 ++--
 modules/tools/debugger/config.el             | 6 ++++--
 modules/tools/lsp/+eglot.el                  | 6 ++----
 modules/tools/lsp/autoload/lsp-mode.el       | 2 +-
 modules/tools/lsp/doctor.el                  | 3 +--
 modules/tools/lsp/packages.el                | 3 +--
 modules/ui/treemacs/packages.el              | 2 +-
 73 files changed, 87 insertions(+), 132 deletions(-)

diff --git a/modules/checkers/spell/autoload/+spell-fu.el b/modules/checkers/spell/autoload/+spell-fu.el
index 0e78dec81..b52e1eeeb 100644
--- a/modules/checkers/spell/autoload/+spell-fu.el
+++ b/modules/checkers/spell/autoload/+spell-fu.el
@@ -1,5 +1,5 @@
 ;;; checkers/spell/autoload/+spell-fu.el -*- lexical-binding: t; -*-
-;;;###if (not (modulep! +flyspell))
+;;;###if (modulep! -flyspell)
 
 (defun +spell--correct (replace poss word orig-pt start end)
   (cond ((eq replace 'ignore)
diff --git a/modules/checkers/spell/config.el b/modules/checkers/spell/config.el
index 168863f75..0516af538 100644
--- a/modules/checkers/spell/config.el
+++ b/modules/checkers/spell/config.el
@@ -70,7 +70,7 @@
 ;;
 ;;; Implementations
 
-(eval-if! (not (modulep! +flyspell))
+(eval-if! (modulep! -flyspell)
 
     (use-package! spell-fu
       :when (executable-find "aspell")
diff --git a/modules/checkers/spell/doctor.el b/modules/checkers/spell/doctor.el
index f74f7dca2..3662fe514 100644
--- a/modules/checkers/spell/doctor.el
+++ b/modules/checkers/spell/doctor.el
@@ -1,6 +1,6 @@
 ;;; checkers/spell/doctor.el -*- lexical-binding: t; -*-
 
-(when (or (not (modulep! +flyspell))
+(when (or (modulep! -flyspell)
           (modulep! +aspell))
   (unless (executable-find "aspell")
     (warn! "Couldn't find aspell executable; spell checker will not work")))
diff --git a/modules/checkers/spell/packages.el b/modules/checkers/spell/packages.el
index 9226c235c..8f7a2a8b3 100644
--- a/modules/checkers/spell/packages.el
+++ b/modules/checkers/spell/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; checkers/spell/packages.el
 
-(if (not (modulep! +flyspell))
+(if (modulep! -flyspell)
     (package! spell-fu
       :recipe (:host github :repo "emacsmirror/spell-fu")
       :pin "e4031935803c66eca2f076dce72b0a6a770d026c")
diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el
index 22cee141b..0dd6f1789 100644
--- a/modules/completion/ivy/autoload/ivy.el
+++ b/modules/completion/ivy/autoload/ivy.el
@@ -265,7 +265,7 @@ The point of this is to avoid Emacs locking up indexing massive file trees."
            (replace-regexp-in-string
             "[! |]" (lambda (substr)
                       (cond ((and (string= substr " ")
-                                  (not (modulep! +fuzzy)))
+                                  (modulep! -fuzzy))
                              "  ")
                             ((string= substr "|")
                              "\\\\\\\\|")
diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index e1ff701c3..a3d453d6f 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -366,7 +366,7 @@ workable results ripgrep produces, despite the error."
   :when (modulep! +fuzzy)
   :unless (modulep! +prescient)
   :defer t  ; is loaded by ivy
-  :preface (when (or (not (modulep! +fuzzy))
+  :preface (when (or (modulep! -fuzzy)
                      (modulep! +prescient))
              (setq ivy--flx-featurep nil))
   :init (setq ivy-flx-limit 10000))
diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el
index 0a325ef2a..0555b58e8 100644
--- a/modules/completion/vertico/config.el
+++ b/modules/completion/vertico/config.el
@@ -253,8 +253,7 @@ orderless."
   (add-to-list 'consult-dir-sources 'consult-dir--source-tramp-local t))
 
 (use-package! consult-flycheck
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (modulep! :checkers syntax -flymake)
   :after (consult flycheck))
 
 (use-package! consult-yasnippet
diff --git a/modules/completion/vertico/packages.el b/modules/completion/vertico/packages.el
index 0a67a9d6c..6ebbd8edb 100644
--- a/modules/completion/vertico/packages.el
+++ b/modules/completion/vertico/packages.el
@@ -7,8 +7,7 @@
 
 (package! consult :pin "0c3f53916ea0db0c472c0a0c620a85cc1b00caf2")
 (package! consult-dir :pin "15891383f34d43acc5bb82bda92239b1f54cf178")
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checkers syntax -flymake)
   (package! consult-flycheck :pin "3b999ae983900c16c0b5b5c30b7eca640d386a76"))
 (package! embark :pin "19a13e344e04bbf861eaa74491b23da52b398672")
 (package! embark-consult :pin "19a13e344e04bbf861eaa74491b23da52b398672")
diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index 7ff7900c0..15bd633eb 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -41,7 +41,7 @@
        :desc "Delete trailing whitespace"            "w"   #'delete-trailing-whitespace
        :desc "Delete trailing newlines"              "W"   #'doom/delete-trailing-newlines
        :desc "List errors"                           "x"   #'+default/diagnostics
-       (:when (and (modulep! :tools lsp) (not (modulep! :tools lsp +eglot)))
+       (:when (modulep! :tools lsp -eglot)
         :desc "LSP Code actions"                      "a"   #'lsp-execute-code-action
         :desc "LSP Organize imports"                  "o"   #'lsp-organize-imports
         :desc "LSP Rename"                            "r"   #'lsp-rename
@@ -344,7 +344,7 @@
        (:when (modulep! :lang org +present)
         :desc "org-tree-slide mode"        "p" #'org-tree-slide-mode)
        :desc "Read-only mode"               "r" #'read-only-mode
-       (:when (and (modulep! :checkers spell) (not (modulep! :checkers spell +flyspell)))
+       (:when (modulep! :checkers spell -flyspell)
         :desc "Spell checker"              "s" #'spell-fu-mode)
        (:when (modulep! :checkers spell +flyspell)
         :desc "Spell checker"              "s" #'flyspell-mode)
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index d7511760d..584f48b69 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -440,7 +440,7 @@
 
       ;;; <leader> c --- code
       (:prefix-map ("c" . "code")
-       (:when (and (modulep! :tools lsp) (not (modulep! :tools lsp +eglot)))
+       (:when (modulep! :tools lsp -eglot)
         :desc "LSP Execute code action"              "a"   #'lsp-execute-code-action
         :desc "LSP Organize imports"                 "o"   #'lsp-organize-imports
         :desc "LSP"                                  "l"   #'+default/lsp-command-map
@@ -842,8 +842,7 @@
        :desc "Fill Column Indicator"        "c" #'global-display-fill-column-indicator-mode
        :desc "Diff Highlights (Git Gutter)" "d" #'diff-hl-mode
        :desc "Flymake"                      "f" #'flymake-mode
-       (:when (and (modulep! :checkers syntax)
-                   (not (modulep! :checkers syntax +flymake)))
+       (:when (modulep! :checkers syntax -flymake)
         :desc "Flycheck"                   "f" #'flycheck-mode)
        :desc "Frame fullscreen"             "F" #'toggle-frame-fullscreen
        :desc "Evil goggles"                 "g" #'evil-goggles-mode
@@ -856,7 +855,7 @@
        (:when (modulep! :lang org +present)
         :desc "org-tree-slide mode"        "p" #'org-tree-slide-mode)
        :desc "Read-only mode"               "r" #'read-only-mode
-       (:when (and (modulep! :checkers spell) (not (modulep! :checkers spell +flyspell)))
+       (:when (modulep! :checkers spell -flyspell)
         :desc "Spell checker"              "s" #'spell-fu-mode)
        (:when (modulep! :checkers spell +flyspell)
         :desc "Spell checker"              "s" #'flyspell-mode)
diff --git a/modules/config/default/autoload/text.el b/modules/config/default/autoload/text.el
index ccc9da9fa..6fa4f04db 100644
--- a/modules/config/default/autoload/text.el
+++ b/modules/config/default/autoload/text.el
@@ -145,7 +145,7 @@ possible, or just one char if that's not possible."
              (insert-char ?\s (- ocol (current-column)) nil))))
         ;;
         ((= n 1)
-         (cond ((or (not (modulep! +smartparens))
+         (cond ((or (modulep! -smartparens)
                     (not (bound-and-true-p smartparens-mode))
                     (and (memq (char-before) (list ?\  ?\t))
                          (save-excursion
diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index 789c6fca2..10dfe3463 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -160,7 +160,7 @@ This is ignored by ccls.")
                cuda-mode-local-vars-hook)
              :append #'lsp!)
 
-  (if (not (modulep! :tools lsp +eglot))
+  (if (modulep! :tools lsp -eglot)
       (after! lsp-clangd
         ;; Prevent clangd from consuming all your cores indexing larger projects
         ;; and grinding your system to a halt.
@@ -185,7 +185,7 @@ This is ignored by ccls.")
 
 (use-package! ccls
   :when (modulep! +lsp)
-  :unless (modulep! :tools lsp +eglot)
+  :when (modulep! :tools lsp -eglot)
   :defer t
   :init
   (defvar ccls-sem-highlight-method 'font-lock)
diff --git a/modules/lang/cc/packages.el b/modules/lang/cc/packages.el
index 8a34ca29f..dd222765d 100644
--- a/modules/lang/cc/packages.el
+++ b/modules/lang/cc/packages.el
@@ -19,5 +19,5 @@
       :pin "404cd0694ab34971f9c01eb22126cd2e7d3f9dc4")))
 
 (when (and (modulep! +lsp)
-           (not (modulep! :tools lsp +eglot)))
+           (modulep! :tools lsp -eglot))
   (package! ccls :pin "41399b0eba03f9b80769ced71501ba702db4cd62"))
diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index dc87e1e44..15c2c2f2e 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -282,7 +282,7 @@
 
 
 (use-package! clj-refactor
-  :when (or (not (modulep! +lsp))
+  :when (or (modulep! -lsp)
             +clojure-load-clj-refactor-with-lsp)
   :hook (clojure-mode . clj-refactor-mode)
   :config
@@ -295,9 +295,8 @@
 
 ;; 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)))
+  :when (modulep! -lsp)
+  :when (modulep! :checkers syntax -flymake)
   :after flycheck)
 
 
diff --git a/modules/lang/clojure/doctor.el b/modules/lang/clojure/doctor.el
index 5cc63fb90..22455011e 100644
--- a/modules/lang/clojure/doctor.el
+++ b/modules/lang/clojure/doctor.el
@@ -2,7 +2,7 @@
 ;;; lang/clojure/doctor.el
 
 (when (and (modulep! :checkers syntax)
-           (not (modulep! +lsp)))
+           (modulep! -lsp))
   (unless (executable-find "clj-kondo")
     (warn! "Couldn't find clj-kondo. flycheck-clj-kondo will not work.")))
 
diff --git a/modules/lang/clojure/packages.el b/modules/lang/clojure/packages.el
index f6eb31b4d..26daedbd6 100644
--- a/modules/lang/clojure/packages.el
+++ b/modules/lang/clojure/packages.el
@@ -17,8 +17,7 @@
 (package! clojure-mode :pin "59888c84b61081e9b0085e388f55132925a66e7a")
 (package! clj-refactor :pin "dc1bbc8cdaa723bdbb6669ea7d280625c370755d")
 (package! cider :pin "8fdb53e8be764704f5023fa024d023bffedf5a8b")
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checkers syntax -flymake)
   (package! flycheck-clj-kondo :pin "e38c67ba9db1ea1cbe1b61ab39b506c05efdcdbf"))
 (package! jet :pin "c9a92675efd802f37df5e3eab7858dbbeced6ea4")
 (package! neil
diff --git a/modules/lang/crystal/config.el b/modules/lang/crystal/config.el
index 979d27944..47f1263fd 100644
--- a/modules/lang/crystal/config.el
+++ b/modules/lang/crystal/config.el
@@ -18,14 +18,12 @@
 
 
 (use-package! flycheck-crystal
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (modulep! :checkers syntax -flymake)
   :after crystal-mode)
 
 
 (use-package! flycheck-ameba
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (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 351e72eb6..d8e76dcdd 100644
--- a/modules/lang/crystal/packages.el
+++ b/modules/lang/crystal/packages.el
@@ -3,7 +3,6 @@
 
 (package! crystal-mode :pin "ea89b108fa4222df94ffb99e6e7eaec5d7aa4fea")
 (package! inf-crystal :pin "02007b2a2a3bea44902d7c83c4acba1e39d278e3")
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checkers syntax -flymake)
   (package! flycheck-crystal :pin "ea89b108fa4222df94ffb99e6e7eaec5d7aa4fea")
   (package! flycheck-ameba :pin "0c4925ae0e998818326adcb47ed27ddf9761c7dc"))
diff --git a/modules/lang/csharp/doctor.el b/modules/lang/csharp/doctor.el
index 3d7b2be35..acb6c0a93 100644
--- a/modules/lang/csharp/doctor.el
+++ b/modules/lang/csharp/doctor.el
@@ -1,7 +1,7 @@
 ;; -*- lexical-binding: t; no-byte-compile: t; -*-
 ;;; lang/csharp/doctor.el
 
-(when (and (require 'omnisharp nil t) (not (modulep! +lsp)))
+(when (and (require 'omnisharp nil t) (modulep! -lsp))
   (let ((omnisharp-bin (or omnisharp-server-executable-path (omnisharp--server-installation-path t))))
     (unless (file-exists-p omnisharp-bin)
       (warn! "Omnisharp server isn't installed, completion won't work"))))
diff --git a/modules/lang/dart/packages.el b/modules/lang/dart/packages.el
index e170efd26..bc2959d49 100644
--- a/modules/lang/dart/packages.el
+++ b/modules/lang/dart/packages.el
@@ -4,7 +4,7 @@
 (package! dart-mode :pin "44beb628e5b4774062f7486008e06ae663e1ced0")
 
 (when (and (modulep! +lsp)
-           (not (modulep! :tools lsp +eglot)))
+           (modulep! :tools lsp -eglot))
   (package! lsp-dart :pin "9ffbafb7dcea3ef3d9e29bafb51d5167f0585d2c"))
 
 (when (modulep! +flutter)
diff --git a/modules/lang/elixir/config.el b/modules/lang/elixir/config.el
index 9c32685ea..47ffe81dc 100644
--- a/modules/lang/elixir/config.el
+++ b/modules/lang/elixir/config.el
@@ -52,8 +52,7 @@
 
 
 (use-package! flycheck-credo
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (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 3b0994f6d..8766d3114 100644
--- a/modules/lang/elixir/packages.el
+++ b/modules/lang/elixir/packages.el
@@ -4,6 +4,5 @@
 ;; +elixir.el
 (package! elixir-mode :pin "00d6580a040a750e019218f9392cf9a4c2dac23a")
 (package! exunit :pin "ee06b14b61beaf59d847802b83b027ac991f3496")
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checkers syntax -flymake)
   (package! flycheck-credo :pin "e285bd042a535d0f13e0b4c5226df404cdda4033"))
diff --git a/modules/lang/elm/config.el b/modules/lang/elm/config.el
index 5423963c9..c8d371a21 100644
--- a/modules/lang/elm/config.el
+++ b/modules/lang/elm/config.el
@@ -27,7 +27,6 @@
          :desc "Compile JS (optimized)" "J" #'+elm/compile-js-optimized)))
 
 (use-package! flycheck-elm
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (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 ef5d1a278..85f1424e3 100644
--- a/modules/lang/elm/packages.el
+++ b/modules/lang/elm/packages.el
@@ -2,6 +2,5 @@
 ;;; lang/elm/packages.el
 
 (package! elm-mode :pin "699841865e1bd5b7f2077baa7121510b6bcad3c7")
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (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 456e85d6f..56a53bf3c 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -195,8 +195,7 @@ See `+emacs-lisp-non-package-mode' for details.")
 
 
 (use-package! flycheck-cask
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (modulep! :checkers syntax -flymake)
   :defer t
   :init
   (add-hook! 'emacs-lisp-mode-hook
@@ -204,8 +203,7 @@ See `+emacs-lisp-non-package-mode' for details.")
 
 
 (use-package! flycheck-package
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (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 848fd0fbc..1499e3f6a 100644
--- a/modules/lang/emacs-lisp/packages.el
+++ b/modules/lang/emacs-lisp/packages.el
@@ -12,8 +12,7 @@
 (package! overseer :pin "7fdcf1a6fba6b1569a09c1666b4e51bcde266ed9")
 (package! elisp-def :pin "1ad4baccbf3d0d13e7607d332ae6bc60a5dd7360")
 (package! elisp-demos :pin "1a108d1c5011f9ced58be2ca98bea1fbd4130a2f")
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checkers syntax -flymake)
   (package! flycheck-package :pin "75efa098cf17dc14c363e2ca9b68afdac7766b5b")
   (package! flycheck-cask :pin "0eeec5197e9d31bfcfc39380b262d65259a87d91"))
 
diff --git a/modules/lang/ess/config.el b/modules/lang/ess/config.el
index 91d36b59d..fa758bf61 100644
--- a/modules/lang/ess/config.el
+++ b/modules/lang/ess/config.el
@@ -105,7 +105,6 @@
     :hook (stan-mode . company-stan-setup))
 
   (use-package! flycheck-stan
-    :when (and  (modulep! :checkers syntax)
-                (not (modulep! :checkers syntax +flymake)))
+    :when (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 aa731dc1f..58c0a2496 100644
--- a/modules/lang/ess/packages.el
+++ b/modules/lang/ess/packages.el
@@ -11,6 +11,5 @@
   (package! eldoc-stan :pin "150bbbe5fd3ad2b5a3dbfba9d291e66eeea1a581")
   (when (modulep! :completion company)
     (package! company-stan :pin "150bbbe5fd3ad2b5a3dbfba9d291e66eeea1a581"))
-  (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  (when (modulep! :checkers syntax -flymake)
     (package! flycheck-stan :pin "150bbbe5fd3ad2b5a3dbfba9d291e66eeea1a581")))
diff --git a/modules/lang/fortran/doctor.el b/modules/lang/fortran/doctor.el
index 976c36a45..ecbd6e101 100644
--- a/modules/lang/fortran/doctor.el
+++ b/modules/lang/fortran/doctor.el
@@ -9,7 +9,7 @@
            (not (executable-find "ifort")))
   (warn! "Couldn't find Intel ifort - compilation will not work."))
 
-(when (and (not (modulep! +intel))
+(when (and (modulep! -intel)
            (not (executable-find "gfortran")))
   (warn! "Couldn't find gfortran - compilation will not work."))
 
diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el
index 861fdafd5..56cf2a9be 100644
--- a/modules/lang/go/config.el
+++ b/modules/lang/go/config.el
@@ -58,6 +58,5 @@
 
 
 (use-package! flycheck-golangci-lint
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (modulep! :checkers syntax -flymake)
   :hook (go-mode . flycheck-golangci-lint-setup))
diff --git a/modules/lang/go/doctor.el b/modules/lang/go/doctor.el
index 6bc97f69c..9ab40bb49 100644
--- a/modules/lang/go/doctor.el
+++ b/modules/lang/go/doctor.el
@@ -19,7 +19,7 @@
   (warn! "Couldn't find gomodifytags. Manipulating struct tags will not work"))
 
 (when (and (modulep! :completion company)
-           (not (modulep! +lsp)))
+           (modulep! -lsp))
   (require 'company-go)
   (unless (executable-find company-go-gocode-command)
     (warn! "Couldn't find gocode. Code completion won't work")))
diff --git a/modules/lang/go/packages.el b/modules/lang/go/packages.el
index 4fb60987b..838d305df 100644
--- a/modules/lang/go/packages.el
+++ b/modules/lang/go/packages.el
@@ -10,6 +10,5 @@
 (when (modulep! :completion company)
   (package! company-go :pin "31948b463f2fc18f8801e5a8fe511fef300eb3dd"))
 
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checkers syntax -flymake)
   (package! flycheck-golangci-lint :pin "91c59b128aa6f719069cfb3e5df77588691a3e14"))
diff --git a/modules/lang/graphviz/config.el b/modules/lang/graphviz/config.el
index f7710bc93..7e390b09e 100644
--- a/modules/lang/graphviz/config.el
+++ b/modules/lang/graphviz/config.el
@@ -16,8 +16,7 @@
   (after! dtrt-indent
     (add-to-list 'dtrt-indent-hook-mapping-list '(graphviz-mode graphviz-dot-indent-width)))
 
-  (when (and (modulep! :checker syntax)
-             (not (modulep! :checker syntax +flymake)))
+  (when (modulep! :checkers syntax -flymake)
     (after! flycheck
       (eval '(flycheck-define-checker graphviz-dot
                "A checker using graphviz dot."
diff --git a/modules/lang/haskell/doctor.el b/modules/lang/haskell/doctor.el
index aa86733dc..8874330f5 100644
--- a/modules/lang/haskell/doctor.el
+++ b/modules/lang/haskell/doctor.el
@@ -17,7 +17,7 @@
   Install it or enable +lsp."))
 
 (when (and (modulep! :editor format)
-           (not (modulep! +lsp))
+           (modulep! -lsp)
            (not (executable-find "brittany")))
   (warn! "Couldn't find brittany. Code formatting will not work.
   Install it or enable +lsp."))
diff --git a/modules/lang/haskell/packages.el b/modules/lang/haskell/packages.el
index f5a1d741b..d8be2b16a 100644
--- a/modules/lang/haskell/packages.el
+++ b/modules/lang/haskell/packages.el
@@ -4,5 +4,5 @@
 (package! haskell-mode :pin "727f72a2a4b8e4fd0a7b62129668baea55a2c3e0")
 
 (when (and (modulep! +lsp)
-           (not (modulep! :tools lsp +eglot)))
+           (modulep! :tools lsp -eglot))
   (package! lsp-haskell :pin "ba49fa9822556aff58aa47929cd426e9427baaea"))
diff --git a/modules/lang/idris/config.el b/modules/lang/idris/config.el
index a7e63eee1..9f59f3697 100644
--- a/modules/lang/idris/config.el
+++ b/modules/lang/idris/config.el
@@ -23,6 +23,5 @@
 
 
 (use-package! flycheck-idris
-  :when (modulep! :checkers syntax)
-  :when (not (modulep! :checkers syntax +flymake))
+  :when (modulep! :checkers syntax -flymake)
   :after idris-mode)
diff --git a/modules/lang/java/+lsp.el b/modules/lang/java/+lsp.el
index 3fc072b74..87189c73b 100644
--- a/modules/lang/java/+lsp.el
+++ b/modules/lang/java/+lsp.el
@@ -1,5 +1,5 @@
 ;;; lang/java/+lsp.el -*- lexical-binding: t; -*-
-;;;###if (and (modulep! +lsp) (not (modulep! :tools lsp +eglot)))
+;;;###if (and (modulep! +lsp) (modulep! :tools lsp -eglot))
 
 (use-package! lsp-java
   :defer t
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index 2e4dbd0c8..3a5a204a6 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -106,8 +106,7 @@
                          #'typescript-tsx-mode
                        #'typescript-mode)))
 
-  (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  (when (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/json/doctor.el b/modules/lang/json/doctor.el
index 2fa13890b..2ede8445c 100644
--- a/modules/lang/json/doctor.el
+++ b/modules/lang/json/doctor.el
@@ -4,6 +4,6 @@
            (not (executable-find "jq")))
   (warn! "Couldn't find jq. counsel-jq won't work." ))
 
-(assert! (or (not (modulep! +tree-sitter))
+(assert! (or (modulep! -tree-sitter)
              (modulep! :tools tree-sitter))
          "This module requires (:tools tree-sitter)")
diff --git a/modules/lang/kotlin/config.el b/modules/lang/kotlin/config.el
index 289821ceb..db22b89ac 100644
--- a/modules/lang/kotlin/config.el
+++ b/modules/lang/kotlin/config.el
@@ -15,6 +15,5 @@
 
 
 (use-package! flycheck-kotlin
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (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 fedcb2021..a7dd02e80 100644
--- a/modules/lang/kotlin/packages.el
+++ b/modules/lang/kotlin/packages.el
@@ -3,6 +3,5 @@
 
 (package! kotlin-mode :pin "fddd747e5b4736e8b27a147960f369b86179ddff")
 
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checker syntax -flymake)
   (package! flycheck-kotlin :pin "a2a6abb9a7f85c6fb15ce327459ec3c8ff780188"))
diff --git a/modules/lang/ledger/config.el b/modules/lang/ledger/config.el
index 164ec46da..de2a86dc9 100644
--- a/modules/lang/ledger/config.el
+++ b/modules/lang/ledger/config.el
@@ -38,8 +38,7 @@
 
 
 (use-package! flycheck-ledger
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (modulep! :checkers syntax -flymake)
   :after ledger-mode)
 
 
diff --git a/modules/lang/ledger/packages.el b/modules/lang/ledger/packages.el
index bede6a566..8e4c1a361 100644
--- a/modules/lang/ledger/packages.el
+++ b/modules/lang/ledger/packages.el
@@ -6,6 +6,5 @@
 (when (modulep! :editor evil)
   (package! evil-ledger :pin "7a9f9f5d39c42fffdba8004f8982642351f2b233"))
 
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checkers syntax -flymake)
   (package! flycheck-ledger :pin "628e25ba66604946085571652a94a54f4d1ad96f"))
diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el
index 7d04fd665..cb59dd905 100644
--- a/modules/lang/lua/config.el
+++ b/modules/lang/lua/config.el
@@ -56,8 +56,7 @@ lua-language-server.")
   (add-hook! 'moonscript-mode-hook
              #'+lua-moonscript-fix-single-quotes-h
              #'+lua-moonscript-fontify-interpolation-h)
-  (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  (when (modulep! :checkers syntax -flymake)
     (require 'flycheck-moonscript nil t)))
 
 
diff --git a/modules/lang/lua/packages.el b/modules/lang/lua/packages.el
index cbff4cf8d..96b30f456 100644
--- a/modules/lang/lua/packages.el
+++ b/modules/lang/lua/packages.el
@@ -5,8 +5,7 @@
 
 (when (modulep! +moonscript)
   (package! moonscript :pin "56f90471e2ced2b0a177aed4d8c2f854797e9cc7")
-  (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  (when (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 231f29262..70fe70ad1 100644
--- a/modules/lang/nim/config.el
+++ b/modules/lang/nim/config.el
@@ -36,6 +36,5 @@ windows."
 
 
 (use-package! flycheck-nim
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (modulep! :checkers syntax -flymake)
   :after nim-mode)
diff --git a/modules/lang/nim/packages.el b/modules/lang/nim/packages.el
index 0f4d4c71f..8c6804286 100644
--- a/modules/lang/nim/packages.el
+++ b/modules/lang/nim/packages.el
@@ -5,6 +5,5 @@
 
 (package! nim-mode :pin "625cc023bd75a741b7d4e629e5bec3a52f45b4be")
 
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checkers syntax -flymake)
   (package! flycheck-nim :pin "ddfade51001571c2399f78bcc509e0aa8eb752a4"))
diff --git a/modules/lang/nix/doctor.el b/modules/lang/nix/doctor.el
index fe1b18b35..366d273e7 100644
--- a/modules/lang/nix/doctor.el
+++ b/modules/lang/nix/doctor.el
@@ -8,6 +8,6 @@
   (unless (executable-find nix-nixfmt-bin)
     (warn! (concat "Couldn't find " nix-nixfmt-bin ". nix-format-buffer won't work."))))
 
-(assert! (or (not (modulep! +tree-sitter))
+(assert! (or (modulep! -tree-sitter)
              (modulep! :tools tree-sitter))
          "This module requires (:tools tree-sitter)")
diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el
index 6b3ef4a37..4ca5805d5 100644
--- a/modules/lang/ocaml/config.el
+++ b/modules/lang/ocaml/config.el
@@ -70,9 +70,7 @@
         "t" #'merlin-type-enclosing)
 
   (use-package! flycheck-ocaml
-    :when (and (modulep! :checkers syntax)
-               (not (modulep! :checkers syntax +flymake)))
-
+    :when (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 e0a0fad87..09fa4c871 100644
--- a/modules/lang/ocaml/packages.el
+++ b/modules/lang/ocaml/packages.el
@@ -12,8 +12,7 @@
   (package! merlin :pin "e016abfac6da88ff7a6b49a42ca37854a4378ace")
   (package! merlin-eldoc :pin "bf8edc63d85b35e4def352fa7ce4ea39f43e1fd8")
   (package! merlin-company :pin "e016abfac6da88ff7a6b49a42ca37854a4378ace")
-  (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  (when (modulep! :checkers syntax -flymake)
     (package! flycheck-ocaml :pin "77f8ddbd9bfc3a11957ac7ec7e45d5fa9179b192")))
 
 (when (modulep! :tools eval)
diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el
index f38028dd2..62b1c405e 100644
--- a/modules/lang/php/config.el
+++ b/modules/lang/php/config.el
@@ -49,7 +49,7 @@
     :return "return"
     :yield "use")
 
-  (if (not (modulep! +lsp))
+  (if (modulep! -lsp)
       ;; `+php-company-backend' uses `php-extras-company' or
       ;; `company-dabbrev-code', in that order.
       (when +php--company-backends
diff --git a/modules/lang/purescript/config.el b/modules/lang/purescript/config.el
index 84d91f618..c7d8468e6 100644
--- a/modules/lang/purescript/config.el
+++ b/modules/lang/purescript/config.el
@@ -35,7 +35,6 @@
   :hook (purescript-mode . psc-ide-mode)
   :config
   (remove-hook 'company-backends 'company-psc-ide-backend)
-  (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  (when (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 42d959c81..9094e758e 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -323,8 +323,7 @@
 
 (use-package! flycheck-cython
   :when (modulep! +cython)
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (modulep! :checkers syntax -flymake)
   :after cython-mode)
 
 
@@ -352,7 +351,7 @@
 (use-package! lsp-pyright
   :when (modulep! +lsp)
   :when (modulep! +pyright)
-  :when (not (modulep! :tools lsp +eglot))
+  :when (modulep! :tools lsp -eglot)
   :defer t
   :init
   (when-let ((exe (executable-find "basedpyright")))
diff --git a/modules/lang/raku/config.el b/modules/lang/raku/config.el
index c85694c00..b5b336aca 100644
--- a/modules/lang/raku/config.el
+++ b/modules/lang/raku/config.el
@@ -9,6 +9,5 @@
 
 
 (use-package! flycheck-raku
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (modulep! :checkers syntax -flymake)
   :after raku-mode)
diff --git a/modules/lang/raku/packages.el b/modules/lang/raku/packages.el
index 07ef6f143..a01f2f94b 100644
--- a/modules/lang/raku/packages.el
+++ b/modules/lang/raku/packages.el
@@ -3,8 +3,7 @@
 
 (package! raku-mode :pin "14f9b9bba08c0bbb7f3895380d0b1a9feb7a168d")
 
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checkers syntax -flymake)
   (package! flycheck-raku
     :recipe (:host github :repo "widefox/flycheck-raku")
     :pin "b1acccd6e9d9753022571ee96d18b8e9f3227c65"))
diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el
index 89b4f1cd7..f14ff418a 100644
--- a/modules/lang/rust/config.el
+++ b/modules/lang/rust/config.el
@@ -46,7 +46,7 @@
   (setq rustic-babel-format-src-block nil
         rustic-format-trigger nil)
 
-  (if (not (modulep! +lsp))
+  (if (modulep! -lsp)
       (after! rustic-flycheck
         (add-to-list 'flycheck-checkers 'rustic-clippy))
     (setq rustic-lsp-client
diff --git a/modules/lang/scala/packages.el b/modules/lang/scala/packages.el
index 7593123b5..28f638bcb 100644
--- a/modules/lang/scala/packages.el
+++ b/modules/lang/scala/packages.el
@@ -5,5 +5,5 @@
 (package! scala-mode :pin "bd0638c32ab0f2eadacf2809329abf5388211760")
 
 (when (and (modulep! +lsp)
-           (not (modulep! :tools lsp +eglot)))
+           (modulep! :tools lsp -eglot))
   (package! lsp-metals :pin "0dc938be1190d147e7013e3dce08ac8bff5d1662"))
diff --git a/modules/lang/scheme/config.el b/modules/lang/scheme/config.el
index f76496225..94c00911b 100644
--- a/modules/lang/scheme/config.el
+++ b/modules/lang/scheme/config.el
@@ -78,8 +78,7 @@
 
 (use-package! flycheck-guile
   :when (modulep! +guile)
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (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 e06b959b6..b0053fe04 100644
--- a/modules/lang/scheme/packages.el
+++ b/modules/lang/scheme/packages.el
@@ -20,8 +20,7 @@
     (package! geiser-gauche :pin "8ff743f6416f00751e24aef8b9791501a40f5421"))
   (when (modulep! +guile)
     (package! geiser-guile :pin "5a856c2982030ff77e2d151ead4fcd991512f362")
-    (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+    (when (modulep! :checkers syntax -flymake)
       (package! flycheck-guile
         :recipe (:host github :repo "flatwhatson/flycheck-guile")
         :pin "dd7bbdc48fd21cf8d270c913c56cd580f8ec3d03")))
diff --git a/modules/lang/sh/doctor.el b/modules/lang/sh/doctor.el
index 14f4d0e78..a5a6ce2a5 100644
--- a/modules/lang/sh/doctor.el
+++ b/modules/lang/sh/doctor.el
@@ -8,6 +8,6 @@
   (unless (executable-find "shfmt")
     (warn! "Couldn't find shfmt. Code formatting will not work.")))
 
-(assert! (or (not (modulep! +tree-sitter))
+(assert! (or (modulep! -tree-sitter)
              (modulep! :tools tree-sitter))
          "This module requires (:tools tree-sitter)")
diff --git a/modules/lang/solidity/config.el b/modules/lang/solidity/config.el
index 330333f9d..60d9c5aca 100644
--- a/modules/lang/solidity/config.el
+++ b/modules/lang/solidity/config.el
@@ -10,8 +10,7 @@
   (set-formatter! 'prettier-solidity '(npx "prettier" "--stdin-filepath" filepath "--parser=solidity") :modes '(solidity-mode))
 
   (use-package! solidity-flycheck  ; included with solidity-mode
-    :when (and (modulep! :checkers syntax)
-               (not (modulep! :checkers syntax +flymake)))
+    :when (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 301ade236..bfac66442 100644
--- a/modules/lang/solidity/packages.el
+++ b/modules/lang/solidity/packages.el
@@ -4,6 +4,5 @@
 (package! solidity-mode :pin "8ba549e429e86778a0e079648f3bc3463fcb15f6")
 (when (modulep! :completion company)
   (package! company-solidity))
-(when (and (modulep! :checkers syntax)
-           (not (modulep! :checkers syntax +flymake)))
+(when (modulep! :checkers syntax -flymake)
   (package! solidity-flycheck))
diff --git a/modules/lang/swift/config.el b/modules/lang/swift/config.el
index fd9024458..de11b40a2 100644
--- a/modules/lang/swift/config.el
+++ b/modules/lang/swift/config.el
@@ -27,7 +27,7 @@
 
 (use-package! lsp-sourcekit
   :when (modulep! +lsp)
-  :when (not (modulep! :tools lsp +eglot))
+  :when (modulep! :tools lsp -eglot)
   :defer t
   :init (add-hook 'swift-mode-local-vars-hook #'lsp! 'append)
   :config
diff --git a/modules/lang/swift/doctor.el b/modules/lang/swift/doctor.el
index 3e2881b5b..d990298d8 100644
--- a/modules/lang/swift/doctor.el
+++ b/modules/lang/swift/doctor.el
@@ -1,6 +1,6 @@
 ;;; lang/swift/doctor.el -*- lexical-binding: t; -*-
 
-(assert! (or (not (modulep! +tree-sitter))
+(assert! (or (modulep! -tree-sitter)
              (modulep! :tools tree-sitter))
          "This module requires (:tools tree-sitter)")
 
diff --git a/modules/lang/swift/packages.el b/modules/lang/swift/packages.el
index 9fbc11b08..7e59f7933 100644
--- a/modules/lang/swift/packages.el
+++ b/modules/lang/swift/packages.el
@@ -8,6 +8,5 @@
       (package! lsp-sourcekit :pin "63ff1ab638b655089077d17fdd728a48f8906e02"))
   (when (modulep! :completion company)
     (package! company-sourcekit :pin "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c"))
-  (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  (when (modulep! :checkers syntax -flymake)
     (package! flycheck-swift :pin "4c5ad401252400a78da395fd56a71e67ff8c2761")))
diff --git a/modules/lang/zig/config.el b/modules/lang/zig/config.el
index 223d7aa5b..a94090ea3 100644
--- a/modules/lang/zig/config.el
+++ b/modules/lang/zig/config.el
@@ -20,8 +20,7 @@
   (when (modulep! +tree-sitter)
     (add-hook 'zig-mode-local-vars-hook #'tree-sitter! 'append))
 
-  (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  (when (modulep! :checkers syntax -flymake)
     (eval '(flycheck-define-checker zig
              "A zig syntax checker using zig's `ast-check` command."
              :command ("zig" "ast-check" (eval (buffer-file-name)))
diff --git a/modules/lang/zig/doctor.el b/modules/lang/zig/doctor.el
index 48668cef3..b9e69370e 100644
--- a/modules/lang/zig/doctor.el
+++ b/modules/lang/zig/doctor.el
@@ -1,11 +1,11 @@
 ;; -*- lexical-binding: t; no-byte-compile: t; -*-
 ;;; lang/zig/doctor.el
 
-(assert! (or (not (modulep! +lsp))
+(assert! (or (modulep! -lsp)
              (modulep! :tools lsp))
          "This module requires (:tools lsp)")
 
-(assert! (or (not (modulep! +tree-sitter))
+(assert! (or (modulep! -tree-sitter)
              (modulep! :tools tree-sitter))
          "This module requires (:tools tree-sitter)")
 
diff --git a/modules/tools/debugger/config.el b/modules/tools/debugger/config.el
index 4ef38ad27..f8ed07f80 100644
--- a/modules/tools/debugger/config.el
+++ b/modules/tools/debugger/config.el
@@ -110,7 +110,8 @@
 
 
 (use-package! dap-mode
-  :when (and (modulep! +lsp) (not (modulep! :tools lsp +eglot)))
+  :when (modulep! +lsp)
+  :when (modulep! :tools lsp -eglot)
   :hook (dap-mode . dap-tooltip-mode)
   :init
   (setq dap-breakpoints-file (concat doom-data-dir "dap-breakpoints")
@@ -156,6 +157,7 @@
 
 
 (use-package! dap-ui
-  :when (and (modulep! +lsp) (not (modulep! :tools lsp +eglot)))
+  :when (modulep! +lsp)
+  :when (modulep! :tools lsp -eglot)
   :hook (dap-mode . dap-ui-mode)
   :hook (dap-ui-mode . dap-ui-controls-mode))
diff --git a/modules/tools/lsp/+eglot.el b/modules/tools/lsp/+eglot.el
index 331bf5f71..6ac8ae3f4 100644
--- a/modules/tools/lsp/+eglot.el
+++ b/modules/tools/lsp/+eglot.el
@@ -9,8 +9,7 @@
         ;; NOTE: We disable eglot-auto-display-help-buffer because :select t in
         ;;   its popup rule causes eglot to steal focus too often.
         eglot-auto-display-help-buffer nil)
-  (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  (when (modulep! :checkers syntax -flymake)
     (setq eglot-stay-out-of '(flymake)))
 
   :config
@@ -62,6 +61,5 @@ server an expensive restart when its buffer is reverted."
 
 
 (use-package! flycheck-eglot
-  :when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+  :when (modulep! :checkers syntax -flymake)
   :hook (eglot-managed-mode . flycheck-eglot-mode))
diff --git a/modules/tools/lsp/autoload/lsp-mode.el b/modules/tools/lsp/autoload/lsp-mode.el
index d769a26b8..25615ecd4 100644
--- a/modules/tools/lsp/autoload/lsp-mode.el
+++ b/modules/tools/lsp/autoload/lsp-mode.el
@@ -1,5 +1,5 @@
 ;;; tools/lsp/autoload/lsp-mode.el -*- lexical-binding: t; -*-
-;;;###if (not (modulep! +eglot))
+;;;###if (modulep! -eglot)
 
 ;;;###autodef
 (defun set-lsp-priority! (client priority)
diff --git a/modules/tools/lsp/doctor.el b/modules/tools/lsp/doctor.el
index 60b3aa793..42c59f33c 100644
--- a/modules/tools/lsp/doctor.el
+++ b/modules/tools/lsp/doctor.el
@@ -1,7 +1,6 @@
 ;;; tools/lsp/doctor.el -*- lexical-binding: t; -*-
 
-(assert! (not (and (modulep! +eglot)
-                   (modulep! +peek)))
+(assert! (not (modulep! +eglot +peek))
          "+eglot and +peek flags are not compatible. Peek uses lsp-mode, while Eglot is another package altogether for LSP.")
 
 (unless (modulep! +eglot)
diff --git a/modules/tools/lsp/packages.el b/modules/tools/lsp/packages.el
index a59553e24..d1d131b89 100644
--- a/modules/tools/lsp/packages.el
+++ b/modules/tools/lsp/packages.el
@@ -6,8 +6,7 @@
       (package! eglot :pin "6b9c4faa5201915ab81fe470a872ebce8921fe51")
       (when (modulep! :completion vertico)
         (package! consult-eglot :pin "64262e72452f8fe6dd49d31bcdd4bd577b7d682d"))
-      (when (and (modulep! :checkers syntax)
-             (not (modulep! :checkers syntax +flymake)))
+      (when (modulep! :checkers syntax -flymake)
         (package! flycheck-eglot :pin "09e37f4c726d9b565b040ba9e89215158d3bd6b6")))
   (package! lsp-mode :pin "dd61303b2dc989a58f7dddd4c754f828a3f52107")
   (package! lsp-ui :pin "072bb29152038518c2478813b82c8d04d07df84c")
diff --git a/modules/ui/treemacs/packages.el b/modules/ui/treemacs/packages.el
index 475c62412..a2df7c4f9 100644
--- a/modules/ui/treemacs/packages.el
+++ b/modules/ui/treemacs/packages.el
@@ -12,5 +12,5 @@
 (when (modulep! :ui workspaces)
   (package! treemacs-persp))
 (when (and (modulep! +lsp)
-           (not (modulep! :tools lsp +eglot)))
+           (modulep! :tools lsp -eglot))
   (package! lsp-treemacs :pin "fb1a07ae0a3d781dea8ac78da2933e0173eb48a4"))