refactor: deprecate featurep! for modulep!

featurep! will be renamed modulep! in the future, so it's been deprecated. They have identical interfaces, and can be replaced without issue. featurep! was never quite the right name for this macro. It implied that it had some connection to featurep, which it doesn't (only that it was similar in purpose; still, Doom modules are not features). To undo such implications and be consistent with its namespace (and since we're heading into a storm of breaking changes with the v3 release anyway), now was the best opportunity to begin the transition.
2022-08-12 20:29:19 +02:00 · 2022-08-12 20:29:19 +02:00 · ad6a3d0f33
commit ad6a3d0f33
parent 0407621aff
316 changed files with 1109 additions and 1103 deletions
--- a/modules/tools/ansible/config.el
+++ b/modules/tools/ansible/config.el
@ -7,7 +7,7 @@
  :config
  (setq ansible-section-face 'font-lock-variable-name-face
        ansible-task-label-face 'font-lock-doc-face)
-  (when (featurep! :completion company)
+  (when (modulep! :completion company)
    (set-company-backend! 'ansible 'company-ansible))
  (map! :map ansible-key-map
        :localleader
--- a/modules/tools/ansible/packages.el
+++ b/modules/tools/ansible/packages.el
@ -6,5 +6,5 @@
 (package! jinja2-mode :pin "03e5430a7efe1d163a16beaf3c82c5fd2c2caee1")
 (package! yaml-mode :pin "535273d5a1eb76999d20afbcf4d9f056d8ffd2da")

-(when (featurep! :completion company)
+(when (modulep! :completion company)
  (package! company-ansible :pin "79dd421b161efa49fbdffad57fa40edb41f484a3"))
--- a/modules/tools/biblio/config.el
+++ b/modules/tools/biblio/config.el
@ -17,7 +17,7 @@


 (use-package! citar
-  :when (featurep! :completion vertico)
+  :when (modulep! :completion vertico)
  :no-require
  :config
  (setq org-cite-insert-processor 'citar
@ -25,7 +25,7 @@
        org-cite-activate-processor 'citar))

 (use-package! citar-embark
-  :when (featurep! :completion vertico)
+  :when (modulep! :completion vertico)
  :after citar embark
  :config (citar-embark-mode))

@ -39,8 +39,8 @@
 ;;; Third-party

 (use-package! bibtex-completion
-  :when (or (featurep! :completion ivy)
-            (featurep! :completion helm))
+  :when (or (modulep! :completion ivy)
+            (modulep! :completion helm))
  :defer t
  :config
  (setq bibtex-completion-additional-search-fields '(keywords)
@ -50,7 +50,7 @@


 (use-package! ivy-bibtex
-  :when (featurep! :completion ivy)
+  :when (modulep! :completion ivy)
  :defer t
  :config
  (add-to-list 'ivy-re-builders-alist '(ivy-bibtex . ivy--regex-plus)))
--- a/modules/tools/biblio/packages.el
+++ b/modules/tools/biblio/packages.el
@ -1,13 +1,13 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/biblio/packages.el

-(when (featurep! :completion ivy)
+(when (modulep! :completion ivy)
  (package! bibtex-completion :pin "ce8c17690ddad73d01531084b282f221f8eb6669")
  (package! ivy-bibtex :pin "ce8c17690ddad73d01531084b282f221f8eb6669"))
-(when (featurep! :completion helm)
+(when (modulep! :completion helm)
  (package! bibtex-completion :pin "ce8c17690ddad73d01531084b282f221f8eb6669")
  (package! helm-bibtex :pin "ce8c17690ddad73d01531084b282f221f8eb6669"))
-(when (featurep! :completion vertico)
+(when (modulep! :completion vertico)
  (package! citar :pin "146f2cb5a31d4968ec17f39f189e4ea131ccaf56")
  (package! citar-embark :pin "146f2cb5a31d4968ec17f39f189e4ea131ccaf56"))

--- a/modules/tools/debugger/autoload/evil.el
+++ b/modules/tools/debugger/autoload/evil.el
@ -1,5 +1,5 @@
 ;; tools/debugger/autoload/evil.el -*- lexical-binding: t; -*-
-;;;###if (featurep! :editor evil)
+;;;###if (modulep! :editor evil)

 ;;;###autoload (autoload '+debugger:start "tools/debugger/autoload/evil" nil t)
 (evil-define-command +debugger:start (&optional path)
--- a/modules/tools/debugger/config.el
+++ b/modules/tools/debugger/config.el
@ -109,7 +109,7 @@


 (use-package! dap-mode
-  :when (and (featurep! +lsp) (not (featurep! :tools lsp +eglot)))
+  :when (and (modulep! +lsp) (not (modulep! :tools lsp +eglot)))
  :hook (dap-mode . dap-tooltip-mode)
  :init
  (setq dap-breakpoints-file (concat doom-etc-dir "dap-breakpoints")
@ -155,6 +155,6 @@


 (use-package! dap-ui
-  :when (featurep! +lsp)
+  :when (modulep! +lsp)
  :hook (dap-mode . dap-ui-mode)
  :hook (dap-ui-mode . dap-ui-controls-mode))
--- a/modules/tools/debugger/doctor.el
+++ b/modules/tools/debugger/doctor.el
@ -1,4 +1,4 @@
 ;;; tools/debugger/doctor.el -*- lexical-binding: t; -*-

-(when (and (featurep! +lsp) (featurep! :tools lsp +eglot))
+(when (and (modulep! +lsp) (modulep! :tools lsp +eglot))
  (warn! "+lsp flag is not compatible with :tools (lsp +eglot). Choose only one of (eglot or dap-mode) please"))
--- a/modules/tools/debugger/packages.el
+++ b/modules/tools/debugger/packages.el
@ -2,9 +2,9 @@
 ;;; tools/debugger/packages.el

 (when (package! realgud :pin "3c88611c4ed59069093187c2a039b8d05cbe53e8")
-  (when (featurep! :lang javascript)
+  (when (modulep! :lang javascript)
    (package! realgud-trepan-ni :pin "0ec088ea343835e24ae73da09bea96bfb02a3130")))

-(when (featurep! +lsp)
+(when (modulep! +lsp)
  (package! dap-mode :pin "50c2a99059da03ac5274d6794ea4758ddf253dc1")
  (package! posframe :pin "0d23bc5f7cfac00277d83ae7ba52c48685bcbc68"))
--- a/modules/tools/docker/config.el
+++ b/modules/tools/docker/config.el
@ -3,5 +3,5 @@
 (after! dockerfile-mode
  (set-docsets! 'dockerfile-mode "Docker")

-  (when (featurep! +lsp)
+  (when (modulep! +lsp)
    (add-hook 'dockerfile-mode-local-vars-hook #'lsp! 'append)))
--- a/modules/tools/eval/autoload/evil.el
+++ b/modules/tools/eval/autoload/evil.el
@ -1,5 +1,5 @@
 ;; tools/eval/autoload/evil.el -*- lexical-binding: t; -*-
-;;;###if (featurep! :editor evil)
+;;;###if (modulep! :editor evil)

 ;;;###autoload (autoload '+eval:region "tools/eval/autoload/evil" nil t)
 (evil-define-operator +eval:region (beg end)
--- a/modules/tools/eval/config.el
+++ b/modules/tools/eval/config.el
@ -71,7 +71,7 @@ buffer rather than an overlay on the line at point or the minibuffer.")
  ;; Display evaluation results in an overlay at the end of the current line. If
  ;; the output is more than `+eval-popup-min-lines' (4) lines long, it is
  ;; displayed in a popup.
-  (when (featurep! +overlay)
+  (when (modulep! +overlay)
    (defadvice! +eval--show-output-in-overlay-a (fn)
      :filter-return #'quickrun--make-sentinel
      (lambda (process event)
@ -97,5 +97,5 @@ buffer rather than an overlay on the line at point or the minibuffer.")


 (use-package! eros
-  :when (featurep! +overlay)
+  :when (modulep! +overlay)
  :hook (emacs-lisp-mode . eros-mode))
--- a/modules/tools/eval/packages.el
+++ b/modules/tools/eval/packages.el
@ -2,5 +2,5 @@
 ;;; tools/eval/packages.el

 (package! quickrun :pin "314beae43cac2e4943e9ed4850e8e147bc3d2fac")
-(when (featurep! +overlay)
+(when (modulep! +overlay)
  (package! eros :pin "dd8910279226259e100dab798b073a52f9b4233a"))
--- a/modules/tools/gist/autoload/evil.el
+++ b/modules/tools/gist/autoload/evil.el
@ -1,5 +1,5 @@
 ;;; tools/gist/autoload/evil.el -*- lexical-binding: t; -*-
-;;;###if (featurep! :editor evil)
+;;;###if (modulep! :editor evil)

 ;;;###autoload (autoload '+gist:send "tools/gist/autoload/evil" nil t)
 (evil-define-operator +gist:send (bang)
--- a/modules/tools/lookup/autoload/docsets.el
+++ b/modules/tools/lookup/autoload/docsets.el
@ -1,5 +1,5 @@
 ;;; tools/lookup/autoload/docsets.el -*- lexical-binding: t; -*-
-;;;###if (featurep! +docsets)
+;;;###if (modulep! +docsets)

 (defvar dash-docs-docsets nil)

@ -102,7 +102,7 @@ installed with `dash-docs-install-docset'."
           (cl-remove-if-not #'dash-docs-docset-path (or docsets dash-docs-docsets))))
        (query (doom-thing-at-point-or-region query)))
    (doom-log "Searching docsets %s" dash-docs-docsets)
-    (cond ((featurep! :completion vertico)
+    (cond ((modulep! :completion vertico)
           (dash-docs-initialize-debugging-buffer)
           (dash-docs-create-buffer-connections)
           (dash-docs-create-common-connections)
@ -118,9 +118,9 @@ installed with `dash-docs-install-docset'."
                                      :initial query)
                       (user-error "Aborted"))))
             (dash-docs-browse-url (cdr (assoc result (funcall sink nil))))))
-          ((featurep! :completion ivy)
+          ((modulep! :completion ivy)
           (counsel-dash query))
-          ((featurep! :completion helm)
+          ((modulep! :completion helm)
           (helm-dash query))
          ((user-error "No dash backend is installed, enable ivy or helm.")))))

--- a/modules/tools/lookup/autoload/evil.el
+++ b/modules/tools/lookup/autoload/evil.el
@ -1,5 +1,5 @@
 ;;; tools/lookup/autoload/evil.el -*- lexical-binding: t; -*-
-;;;###if (featurep! :editor evil)
+;;;###if (modulep! :editor evil)

 ;;;###autoload (autoload '+lookup:online "tools/lookup/autoload/evil" nil t)
 (evil-define-command +lookup:online (query &optional bang)
--- a/modules/tools/lookup/autoload/lookup.el
+++ b/modules/tools/lookup/autoload/lookup.el
@ -240,13 +240,13 @@ Will return nil if neither is available. These require ripgrep to be installed."
  (unless identifier
    (let ((query (rxt-quote-pcre identifier)))
      (ignore-errors
-        (cond ((featurep! :completion ivy)
+        (cond ((modulep! :completion ivy)
               (+ivy-file-search :query query)
               t)
-              ((featurep! :completion helm)
+              ((modulep! :completion helm)
               (+helm-file-search :query query)
               t)
-              ((featurep! :completion vertico)
+              ((modulep! :completion vertico)
               (+vertico-file-search :query query)
               t))))))

@ -278,10 +278,10 @@ otherwise falling back to ffap.el (find-file-at-point)."
                (or (file-exists-p guess)
                    (ffap-url-p guess)))
           (find-file-at-point guess))
-          ((and (featurep! :completion ivy)
+          ((and (modulep! :completion ivy)
                (doom-project-p))
           (counsel-file-jump guess (doom-project-root)))
-          ((and (featurep! :completion vertico)
+          ((and (modulep! :completion vertico)
                (doom-project-p))
           (+vertico/find-file-in (doom-project-root) guess))
          ((find-file-at-point (ffap-prompter guess))))
--- a/modules/tools/lookup/config.el
+++ b/modules/tools/lookup/config.el
@ -28,7 +28,7 @@
            ("Wolfram alpha"     "https://wolframalpha.com/input/?i=%s")
            ("Wikipedia"         "https://wikipedia.org/search-redirect.php?language=en&go=Go&search=%s")
            ("MDN"               "https://developer.mozilla.org/en-US/search?q=%s"))
-          (when (featurep! :lang rust)
+          (when (modulep! :lang rust)
            '(("Rust Docs" "https://doc.rust-lang.org/std/?search=%s"))))
  "An alist that maps online resources to either:

@ -110,7 +110,7 @@ If the argument is interactive (satisfies `commandp'), it is called with
 argument: the identifier at point. See `set-lookup-handlers!' about adding to
 this list.")

-(defvar +lookup-dictionary-prefer-offline (featurep! +offline)
+(defvar +lookup-dictionary-prefer-offline (modulep! +offline)
  "If non-nil, look up dictionaries online.

 Setting this to nil will force it to use offline backends, which may be less
@ -132,8 +132,8 @@ Dictionary.app behind the scenes to get definitions.")
        dumb-jump-prefer-searcher 'rg
        dumb-jump-aggressive nil
        dumb-jump-selector
-        (cond ((featurep! :completion ivy)  'ivy)
-              ((featurep! :completion helm) 'helm)
+        (cond ((modulep! :completion ivy)  'ivy)
+              ((modulep! :completion helm) 'helm)
              ('popup)))
  (add-hook 'dumb-jump-after-jump-hook #'better-jumper-set-jump))

@ -157,12 +157,12 @@ Dictionary.app behind the scenes to get definitions.")
      (funcall fn)))

  ;; This integration is already built into evil
-  (unless (featurep! :editor evil)
+  (unless (modulep! :editor evil)
    ;; Use `better-jumper' instead of xref's marker stack
    (advice-add #'xref-push-marker-stack :around #'doom-set-jump-a))

  (use-package! ivy-xref
-    :when (featurep! :completion ivy)
+    :when (modulep! :completion ivy)
    :config
    (set-popup-rule! "^\\*xref\\*$" :ignore t)
    (setq xref-show-definitions-function #'ivy-xref-show-defs
@ -178,10 +178,10 @@ Dictionary.app behind the scenes to get definitions.")
      (funcall fn fetcher alist)))

  (use-package! helm-xref
-    :when (featurep! :completion helm))
+    :when (modulep! :completion helm))

  (use-package! consult-xref
-    :when (featurep! :completion vertico)
+    :when (modulep! :completion vertico)
    :defer t
    :init
    (setq xref-show-xrefs-function       #'consult-xref
@ -192,7 +192,7 @@ Dictionary.app behind the scenes to get definitions.")
 ;;; Dash docset integration

 (use-package! dash-docs
-  :when (featurep! +docsets)
+  :when (modulep! +docsets)
  :defer t
  :init
  (add-hook '+lookup-documentation-functions #'+lookup-dash-docsets-backend-fn)
@ -202,9 +202,9 @@ Dictionary.app behind the scenes to get definitions.")
        dash-docs-min-length 2
        dash-docs-browser-func #'eww)

-  (cond ((featurep! :completion helm)
+  (cond ((modulep! :completion helm)
         (require 'helm-dash nil t))
-        ((featurep! :completion ivy)
+        ((modulep! :completion ivy)
         (require 'counsel-dash nil t))))


@ -212,7 +212,7 @@ Dictionary.app behind the scenes to get definitions.")
 ;;; Dictionary integration

 (use-package! define-word
-  :when (featurep! +dictionary)
+  :when (modulep! +dictionary)
  :unless IS-MAC
  :defer t
  :config
--- a/modules/tools/lookup/doctor.el
+++ b/modules/tools/lookup/doctor.el
@ -1,5 +1,5 @@
 ;;; tools/lookup/doctor.el -*- lexical-binding: t; -*-

-(when (featurep! +docsets)
+(when (modulep! +docsets)
  (unless (executable-find "sqlite3")
    (warn! "Couldn't find the sqlite3 executable. dash-docs will not work.")))
--- a/modules/tools/lookup/packages.el
+++ b/modules/tools/lookup/packages.el
@ -4,31 +4,31 @@
 ;; HACK `dumb-jump' uses the `helm-build-sync-source' macro, but this requires
 ;;      helm be loaded before `dumb-jump' is byte-compiled during installation.
 ;;      To ensure this, we declare helm before dumb-jump.
-(when (featurep! :completion helm)
+(when (modulep! :completion helm)
  (package! helm))

 ;;
 (package! dumb-jump :pin "1dd583011f4025b1b8c75fd785691851b6c5dfa3")
-(when (featurep! :completion ivy)
+(when (modulep! :completion ivy)
  (package! ivy-xref :pin "a82e8e117d2dd62c28b6a3e3d6e4cfb11c0bda38"))
-(when (featurep! :completion helm)
+(when (modulep! :completion helm)
  (package! helm-xref :pin "ea0e4ed8a9baf236e4085cbc7178241f109a53fa"))

 ;; For dictionary and online lookup
 (package! request :pin "38ed1d2e64138eb16a9d8ed2987cff2e01b4a93b")

-(when (featurep! +docsets)
+(when (modulep! +docsets)
  (package! dash-docs :pin "29848b6b347ac520f7646c200ed2ec36cea3feda")
-  (when (featurep! :completion helm)
+  (when (modulep! :completion helm)
    (package! helm-dash :pin "7f853bd34da666f0e9a883011c80f451b06f6c59"))
-  (when (featurep! :completion ivy)
+  (when (modulep! :completion ivy)
    (package! counsel-dash :pin "370d5f6f14b5294d0eb717f7b2a6a8e93df1ed24")))

-(when (featurep! +dictionary)
+(when (modulep! +dictionary)
  (if IS-MAC
      (package! osx-dictionary :pin "1a4479d9f44ef1e6e5f7643c172c32f6fe6cce21")
    (package! define-word :pin "31a8c67405afa99d0e25e7c86a4ee7ef84a808fe")
    (package! powerthesaurus :pin "88bc5229cba1604c8f74db0a1456d99259d538cc")
-    (when (featurep! +offline)
+    (when (modulep! +offline)
      (package! wordnut :pin "feac531404041855312c1a046bde7ea18c674915")
      (package! synosaurus :pin "14d34fc92a77c3a916b4d58400424c44ae99cd81"))))
--- a/modules/tools/lsp/+eglot.el
+++ b/modules/tools/lsp/+eglot.el
@ -11,7 +11,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 (featurep! :checkers syntax)
+  (when (modulep! :checkers syntax)
    (setq eglot-stay-out-of '(flymake)))

  :config
@ -25,7 +25,7 @@

  (add-to-list 'doom-debug-variables '(eglot-events-buffer-size . 0))

-  (when (featurep! :checkers syntax)
+  (when (modulep! :checkers syntax)
    (after! flycheck
      (load! "autoload/flycheck-eglot")))

@ -52,6 +52,6 @@ server getting expensively restarted when reverting buffers."

 (use-package! consult-eglot
  :defer t
-  :when (featurep! :completion vertico)
+  :when (modulep! :completion vertico)
  :init
  (map! :map eglot-mode-map [remap xref-find-apropos] #'consult-eglot-symbols))
--- a/modules/tools/lsp/+lsp.el
+++ b/modules/tools/lsp/+lsp.el
@ -1,7 +1,7 @@
 ;;; tools/lsp/+lsp.el -*- lexical-binding: t; -*-

 (defvar +lsp-company-backends
-  (if (featurep! :editor snippets)
+  (if (modulep! :editor snippets)
      '(:separate company-capf company-yasnippet)
    'company-capf)
  "The backends to prepend to `company-backends' in `lsp-mode' buffers.
@ -35,7 +35,7 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
  (setq lsp-headerline-breadcrumb-enable nil)

  ;; Let doom bind the lsp keymap.
-  (when (featurep! :config default +bindings)
+  (when (modulep! :config default +bindings)
    (setq lsp-keymap-prefix nil))

  :config
@ -86,7 +86,7 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
          (lsp--info "Could not guess project root."))))
    #'+lsp-optimization-mode)

-  (when (featurep! :completion company)
+  (when (modulep! :completion company)
    (add-hook! 'lsp-completion-mode-hook
      (defun +lsp-init-company-backends-h ()
        (when lsp-completion-mode
@ -121,7 +121,7 @@ server getting expensively restarted when reverting buffers."
                       (+lsp-optimization-mode -1))))
             lsp--cur-workspace))))

-  (when (featurep! :ui modeline +light)
+  (when (modulep! :ui modeline +light)
    (defvar-local lsp-modeline-icon nil)

    (add-hook! '(lsp-before-initialize-hook
@ -154,14 +154,14 @@ instead is more sensible."
      (apply fn args)))

  :config
-  (when (featurep! +peek)
+  (when (modulep! +peek)
    (set-lookup-handlers! 'lsp-ui-mode
      :definition 'lsp-ui-peek-find-definitions
      :implementations 'lsp-ui-peek-find-implementation
      :references 'lsp-ui-peek-find-references
      :async t))

-  (setq lsp-ui-peek-enable (featurep! +peek)
+  (setq lsp-ui-peek-enable (modulep! +peek)
        lsp-ui-doc-max-height 8
        lsp-ui-doc-max-width 72         ; 150 (default) is too wide
        lsp-ui-doc-delay 0.75           ; 0.2 (default) is too naggy
@ -184,17 +184,17 @@ instead is more sensible."


 (use-package! helm-lsp
-  :when (featurep! :completion helm)
+  :when (modulep! :completion helm)
  :commands helm-lsp-workspace-symbol helm-lsp-global-workspace-symbol)


 (use-package! lsp-ivy
-  :when (featurep! :completion ivy)
+  :when (modulep! :completion ivy)
  :commands lsp-ivy-workspace-symbol lsp-ivy-global-workspace-symbol)


 (use-package! consult-lsp
  :defer t
-  :when (featurep! :completion vertico)
+  :when (modulep! :completion vertico)
  :init
  (map! :map lsp-mode-map [remap xref-find-apropos] #'consult-lsp-symbols))
--- a/modules/tools/lsp/autoload/common.el
+++ b/modules/tools/lsp/autoload/common.el
@ -4,7 +4,7 @@
 (defun lsp! ()
  "Dispatch to call the currently used lsp client entrypoint"
  (interactive)
-  (if (featurep! +eglot)
+  (if (modulep! +eglot)
      (eglot-ensure)
    (unless (bound-and-true-p lsp-mode)
      (lsp-deferred))))
--- a/modules/tools/lsp/autoload/eglot.el
+++ b/modules/tools/lsp/autoload/eglot.el
@ -1,5 +1,5 @@
 ;;; tools/lsp/autoload/eglot.el -*- lexical-binding: t; -*-
-;;;###if (featurep! +eglot)
+;;;###if (modulep! +eglot)

 ;;;###autodef
 (defun set-eglot-client! (mode server-call)
--- 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 (featurep! +eglot))
+;;;###if (not (modulep! +eglot))

 ;;;###autodef
 (defun set-lsp-priority! (client priority)
--- a/modules/tools/lsp/config.el
+++ b/modules/tools/lsp/config.el
@ -42,6 +42,6 @@ killing and opening many LSP/eglot-powered buffers.")
 ;;
 ;;; Implementations

-(if (featurep! +eglot)
+(if (modulep! +eglot)
    (load! "+eglot")
  (load! "+lsp"))
--- a/modules/tools/lsp/doctor.el
+++ b/modules/tools/lsp/doctor.el
@ -1,7 +1,7 @@
 ;;; tools/lsp/doctor.el -*- lexical-binding: t; -*-

-(assert! (not (and (featurep! +eglot)
-                   (featurep! +peek)))
+(assert! (not (and (modulep! +eglot)
+                   (modulep! +peek)))
         "+eglot and +peek flags are not compatible. Peek uses lsp-mode, while Eglot is another package altogether for LSP.")

 (unless (executable-find "npm")
--- a/modules/tools/lsp/packages.el
+++ b/modules/tools/lsp/packages.el
@ -1,16 +1,16 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/lsp/packages.el

-(if (featurep! +eglot)
+(if (modulep! +eglot)
    (progn
      (package! eglot :pin "bd970be047aba4513c2970b9ff2d842f0472cb0e")
-      (when (featurep! :completion vertico)
+      (when (modulep! :completion vertico)
        (package! consult-eglot :pin "0da8801dd8435160ce1f62ad8066bd52e38f5cbd")))
  (package! lsp-mode :pin "3fa645c0397b8f438f2db2dd288b899ba330d410")
  (package! lsp-ui :pin "0a6368d38dc32e52abcbd52b63d1e557e42c66e6")
-  (when (featurep! :completion ivy)
+  (when (modulep! :completion ivy)
    (package! lsp-ivy :pin "3e87441a625d65ced5a208a0b0442d573596ffa3"))
-  (when (featurep! :completion helm)
+  (when (modulep! :completion helm)
    (package! helm-lsp :pin "c2c6974dadfac459b1a69a1217441283874cea92"))
-  (when (featurep! :completion vertico)
+  (when (modulep! :completion vertico)
    (package! consult-lsp :pin "19606a03cf854e1b0930c4526ed92c4560dccdc2")))
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@ -145,14 +145,14 @@ Only has an effect in GUI Emacs.")


 (use-package! forge
-  :when (featurep! +forge)
+  :when (modulep! +forge)
  ;; We defer loading even further because forge's dependencies will try to
  ;; compile emacsql, which is a slow and blocking operation.
  :after-call magit-status
  :commands forge-create-pullreq forge-create-issue
  :preface
  (setq forge-database-file (concat doom-etc-dir "forge/forge-database.sqlite"))
-  (setq forge-add-default-bindings (not (featurep! :editor evil +everywhere)))
+  (setq forge-add-default-bindings (not (modulep! :editor evil +everywhere)))
  :config
  ;; All forge list modes are derived from `forge-topic-list-mode'
  (map! :map forge-topic-list-mode-map :n "q" #'kill-current-buffer)
@ -189,7 +189,7 @@ ensure it is built when we actually use Forge."


 (use-package! code-review
-  :when (featurep! +forge)
+  :when (modulep! +forge)
  :after magit
  :init
  ;; TODO This needs to either a) be cleaned up or better b) better map things
@ -223,7 +223,7 @@ ensure it is built when we actually use Forge."


 (use-package! evil-collection-magit
-  :when (featurep! :editor evil +everywhere)
+  :when (modulep! :editor evil +everywhere)
  :defer t
  :init (defvar evil-collection-magit-use-z-for-folds t)
  :config
@ -287,7 +287,7 @@ ensure it is built when we actually use Forge."


 (use-package! evil-collection-magit-section
-  :when (featurep! :editor evil +everywhere)
+  :when (modulep! :editor evil +everywhere)
  :defer t
  :init
  (defvar evil-collection-magit-section-use-z-for-folds evil-collection-magit-use-z-for-folds)
--- a/modules/tools/magit/packages.el
+++ b/modules/tools/magit/packages.el
@ -3,7 +3,7 @@

 (when (package! magit :pin "c1fb53d3de6390961ccd8dfb1cc135383508d0fc")
  (package! compat :pin "cc1924fd8b3f9b75b26bf93f084ea938c06f9615")
-  (when (featurep! +forge)
+  (when (modulep! +forge)
    (package! forge :pin "36208c43bf41782cfe81fccc904f8adbe57818e1"))
  (package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b")
  (package! magit-todos :pin "67fd80c2f10aec4d5b2a24b5d3d53c08cc1f05dc")
--- a/modules/tools/pass/autoload/consult.el
+++ b/modules/tools/pass/autoload/consult.el
@ -1,5 +1,5 @@
 ;;; tools/pass/autoload/consult.el -*- lexical-binding: t; -*-
-;;;###if (featurep! :completion vertico)
+;;;###if (modulep! :completion vertico)

 ;;;###autoload
 (defun +pass/consult (arg pass)
--- a/modules/tools/pass/autoload/ivy.el
+++ b/modules/tools/pass/autoload/ivy.el
@ -1,5 +1,5 @@
 ;;; tools/pass/autoload/ivy.el -*- lexical-binding: t; -*-
-;;;###if (featurep! :completion ivy)
+;;;###if (modulep! :completion ivy)

 ;;;###autoload
 (defun +pass/ivy (arg)
--- a/modules/tools/pass/config.el
+++ b/modules/tools/pass/config.el
@ -29,5 +29,5 @@


 ;; Is built into Emacs 26+
-(when (featurep! +auth)
+(when (modulep! +auth)
  (auth-source-pass-enable))
--- a/modules/tools/pass/packages.el
+++ b/modules/tools/pass/packages.el
@ -5,7 +5,7 @@
 (package! password-store :pin "c4d8a1d815e79ddd89a85d3e36a41d29f0475771")
 (package! password-store-otp :pin "be3a00a981921ed1b2f78012944dc25eb5a0beca")

-(when (featurep! :completion ivy)
+(when (modulep! :completion ivy)
  (package! ivy-pass :pin "5b523de1151f2109fdd6a8114d0af12eef83d3c5"))
-(when (featurep! :completion helm)
+(when (modulep! :completion helm)
  (package! helm-pass :pin "4ce46f1801f2e76e53482c65aa0619d427a3fbf9"))
--- a/modules/tools/rgb/autoload.el
+++ b/modules/tools/rgb/autoload.el
@ -1,5 +1,5 @@
 ;;; tools/rgb/autoload.el -*- lexical-binding: t; -*-
-;;;###if (featurep! :ui hydra)
+;;;###if (modulep! :ui hydra)

 ;;;###autoload (autoload '+rgb/kurecolor-hydra/body "tools/rgb/autoload" nil t)
 (defhydra +rgb/kurecolor-hydra (:color pink :hint nil)
--- a/modules/tools/taskrunner/autoload.el
+++ b/modules/tools/taskrunner/autoload.el
@ -5,5 +5,5 @@
  "Invokes `ivy-taskrunner' or `helm-tasksrunner', depending on which is
 available."
  (interactive)
-  (cond ((featurep! :completion ivy) (ivy-taskrunner))
-        ((featurep! :completion helm) (helm-taskrunner))))
+  (cond ((modulep! :completion ivy) (ivy-taskrunner))
+        ((modulep! :completion helm) (helm-taskrunner))))
--- a/modules/tools/taskrunner/config.el
+++ b/modules/tools/taskrunner/config.el
@ -4,11 +4,11 @@
  (set-popup-rule! taskrunner--buffer-name-regexp :quit t))

 (use-package! helm-taskrunner
-  :when (featurep! :completion helm)
+  :when (modulep! :completion helm)
  :defer t
  :config (helm-taskrunner-minor-mode +1))

 (use-package! ivy-taskrunner
-  :when (featurep! :completion ivy)
+  :when (modulep! :completion ivy)
  :defer t
  :config (ivy-taskrunner-minor-mode +1))
--- a/modules/tools/taskrunner/packages.el
+++ b/modules/tools/taskrunner/packages.el
@ -3,12 +3,12 @@

 (package! taskrunner :pin "716323aff410b4d864d137c9ebe4bbb5b8587f5e")

-(when (featurep! :completion helm)
+(when (modulep! :completion helm)
  (package! helm-taskrunner
    :pin "70ef8117aafdc01a1f06151a82cecb9a2fcf4d32"
    :recipe (:host github :repo "emacs-taskrunner/helm-taskrunner")))

-(when (featurep! :completion ivy)
+(when (modulep! :completion ivy)
  (package! ivy-taskrunner
    :pin "c731ee6279f65061ef70e79d3818ea1d9678e6da"
    :recipe (:host github :repo "emacs-taskrunner/ivy-taskrunner")))
--- a/modules/tools/terraform/config.el
+++ b/modules/tools/terraform/config.el
@ -3,7 +3,7 @@
 (defvar +terraform-runner (if (executable-find "terragrunt") "terragrunt" "terraform")
  "The default runner - terraform or terragrunt")

-(when (featurep! +lsp)
+(when (modulep! +lsp)
  (add-hook 'terraform-mode-local-vars-hook #'lsp! 'append))

 (after! terraform-mode
@ -18,7 +18,7 @@
        :desc "plan"  "p" (cmd! (compile (format "%s plan" +terraform-runner)))))

 (use-package! company-terraform
-  :when (featurep! :completion company)
+  :when (modulep! :completion company)
  :after terraform-mode
  :config
  (set-company-backend! 'terraform-mode 'company-terraform))
--- a/modules/tools/terraform/packages.el
+++ b/modules/tools/terraform/packages.el
@ -2,5 +2,5 @@
 ;;; tools/terraform/packages.el

 (package! terraform-mode :pin "e560caaa9d9a11b0868adf6d9dcae5ebb5055730")
-(when (featurep! :completion company)
+(when (modulep! :completion company)
  (package! company-terraform :pin "8d5a16d1bbeeb18ca49a8fd57b5d8cd30c8b8dc7"))
--- a/modules/tools/tmux/autoload/evil.el
+++ b/modules/tools/tmux/autoload/evil.el
@ -1,5 +1,5 @@
 ;;; tools/tmux/autoload/evil.el -*- lexical-binding: t; -*-
-;;;###if (featurep! :editor evil)
+;;;###if (modulep! :editor evil)

 ;;;###autoload (autoload '+tmux:run "tools/tmux/autoload/evil" nil t)
 (evil-define-command +tmux:run (bang &optional command)
--- a/modules/tools/tree-sitter/config.el
+++ b/modules/tools/tree-sitter/config.el
@ -21,7 +21,7 @@ If nil, it is disabled in all modes")


 (use-package! evil-textobj-tree-sitter
-  :when (featurep! :editor evil +everywhere)
+  :when (modulep! :editor evil +everywhere)
  :defer t
  :init (after! tree-sitter (require 'evil-textobj-tree-sitter))
  :config
--- a/modules/tools/tree-sitter/packages.el
+++ b/modules/tools/tree-sitter/packages.el
@ -7,6 +7,6 @@
 (package! tree-sitter-langs
  :pin "deb2d8674be8f777ace50e15c7c041aeddb1d0b2")

-(when (featurep! :editor evil +everywhere)
+(when (modulep! :editor evil +everywhere)
  (package! evil-textobj-tree-sitter
    :pin "9dce8dab68c954ae32095328cf898eb856fc341a"))