💥 Rename def-package! -> use-package!

Calling this pivotal macro "def-package!" has frequently been a source
of confusion. It is a thin wrapper around use-package, and it should be
obvious that it is so. For this reason, and to match the naming
convention used with other convenience macros/wrappers, it is now
use-package!.

Also changes def-package-hook! -> use-package-hook!

The old macros are now marked obsolete and will be removed when straight
integration is merged.

core/autoload/help.el

@@ -381,7 +381,7 @@ current file is in, or d) the module associated with the current major mode (see
     (split-string
      (shell-command-to-string
       (format "git grep --no-break --no-heading --line-number '%s %s\\($\\| \\)'"
-              "\\(^;;;###package\\|(after!\\|(def-package!\\)"
+              "\\(^;;;###package\\|(after!\\|(use-package!\\)"
               package))
      "\n" t)))
 

core/core-editor.el

@@ -63,7 +63,7 @@ successfully sets indent_style/indent_size.")
 ;;
 ;;; Built-in plugins
 
-(def-package! autorevert
+(use-package! autorevert
   ;; revert buffers when their files/state have changed
   :hook (focus-in . doom-auto-revert-buffers-h)
   :hook (after-save . doom-auto-revert-buffers-h)
@@ -99,7 +99,7 @@ successfully sets indent_style/indent_size.")
   (setq bookmark-save-flag t))
 
 
-(def-package! recentf
+(use-package! recentf
   ;; Keep track of recently opened files
   :defer-incrementally easymenu tree-widget timer
   :after-call after-find-file
@@ -141,7 +141,7 @@ successfully sets indent_style/indent_size.")
     (quiet! (recentf-mode +1))))
 
 
-(def-package! savehist
+(use-package! savehist
   ;; persist variables across sessions
   :defer-incrementally custom
   :after-call post-command-hook
@@ -161,7 +161,7 @@ successfully sets indent_style/indent_size.")
                                else if item collect it)))))
 
 
-(def-package! saveplace
+(use-package! saveplace
   ;; persistent point location in buffers
   :after-call after-find-file dired-initial-position-hook
   :config
@@ -175,7 +175,7 @@ successfully sets indent_style/indent_size.")
   (save-place-mode +1))
 
 
-(def-package! server
+(use-package! server
   :when (display-graphic-p)
   :after-call pre-command-hook after-find-file focus-out-hook
   :init
@@ -189,7 +189,7 @@ successfully sets indent_style/indent_size.")
 ;;
 ;;; Packages
 
-(def-package! better-jumper
+(use-package! better-jumper
   :after-call pre-command-hook
   :init
   (global-set-key [remap evil-jump-forward]  #'better-jumper-jump-forward)
@@ -227,7 +227,7 @@ successfully sets indent_style/indent_size.")
     nil))
 
 
-(def-package! command-log-mode
+(use-package! command-log-mode
   :commands global-command-log-mode
   :config
   (setq command-log-mode-auto-show t
@@ -236,7 +236,7 @@ successfully sets indent_style/indent_size.")
         command-log-mode-window-size 50))
 
 
-(def-package! dtrt-indent
+(use-package! dtrt-indent
   ;; Automatic detection of indent settings
   :unless noninteractive
   :defer t
@@ -273,7 +273,7 @@ successfully sets indent_style/indent_size.")
         (funcall orig-fn arg)))))
 
 
-(def-package! helpful
+(use-package! helpful
   ;; a better *help* buffer
   :commands helpful--read-symbol
   :init
@@ -308,7 +308,7 @@ successfully sets indent_style/indent_size.")
 (add-hook 'imenu-after-jump-hook #'recenter)
 
 
-(def-package! smartparens
+(use-package! smartparens
   ;; Auto-close delimiters and blocks as you type. It's more powerful than that,
   ;; but that is all Doom uses it for.
   :after-call doom-switch-buffer-hook after-find-file
@@ -363,12 +363,12 @@ successfully sets indent_style/indent_size.")
   (smartparens-global-mode +1))
 
 
-(def-package! so-long
+(use-package! so-long
   :after-call after-find-file
   :config (global-so-long-mode +1))
 
 
-(def-package! undo-tree
+(use-package! undo-tree
   ;; Branching & persistent undo
   :after-call doom-switch-buffer-hook after-find-file
   :config
@@ -395,7 +395,7 @@ successfully sets indent_style/indent_size.")
   (global-undo-tree-mode +1))
 
 
-(def-package! ws-butler
+(use-package! ws-butler
   ;; a less intrusive `delete-trailing-whitespaces' on save
   :after-call after-find-file
   :config

core/core-keybinds.el

@@ -177,7 +177,7 @@ localleader prefix."
 ;;
 ;;; Packages
 
-(def-package! which-key
+(use-package! which-key
   :defer 1
   :after-call pre-command-hook
   :init

core/core-lib.el

@@ -193,7 +193,7 @@ at the values with which this function was called."
        (call-interactively ,command))))
 (defalias 'lambda!! 'λ!!)
 
-(define-obsolete-function-alias 'FILE! 'file!)
+(define-obsolete-function-alias 'FILE! 'file!) ; DEPRECATED
 (defun file! ()
   "Return the emacs lisp file this macro is called from."
   (cond ((bound-and-true-p byte-compile-current-file))
@@ -202,7 +202,7 @@ at the values with which this function was called."
          (car current-load-list))
         (buffer-file-name)))
 
-(define-obsolete-function-alias 'DIR! 'dir!)
+(define-obsolete-function-alias 'DIR! 'dir!) ; DEPRECATED
 (defun dir! ()
   "Returns the directory of the emacs lisp file this macro is called from."
   (when-let (path (file!))

core/core-modules.el

@@ -244,10 +244,10 @@ This value is cached. If REFRESH-P, then don't use the cached value."
         use-package-minimum-reported-time (if doom-debug-mode 0 0.1)
         use-package-expand-minimally (not noninteractive)))
 
-;; Adds four new keywords to `use-package' (and consequently, `def-package!') to
+;; Adds four new keywords to `use-package' (and consequently, `use-package!') to
 ;; expand its lazy-loading capabilities. They are:
 ;;
-;; Check out `def-package!'s documentation for more about these two.
+;; Check out `use-package!'s documentation for more about these two.
 ;;   :after-call SYMBOL|LIST
 ;;   :defer-incrementally SYMBOL|LIST|t
 ;;
@@ -393,7 +393,8 @@ to least)."
   `(setq doom-modules ',doom-modules))
 
 (defvar doom-disabled-packages)
-(defmacro def-package! (name &rest plist)
+(define-obsolete-function-alias 'def-package! 'use-package!) ; DEPRECATED
+(defmacro use-package! (name &rest plist)
   "Declares and configures a package.
 
 This is a thin wrapper around `use-package', and is ignored if the NAME package
@@ -407,7 +408,7 @@ two extra properties:
   The first time any of these functions or hooks are executed, the package is
   loaded. e.g.
 
-  (def-package! projectile
+  (use-package! projectile
     :after-call (pre-command-hook after-find-file dired-before-readin-hook)
     ...)
 
@@ -421,7 +422,7 @@ two extra properties:
   NAME is implicitly added if this property is present and non-nil. No need to
   specify it. A value of `t' implies NAME, e.g.
 
-  (def-package! abc
+  (use-package! abc
     ;; This is equivalent to :defer-incrementally (abc)
     :defer-incrementally t
     ...)"
@@ -434,8 +435,9 @@ two extra properties:
                    (not (locate-library (symbol-name name)))))
     `(use-package ,name ,@plist)))
 
-(defmacro def-package-hook! (package when &rest body)
+(define-obsolete-function-alias 'def-package-hook! 'use-package-hook!) ; DEPRECATED
-  "Reconfigures a package's `def-package!' block.
+(defmacro use-package-hook! (package when &rest body)
+  "Reconfigures a package's `use-package!' block.
 
 Only use this macro in a module's init.el file.
 
@@ -446,11 +448,11 @@ WHEN should be one of the following:
   :pre-init :post-init :pre-config :post-config
 
 WARNING: If :pre-init or :pre-config hooks return nil, the original
-`def-package!''s :init/:config block (respectively) is overwritten, so remember
+`use-package!''s :init/:config block (respectively) is overwritten, so remember
 to have them return non-nil (or exploit that to overwrite Doom's config)."
   (declare (indent defun))
   (unless (memq when '(:pre-init :post-init :pre-config :post-config))
-    (error "'%s' isn't a valid hook for def-package-hook!" when))
+    (error "'%s' isn't a valid hook for use-package-hook!" when))
   `(progn
      (setq use-package-inject-hooks t)
      (add-hook!

core/core-packages.el

@@ -64,7 +64,7 @@ missing) and shouldn't be deleted.")
   "A list of recipes for straight's recipe repos.")
 
 (defvar doom-disabled-packages ()
-  "A list of packages that should be ignored by `def-package!' and `after!'.")
+  "A list of packages that should be ignored by `use-package!' and `after!'.")
 
 
 ;;

core/core-projects.el

@@ -21,7 +21,7 @@ Emacs.")
 ;;
 ;;; Packages
 
-(def-package! projectile
+(use-package! projectile
   :after-call after-find-file dired-before-readin-hook minibuffer-setup-hook
   :commands (projectile-project-root
              projectile-project-name

core/core-ui.el

@@ -365,7 +365,7 @@ treat Emacs as a non-application window."
 (setq ansi-color-for-comint-mode t)
 
 
-(def-package! compile
+(use-package! compile
   :defer t
   :config
   (setq compilation-always-kill t       ; kill compilation process before starting another
@@ -375,7 +375,7 @@ treat Emacs as a non-application window."
   (add-hook 'compilation-filter-hook #'doom-apply-ansi-color-to-compilation-buffer-h))
 
 
-(def-package! ediff
+(use-package! ediff
   :defer t
   :init
   (setq ediff-diff-options "-w" ; turn off whitespace checking
@@ -394,7 +394,7 @@ treat Emacs as a non-application window."
     'append))
 
 
-(def-package! hl-line
+(use-package! hl-line
   ;; Highlights the current line
   :hook ((prog-mode text-mode conf-mode) . hl-line-mode)
   :config
@@ -418,14 +418,14 @@ treat Emacs as a non-application window."
           (hl-line-mode +1))))))
 
 
-(def-package! winner
+(use-package! winner
   ;; undo/redo changes to Emacs' window layout
   :after-call after-find-file doom-switch-window-hook
   :preface (defvar winner-dont-bind-my-keys t)
   :config (winner-mode +1)) ; I'll bind keys myself
 
 
-(def-package! paren
+(use-package! paren
   ;; highlight matching delimiters
   :after-call after-find-file doom-switch-buffer-hook
   :config
@@ -449,7 +449,7 @@ treat Emacs as a non-application window."
 ;;
 ;;; Third party packages
 
-(def-package! all-the-icons
+(use-package! all-the-icons
   :commands (all-the-icons-octicon
              all-the-icons-faicon
              all-the-icons-fileicon
@@ -471,7 +471,7 @@ treat Emacs as a non-application window."
   #'hide-mode-line-mode)
 
 ;; Better fontification of number literals in code
-(def-package! highlight-numbers
+(use-package! highlight-numbers
   :hook ((prog-mode conf-mode) . highlight-numbers-mode)
   :config (setq highlight-numbers-generic-regexp "\\_<[[:digit:]]+\\(?:\\.[0-9]*\\)?\\_>"))
 
@@ -501,7 +501,7 @@ treat Emacs as a non-application window."
 (defun doom-disable-line-numbers-h () (display-line-numbers-mode -1))
 
 ;; `nlinum' is used for Emacs 25 users, as Emacs 26+ has native line numbers.
-(def-package! nlinum
+(use-package! nlinum
   ;; Line number column. A faster (or equivalent, in the worst case) line number
   ;; plugin than `linum-mode'.
   :unless EMACS26+
@@ -550,7 +550,7 @@ character that looks like a space that `whitespace-mode' won't affect.")
             (length (save-excursion (goto-char (point-max))
                                     (format-mode-line "%l")))))))
 
-(def-package! nlinum-hl
+(use-package! nlinum-hl
   ;; Fixes disappearing line numbers in nlinum and other quirks
   :unless EMACS26+
   :after nlinum
@@ -566,7 +566,7 @@ character that looks like a space that `whitespace-mode' won't affect.")
   ;; forces them to resize.
   (add-hook 'after-setting-font-hook #'nlinum-hl-flush-all-windows))
 
-(def-package! nlinum-relative
+(use-package! nlinum-relative
   :unless EMACS26+
   :defer t
   :config

modules/app/calendar/config.el

@@ -7,7 +7,7 @@
 ;;
 ;; Packages
 
-(def-package! calfw
+(use-package! calfw
   :commands cfw:open-calendar-buffer
   :config
   ;; better frame for calendar
@@ -30,14 +30,14 @@
   (advice-add #'cfw:render-button :override #'+calendar-cfw:render-button-a))
 
 
-(def-package! calfw-org
+(use-package! calfw-org
   :commands (cfw:open-org-calendar
              cfw:org-create-source
              cfw:open-org-calendar-withkevin
              my-open-calendar))
 
 
-(def-package! org-gcal
+(use-package! org-gcal
   :commands (org-gcal-sync
              org-gcal-fetch
              org-gcal-post-at-point
@@ -48,4 +48,4 @@
     (message "org-gcal::%s - %s" title mes)))
 
 
-;; (def-package! alert)
+;; (use-package! alert)

modules/app/irc/config.el

@@ -46,7 +46,7 @@ playback.")
 ;;
 ;; Packages
 
-(def-package! circe
+(use-package! circe
   :commands circe circe-server-buffers
   :init (setq circe-network-defaults nil)
   :config
@@ -152,14 +152,14 @@ playback.")
           "n" #'circe-command-NAMES)))
 
 
-(def-package! circe-color-nicks
+(use-package! circe-color-nicks
   :hook (circe-channel-mode . enable-circe-color-nicks)
   :config
   (setq circe-color-nicks-min-constrast-ratio 4.5
         circe-color-nicks-everywhere t))
 
 
-(def-package! circe-new-day-notifier
+(use-package! circe-new-day-notifier
   :after circe
   :config
   (enable-circe-new-day-notifier)
@@ -167,7 +167,7 @@ playback.")
         (+irc--pad "Day" "Date changed [{day}]")))
 
 
-(def-package! circe-notifications
+(use-package! circe-notifications
   :commands enable-circe-notifications
   :init
   (if +irc-defer-notifications
@@ -184,7 +184,7 @@ playback.")
               (IS-LINUX 'libnotify))))
 
 
-(def-package! lui
+(use-package! lui
   :commands lui-mode
   :config
   (define-key lui-mode-map "\C-u" #'lui-kill-to-beginning-of-line)
@@ -240,10 +240,10 @@ Courtesy of esh-mode.el"
             wrap-prefix (make-string (+ +irc-left-padding 3) ? )))))
 
 
-(def-package! lui-logging
+(use-package! lui-logging
   :after lui
   :config (enable-lui-logging))
 
 
-(def-package! lui-autopaste
+(use-package! lui-autopaste
   :hook (circe-channel-mode . enable-lui-autopaste))

modules/app/rss/config.el

@@ -19,7 +19,7 @@ easier to scroll through.")
 ;;
 ;; Packages
 
-(def-package! elfeed
+(use-package! elfeed
   :commands elfeed
   :config
   (setq elfeed-search-filter "@2-week-ago "
@@ -64,7 +64,7 @@ easier to scroll through.")
       (kbd "M-RET") #'elfeed-search-browse-url)))
 
 
-(def-package! elfeed-org
+(use-package! elfeed-org
   :when (featurep! +org)
   :after elfeed
   :config

modules/app/twitter/config.el

@@ -1,6 +1,6 @@
 ;;; app/twitter/config.el -*- lexical-binding: t; -*-
 
-(def-package! twittering-mode
+(use-package! twittering-mode
   :commands twit
   :config
   (setq twittering-private-info-file

modules/app/write/config.el

@@ -9,7 +9,7 @@
 ;;
 ;; Packages
 
-(def-package! langtool
+(use-package! langtool
   :when (featurep! +langtool)
   :commands (langtool-check
              langtool-check-done

modules/completion/company/config.el

@@ -1,6 +1,6 @@
 ;;; completion/company/config.el -*- lexical-binding: t; -*-
 
-(def-package! company
+(use-package! company
   :commands company-complete-common company-manual-begin company-grab-line
   :after-call evil-insert-state-entry-hook evil-emacs-state-entry-hook
   :init
@@ -35,7 +35,7 @@
   (global-company-mode +1))
 
 
-(def-package! company-tng
+(use-package! company-tng
   :when (featurep! +tng)
   :after-call post-self-insert-hook
   :config
@@ -51,7 +51,7 @@
 ;;
 ;; Packages
 
-(def-package! company-prescient
+(use-package! company-prescient
   :hook (company-mode . company-prescient-mode)
   :config
   ;; NOTE prescient config duplicated with `ivy'
@@ -59,7 +59,7 @@
   (prescient-persist-mode +1))
 
 
-(def-package! company-box
+(use-package! company-box
   :when (and EMACS26+ (featurep! +childframe))
   :hook (company-mode . company-box-mode)
   :config
@@ -119,7 +119,7 @@
               ((facep sym)    'ElispFace))))))
 
 
-(def-package! company-dict
+(use-package! company-dict
   :defer t
   :config
   (setq company-dict-dir (expand-file-name "dicts" doom-private-dir))

modules/completion/helm/config.el

@@ -32,7 +32,7 @@ be negative.")
 ;;
 ;;; Packages
 
-(def-package! helm-mode
+(use-package! helm-mode
   :defer t
   :after-call pre-command-hook
   :init
@@ -57,7 +57,7 @@ be negative.")
   (add-to-list 'helm-completing-read-handlers-alist (cons #'find-file-at-point nil)))
 
 
-(def-package! helm
+(use-package! helm
   :after helm-mode
   :preface
   (setq helm-candidate-number-limit 50
@@ -125,7 +125,7 @@ be negative.")
     (advice-add fn :around #'doom-use-helpful-a)))
 
 
-(def-package! helm-flx
+(use-package! helm-flx
   :when (featurep! +fuzzy)
   :hook (helm-mode . helm-flx-mode)
   :config (helm-flx-mode +1))
@@ -159,7 +159,7 @@ be negative.")
 
 
 ;;;###package helm-projectile
-(def-package! helm-projectile
+(use-package! helm-projectile
   :commands (helm-projectile-find-file
              helm-projectile-recentf
              helm-projectile-switch-project

modules/completion/ivy/config.el

@@ -43,7 +43,7 @@ immediately runs it on the current candidate (ending the ivy session)."
 ;;
 ;;; Packages
 
-(def-package! ivy
+(use-package! ivy
   :defer 1
   :after-call pre-command-hook
   :init
@@ -109,7 +109,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
 
   (ivy-mode +1)
 
-  (def-package! ivy-hydra
+  (use-package! ivy-hydra
     :commands (ivy-dispatching-done-hydra ivy--matcher-desc ivy-hydra/body)
     :init
     (define-key! ivy-minibuffer-map
@@ -120,7 +120,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
     (define-key ivy-minibuffer-map (kbd "M-o") #'hydra-ivy/body)))
 
 
-(def-package! ivy-rich
+(use-package! ivy-rich
   :after ivy
   :config
   (when (featurep! +icons)
@@ -158,7 +158,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
   (ivy-rich-mode +1))
 
 
-(def-package! all-the-icons-ivy
+(use-package! all-the-icons-ivy
   :when (featurep! +icons)
   :after ivy
   :config
@@ -174,7 +174,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
       (all-the-icons-ivy-setup))))
 
 
-(def-package! counsel
+(use-package! counsel
   :commands counsel-describe-face
   :init
   (map! [remap apropos]                  #'counsel-apropos
@@ -246,7 +246,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
    '(("O" +ivy-git-grep-other-window-action "open in other window"))))
 
 
-(def-package! counsel-projectile
+(use-package! counsel-projectile
   :defer t
   :init
   (map! [remap projectile-find-file]        #'+ivy/projectile-find-file
@@ -260,12 +260,12 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
   (ivy-set-display-transformer #'counsel-projectile-find-file nil))
 
 
-(def-package! wgrep
+(use-package! wgrep
   :commands wgrep-change-to-wgrep-mode
   :config (setq wgrep-auto-save-buffer t))
 
 
-(def-package! ivy-posframe
+(use-package! ivy-posframe
   :when (and EMACS26+ (featurep! +childframe))
   :hook (ivy-mode . ivy-posframe-mode)
   :config
@@ -285,7 +285,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
           #'ivy-display-function-fallback)))
 
 
-(def-package! flx
+(use-package! flx
   :when (and (featurep! +fuzzy)
              (not (featurep! +prescient)))
   :defer t  ; is loaded by ivy
@@ -295,7 +295,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
         ivy-flx-limit 10000))
 
 
-(def-package! ivy-prescient
+(use-package! ivy-prescient
   :hook (ivy-mode . ivy-prescient-mode)
   :when (featurep! +prescient)
   :init

modules/config/default/+emacs.el

@@ -9,7 +9,7 @@
 (setq shift-select-mode t)
 (delete-selection-mode +1)
 
-(def-package! expand-region
+(use-package! expand-region
   :commands (er/contract-region er/mark-symbol er/mark-word)
   :config
   (def-advice! doom--quit-expand-region-a ()

modules/editor/evil/config.el

@@ -19,7 +19,7 @@ directives. By default, this only recognizes C directives.")
 (defvar evil-want-C-w-scroll t)
 (defvar evil-want-Y-yank-to-eol t)
 
-(def-package! evil
+(use-package! evil
   :hook (doom-init-modules . evil-mode)
   :demand t
   :preface
@@ -175,7 +175,7 @@ directives. By default, this only recognizes C directives.")
 ;;
 ;; Packages
 
-(def-package! evil-commentary
+(use-package! evil-commentary
   :commands (evil-commentary
              evil-commentary-yank
              evil-commentary-yank-line
@@ -183,7 +183,7 @@ directives. By default, this only recognizes C directives.")
   :config (evil-commentary-mode 1))
 
 
-(def-package! evil-easymotion
+(use-package! evil-easymotion
   :commands evilem-create evilem-default-keybindings
   :config
   ;; Use evil-search backend, instead of isearch
@@ -198,7 +198,7 @@ directives. By default, this only recognizes C directives.")
                       :bind ((evil-ex-search-highlight-all nil))))
 
 
-(def-package! evil-embrace
+(use-package! evil-embrace
   :commands embrace-add-pair embrace-add-pair-regexp
   :hook (LaTeX-mode . embrace-LaTeX-mode-hook)
   :hook (org-mode . embrace-org-mode-hook)
@@ -245,7 +245,7 @@ directives. By default, this only recognizes C directives.")
          :right-regexp "\\[]})]")))
 
 
-(def-package! evil-escape
+(use-package! evil-escape
   :commands evil-escape
   :after-call evil-normal-state-exit-hook
   :init
@@ -261,7 +261,7 @@ directives. By default, this only recognizes C directives.")
   (evil-escape-mode +1))
 
 
-(def-package! evil-exchange
+(use-package! evil-exchange
   :commands evil-exchange
   :config
   (add-hook 'doom-escape-hook
@@ -271,7 +271,7 @@ directives. By default, this only recognizes C directives.")
         t))))
 
 
-(def-package! evil-snipe
+(use-package! evil-snipe
   :commands (evil-snipe-mode
              evil-snipe-override-mode
              evil-snipe-local-mode
@@ -288,7 +288,7 @@ directives. By default, this only recognizes C directives.")
   (evil-snipe-override-mode +1))
 
 
-(def-package! evil-surround
+(use-package! evil-surround
   :commands (global-evil-surround-mode
              evil-surround-edit
              evil-Surround-edit
@@ -297,7 +297,7 @@ directives. By default, this only recognizes C directives.")
 
 
 ;; Allows you to use the selection for * and #
-(def-package! evil-visualstar
+(use-package! evil-visualstar
   :commands (evil-visualstar/begin-search
              evil-visualstar/begin-search-forward
              evil-visualstar/begin-search-backward)
@@ -310,5 +310,5 @@ directives. By default, this only recognizes C directives.")
 ;;
 ;;; Text object plugins
 
-(def-package! exato
+(use-package! exato
   :commands evil-outer-xml-attr evil-inner-xml-attr)

modules/editor/fold/config.el

@@ -17,7 +17,7 @@
 ;;
 ;; Packages
 
-(def-package! hideshow ; built-in
+(use-package! hideshow ; built-in
   :commands (hs-toggle-hiding
              hs-hide-block
              hs-hide-level
@@ -62,7 +62,7 @@
            '((t))))))
 
 
-(def-package! evil-vimish-fold
+(use-package! evil-vimish-fold
   :when (featurep! :editor evil)
   :commands (evil-vimish-fold/next-fold evil-vimish-fold/previous-fold
              evil-vimish-fold/delete evil-vimish-fold/delete-all

modules/editor/lispy/config.el

@@ -1,6 +1,6 @@
 ;;; editor/lispy/config.el -*- lexical-binding: t; -*-
 
-(def-package! lispy
+(use-package! lispy
   :hook ((common-lisp-mode . lispy-mode)
          (emacs-lisp-mode . lispy-mode)
          (scheme-mode . lispy-mode)
@@ -12,7 +12,7 @@
   (setq lispy-close-quotes-at-end-p t)
   (add-hook 'lispy-mode-hook #'turn-off-smartparens-mode))
 
-(def-package! lispyville
+(use-package! lispyville
   :when (featurep! :editor evil)
   :hook (lispy-mode . lispyville-mode)
   :config

modules/editor/multiple-cursors/config.el

@@ -1,6 +1,6 @@
 ;;; editor/multiple-cursors/config.el -*- lexical-binding: t; -*-
 
-(def-package! evil-mc
+(use-package! evil-mc
   :when (featurep! :editor evil)
   :commands (evil-mc-make-cursor-here
              evil-mc-make-all-cursors

modules/editor/objed/config.el

@@ -1,6 +1,6 @@
 ;;; editor/objed/config.el -*- lexical-binding: t; -*-
 
-(def-package! objed
+(use-package! objed
   :after-call pre-command-hook
   :config
   ;; Prevent undo actions from exiting edit state

modules/editor/parinfer/config.el

@@ -1,6 +1,6 @@
 ;;; editor/parinfer/config.el -*- lexical-binding: t; -*-
 
-(def-package! parinfer
+(use-package! parinfer
   :hook ((emacs-lisp-mode clojure-mode scheme-mode lisp-mode) . parinfer-mode)
   :init
   (setq parinfer-extensions

modules/editor/snippets/config.el

@@ -7,7 +7,7 @@
 ;;
 ;; Packages
 
-(def-package! yasnippet
+(use-package! yasnippet
   :commands (yas-minor-mode-on
              yas-expand
              yas-expand-snippet
@@ -71,7 +71,7 @@
     [remap yas-visit-snippet-file] #'+snippets/edit))
 
 
-(def-package! auto-yasnippet
+(use-package! auto-yasnippet
   :defer t
   :init (setq aya-persist-snippets-dir (concat doom-etc-dir "auto-snippets/"))
   :config

modules/emacs/dired/config.el

@@ -1,6 +1,6 @@
 ;;; tools/dired/config.el -*- lexical-binding: t; -*-
 
-(def-package! dired
+(use-package! dired
   :commands dired-jump
   :init
   (setq ;; Always copy/delete recursively
@@ -37,15 +37,15 @@
     "C-c C-e" #'wdired-change-to-wdired-mode))
 
 
-(def-package! dired-rsync
+(use-package! dired-rsync
   :general (dired-mode-map "C-c C-r" #'dired-rsync))
 
 
-(def-package! diredfl
+(use-package! diredfl
   :hook (dired-mode . diredfl-mode))
 
 
-(def-package! dired-k
+(use-package! dired-k
   :hook (dired-initial-position . dired-k)
   :hook (dired-after-readin . dired-k-no-revert)
   :config
@@ -71,7 +71,7 @@
       (apply orig-fn args))))
 
 
-(def-package! ranger
+(use-package! ranger
   :when (featurep! +ranger)
   :after dired
   :init
@@ -111,12 +111,12 @@ we have to clean it up ourselves."
         ranger-hide-cursor nil))
 
 
-(def-package! all-the-icons-dired
+(use-package! all-the-icons-dired
   :when (featurep! +icons)
   :hook (dired-mode . all-the-icons-dired-mode))
 
 
-(def-package! dired-x
+(use-package! dired-x
   :hook (dired-mode . dired-omit-mode)
   :config
   (setq dired-omit-verbose nil)

modules/emacs/vc/config.el

@@ -44,7 +44,7 @@
 
 
 ;;;###package git-commit
-(def-package! git-commit
+(use-package! git-commit
   :after-call after-find-file
   :config
   (global-git-commit-mode +1)

modules/email/mu4e/config.el

@@ -10,7 +10,7 @@
 (add-to-list 'auto-mode-alist '("\\.\\(?:offlineimap\\|mbsync\\)rc\\'" . conf-mode))
 
 
-(def-package! mu4e
+(use-package! mu4e
   :commands mu4e mu4e-compose-new
   :init
   (provide 'html2text) ; disable obsolete package
@@ -110,14 +110,14 @@
     'normal))
 
 
-(def-package! mu4e-maildirs-extension
+(use-package! mu4e-maildirs-extension
   :after mu4e
   :config
   (mu4e-maildirs-extension)
   (setq mu4e-maildirs-extension-title nil))
 
 
-(def-package! org-mu4e
+(use-package! org-mu4e
   :hook (mu4e-compose-mode . org-mu4e-compose-org-mode)
   :config
   (setq org-mu4e-link-query-in-headers-mode nil

modules/email/notmuch/config.el

@@ -51,17 +51,17 @@
     #'hide-mode-line-mode))
 
 
-(def-package! org-mime
+(use-package! org-mime
   :after (org notmuch)
   :config (setq org-mime-library 'mml))
 
 
-(def-package! counsel-notmuch
+(use-package! counsel-notmuch
   :when (featurep! :completion ivy)
   :commands counsel-notmuch
   :after notmuch)
 
-(def-package! helm-notmuch
+(use-package! helm-notmuch
   :when (featurep! :completion helm)
   :commands helm-notmuch
   :after notmuch)

modules/email/wanderlust/config.el

@@ -1,6 +1,6 @@
 ;;; app/wanderlust/config.el -*- lexical-binding: t; -*-
 
-(def-package! wl
+(use-package! wl
   :defer t
   :config
   (setq mail-user-agent 'wl-user-agent

modules/input/chinese/config.el

@@ -1,6 +1,6 @@
 ;;; input/chinese/config.el -*- lexical-binding: t; -*-
 
-(def-package! pyim
+(use-package! pyim
   :after-call after-find-file pre-command-hook
   :config
   (setq pyim-dcache-directory (concat doom-cache-dir "pyim/")
@@ -8,21 +8,21 @@
         default-input-method "pyim"))
 
 
-(def-package! pangu-spacing
+(use-package! pangu-spacing
   :hook (text-mode . pangu-spacing-mode)
   :config
   ;; Always insert `real' space in org-mode.
   (setq-hook! 'org-mode-hook pangu-spacing-real-insert-separtor t))
 
 
-(def-package! fcitx
+(use-package! fcitx
   :after evil
   :config
   (when (executable-find "fcitx-remote")
     (fcitx-evil-turn-on)))
 
 
-(def-package! ace-pinyin
+(use-package! ace-pinyin
   :after avy
   :init (setq ace-pinyin-use-avy t)
   :config (ace-pinyin-global-mode t))

modules/input/japanese/config.el

@@ -1,6 +1,6 @@
 ;;; input/japanese/config.el -*- lexical-binding: t; -*-
 
-(def-package! migemo
+(use-package! migemo
   :after-call after-find-file pre-command-hook
   :init
   (setq search-default-regexp-mode nil
@@ -14,7 +14,7 @@
   (when (executable-find migemo-command)
     (migemo-init)
 
-    (def-package! avy-migemo
+    (use-package! avy-migemo
       :after avy
       :config (avy-migemo-mode 1))
 
@@ -34,7 +34,7 @@
         pangu-spacing-real-insert-separtor t))
 
 
-(def-package! ddskk
+(use-package! ddskk
   :general ("C-x j" #'skk-mode))
 
 

modules/lang/agda/config.el

@@ -4,11 +4,11 @@
   (when (executable-find "agda-mode")
     (file-name-directory (shell-command-to-string "agda-mode locate"))))
 
-(def-package! agda2
+(use-package! agda2
   :when +agda-dir
   :load-path +agda-dir)
 
-(def-package! agda2-mode
+(use-package! agda2-mode
   :defer t
   :config
   (map! :map agda2-mode-map

modules/lang/cc/config.el

@@ -32,7 +32,7 @@ This is ignored by ccls.")
 ;;
 ;; Packages
 
-(def-package! cc-mode
+(use-package! cc-mode
   :commands (c-mode c++-mode objc-mode java-mode)
   :mode ("\\.mm\\'" . objc-mode)
   :init
@@ -115,11 +115,11 @@ This is ignored by ccls.")
              (label . 0)))))
 
 
-(def-package! modern-cpp-font-lock
+(use-package! modern-cpp-font-lock
   :hook (c++-mode . modern-c++-font-lock-mode))
 
 
-(def-package! irony
+(use-package! irony
   :unless (featurep! +lsp)
   :commands (irony-install-server irony-mode)
   :preface
@@ -137,14 +137,14 @@ This is ignored by ccls.")
   ;; `+cc-default-compiler-options'.
   (add-hook 'irony-mode-hook #'+cc-init-irony-compile-options-h)
 
-  (def-package! irony-eldoc
+  (use-package! irony-eldoc
     :hook (irony-mode . irony-eldoc))
 
-  (def-package! flycheck-irony
+  (use-package! flycheck-irony
     :when (featurep! :tools flycheck)
     :config (flycheck-irony-setup))
 
-  (def-package! company-irony
+  (use-package! company-irony
     :when (featurep! :completion company)
     :init
     (set-company-backend! 'irony-mode
@@ -156,17 +156,17 @@ This is ignored by ccls.")
 ;;
 ;; Major modes
 
-(def-package! company-cmake  ; for `cmake-mode'
+(use-package! company-cmake  ; for `cmake-mode'
   :when (featurep! :completion company)
   :after cmake-mode
   :config (set-company-backend! 'cmake-mode 'company-cmake))
 
 
-(def-package! demangle-mode
+(use-package! demangle-mode
   :hook llvm-mode)
 
 
-(def-package! company-glsl  ; for `glsl-mode'
+(use-package! company-glsl  ; for `glsl-mode'
   :when (featurep! :completion company)
   :after glsl-mode
   :config (set-company-backend! 'glsl-mode 'company-glsl))
@@ -175,7 +175,7 @@ This is ignored by ccls.")
 ;;
 ;; Rtags Support
 
-(def-package! rtags
+(use-package! rtags
   :unless (featurep! +lsp)
   :commands rtags-executable-find
   :preface
@@ -222,7 +222,7 @@ This is ignored by ccls.")
 ;;
 ;; LSP
 
-(def-package! ccls
+(use-package! ccls
   :when (featurep! +lsp)
   :hook ((c-mode-local-vars c++-mode-local-vars objc-mode-local-vars) . +cc|init-ccls)
   :init

modules/lang/clojure/config.el

@@ -4,7 +4,7 @@
 (add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
 
 
-(def-package! cider
+(use-package! cider
   ;; NOTE: if you don't have an org directory set (the dir doesn't exist),
   ;; cider jack in won't work.
   :commands (cider-jack-in cider-jack-in-clojurescript)
@@ -118,7 +118,7 @@
           :i "U"  #'cider-repl-history-undo-other-window)))
 
 
-(def-package! clj-refactor
+(use-package! clj-refactor
   :hook (clojure-mode . clj-refactor-mode)
   :init
   (set-lookup-handlers! 'clj-refactor-mode
@@ -129,6 +129,6 @@
         :desc "refactor" "R" #'hydra-cljr-help-menu/body))
 
 
-(def-package! flycheck-joker
+(use-package! flycheck-joker
   :when (featurep! :tools flycheck)
   :after flycheck)

modules/lang/common-lisp/config.el

@@ -239,7 +239,7 @@ bin/doom while packages at compile-time (not a runtime though)."
       "q" 'quit-window
       "r" 'sly-xref-retract)))
 
-(def-package! sly-repl-ansi-color
+(use-package! sly-repl-ansi-color
   :defer t
   :init
   (add-to-list 'sly-contribs 'sly-repl-ansi-color nil #'eq))

modules/lang/crystal/config.el

@@ -12,10 +12,10 @@
     (add-to-list 'dtrt-indent-hook-mapping-list '(crystal-mode ruby crystal-indent-level))))
 
 
-(def-package! flycheck-crystal
+(use-package! flycheck-crystal
   :when (featurep! :tools flycheck)
   :after crystal-mode)
 
 
-(def-package! inf-crystal
+(use-package! inf-crystal
   :commands crystal-switch-to-inf)

modules/lang/csharp/config.el

@@ -12,7 +12,7 @@
                  :post-handlers '(("| " "SPC"))))
 
 
-(def-package! omnisharp
+(use-package! omnisharp
   :hook (csharp-mode . omnisharp-mode)
   :commands omnisharp-install-server
   :preface

modules/lang/data/config.el

@@ -4,7 +4,7 @@
 (add-to-list 'auto-mode-alist '("/sxhkdrc\\'" . conf-mode))
 (add-to-list 'auto-mode-alist '("\\.\\(?:hex\\|nes\\)\\'" . hexl-mode))
 
-(def-package! nxml-mode
+(use-package! nxml-mode
   :mode "\\.p\\(?:list\\|om\\)\\'" ; plist, pom
   :mode "\\.xs\\(?:d\\|lt\\)\\'"   ; xslt, xsd
   :mode "\\.rss\\'"
@@ -29,10 +29,10 @@
       "k" #'csv-kill-fields
       "t" #'csv-transpose)
 
-(def-package! graphql-mode
+(use-package! graphql-mode
   :mode "\\.gql\\'")
 
-(def-package! json-mode
+(use-package! json-mode
   :mode "\\.js\\(?:on\\|[hl]int\\(?:rc\\)?\\)\\'"
   :config
   (set-electric! 'json-mode :chars '(?\n ?: ?{ ?})))

modules/lang/elixir/config.el

@@ -1,6 +1,6 @@
 ;;; lang/elixir/config.el -*- lexical-binding: t; -*-
 
-(def-package! elixir-mode
+(use-package! elixir-mode
   :defer t
   :init
   ;; Disable default smartparens config. There are too many pairs; we only want
@@ -29,7 +29,7 @@
     (sp-local-pair "do " " end" :unless '(sp-in-comment-p sp-in-string-p))
     (sp-local-pair "fn " " end" :unless '(sp-in-comment-p sp-in-string-p)))
 
-  (def-package! alchemist-company
+  (use-package! alchemist-company
     :when (featurep! :completion company)
     :commands alchemist-company
     :init
@@ -41,12 +41,12 @@
       (remove-hook 'alchemist-mode-hook fn)
       (remove-hook 'alchemist-iex-mode-hook fn)))
 
-  (def-package! flycheck-credo
+  (use-package! flycheck-credo
     :when (featurep! :tools flycheck)
     :config (flycheck-credo-setup)))
 
 
-(def-package! alchemist
+(use-package! alchemist
   :hook (elixir-mode . alchemist-mode)
   :config
   (set-lookup-handlers! 'elixir-mode

modules/lang/elm/config.el

@@ -19,7 +19,7 @@
     :and "&&" :or "||"))
 
 
-(def-package! flycheck-elm
+(use-package! flycheck-elm
   :when (featurep! :tools flycheck)
   :after elm-mode
   :config (add-to-list 'flycheck-checkers 'elm nil #'eq))

modules/lang/emacs-lisp/config.el

@@ -16,7 +16,7 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")
 ;;
 ;;; Config
 
-(def-package! elisp-mode
+(use-package! elisp-mode
   :mode ("\\.Cask\\'" . emacs-lisp-mode)
   :config
   (set-repl-handler! 'emacs-lisp-mode #'+emacs-lisp/open-repl)
@@ -100,7 +100,7 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")
 (remove-hook 'emacs-lisp-mode-hook 'overseer-enable-mode)
 
 
-(def-package! flycheck-cask
+(use-package! flycheck-cask
   :when (featurep! :tools flycheck)
   :defer t
   :init
@@ -108,7 +108,7 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")
     (add-hook 'flycheck-mode-hook #'flycheck-cask-setup nil t)))
 
 
-(def-package! elisp-demos
+(use-package! elisp-demos
   :defer t
   :init
   (advice-add 'describe-function-1 :after #'elisp-demos-advice-describe-function-1)
@@ -122,7 +122,7 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")
           (funcall orig-fn symbol)))))
 
 
-(def-package! buttercup
+(use-package! buttercup
   :defer t
   :minor ("/test[/-].+\\.el$" . buttercup-minor-mode)
   :config (set-yas-minor-mode! 'buttercup-minor-mode))

modules/lang/erlang/config.el

@@ -1,18 +1,18 @@
 ;;; lang/erlang/config.el -*- lexical-binding: t; -*-
 
-(def-package! erlang
+(use-package! erlang
   :mode ("\\.erlang$" . erlang-mode)
   :mode ("/rebar\\.config\\(?:\\.script\\)?$" . erlang-mode)
   :mode ("/\\(?:app\\|sys\\)\\.config$" . erlang-mode))
 
 
-(def-package! flycheck-rebar3
+(use-package! flycheck-rebar3
   :when (featurep! :tools flycheck)
   :after flycheck
   :config (flycheck-rebar3-setup))
 
 
-(def-package! ivy-erlang-complete
+(use-package! ivy-erlang-complete
   :when (featurep! :completion ivy)
   :hook (erlang-mode . ivy-erlang-complete-init)
   :config
@@ -20,6 +20,6 @@
     (add-hook 'after-save-hook #'ivy-erlang-complete-reparse nil t)))
 
 
-(def-package! company-erlang
+(use-package! company-erlang
   :when (featurep! :completion company)
   :hook (erlang-mode . company-erlang-init))

modules/lang/ess/config.el

@@ -1,6 +1,6 @@
 ;;; lang/ess/config.el -*- lexical-binding: t; -*-
 
-(def-package! ess
+(use-package! ess
   :commands (stata SAS)
   :init
   (setq ess-smart-S-assign-key nil)

modules/lang/go/config.el

@@ -53,11 +53,11 @@
           "n" #'+go/test-nested)))
 
 
-(def-package! gorepl-mode
+(use-package! gorepl-mode
   :commands gorepl-run-load-current-file)
 
 
-(def-package! company-go
+(use-package! company-go
   :when (and (featurep! :completion company)
              (not (featurep! +lsp)))
   :after go-mode

modules/lang/haskell/+dante.el

@@ -1,7 +1,7 @@
 ;;; lang/haskell/+dante.el -*- lexical-binding: t; -*-
 ;;;###if (featurep! +dante)
 
-(def-package! dante
+(use-package! dante
   :hook (haskell-mode-local-vars . dante-mode)
   :init
   (setq dante-load-flags '(;; defaults:

modules/lang/haskell/+intero.el

@@ -1,7 +1,7 @@
 ;;; lang/haskell/+intero.el -*- lexical-binding: t; -*-
 ;;;###if (featurep! +intero)
 
-(def-package! intero
+(use-package! intero
   :commands intero-mode
   :init
   (defun +haskell|init-intero ()

modules/lang/haskell/+lsp.el

@@ -1,6 +1,6 @@
 ;;; lang/haskell/+lsp.el -*- lexical-binding: t; -*-
 
-(def-package! lsp-haskell
+(use-package! lsp-haskell
   :after haskell-mode
   :init (add-hook 'haskell-mode-hook #'lsp!)
   :config

modules/lang/hy/config.el

@@ -1,6 +1,6 @@
 ;;; lang/hy/config.el -*- lexical-binding: t; -*-
 
-(def-package! hy-mode
+(use-package! hy-mode
   :mode "\\.hy\\'"
   :interpreter "hy"
   :config

modules/lang/java/+eclim.el

@@ -3,7 +3,7 @@
 
 ;; NOTE This submodule is incomplete
 
-(def-package! eclim
+(use-package! eclim
   :hook (java-mode . eclim-mode)
   :config
   (set-lookup-handlers! 'java-mode
@@ -43,7 +43,7 @@
           "u"  #'eclim-project-update)))
 
 
-(def-package! company-emacs-eclim
+(use-package! company-emacs-eclim
   :when (featurep! :completion company)
   :after java-mode
   :config

modules/lang/java/+lsp.el

@@ -1,7 +1,7 @@
 ;;; lang/java/+lsp.el -*- lexical-binding: t; -*-
 ;;;###if (featurep! +lsp)
 
-(def-package! lsp-java
+(use-package! lsp-java
   :after-call java-mode
   :init (add-hook 'java-mode-local-vars-hook #'lsp!)
   :config

modules/lang/java/+meghanada.el

@@ -1,7 +1,7 @@
 ;;; lang/java/+meghanada.el -*- lexical-binding: t; -*-
 ;;;###if (featurep! +meghanada)
 
-(def-package! meghanada
+(use-package! meghanada
   :hook (java-mode . meghanada-mode)
   :init
   (setq meghanada-server-install-dir (concat doom-etc-dir "meghanada-server/")

modules/lang/java/config.el

@@ -30,7 +30,7 @@ If the depth is 2, the first two directories are removed: net.lissner.game.")
 ;;
 ;; Common packages
 
-(def-package! android-mode
+(use-package! android-mode
   :commands android-mode
   :init
   (add-hook! (java-mode groovy-mode nxml-mode) #'+java|android-mode-maybe)
@@ -38,7 +38,7 @@ If the depth is 2, the first two directories are removed: net.lissner.game.")
   (set-yas-minor-mode! 'android-mode))
 
 
-(def-package! groovy-mode
+(use-package! groovy-mode
   :mode "\\.g\\(?:radle\\|roovy\\)$"
   :config
   (set-eval-handler! 'groovy-mode "groovy"))

modules/lang/javascript/config.el

@@ -31,7 +31,7 @@
 ;;
 ;; Major modes
 
-(def-package! js2-mode
+(use-package! js2-mode
   :mode "\\.m?js\\'"
   :interpreter "node"
   :commands js2-line-break
@@ -64,7 +64,7 @@
         "S" #'+javascript/skewer-this-buffer))
 
 
-(def-package! rjsx-mode
+(use-package! rjsx-mode
   :mode "components/.+\\.js$"
   :init
   (defun +javascript-jsx-file-p ()
@@ -156,7 +156,7 @@ to tide."
 (add-hook! (js-mode typescript-mode web-mode) #'+javascript|init-lsp-or-tide-maybe)
 
 
-(def-package! tide
+(use-package! tide
   :defer t
   :config
   (setq tide-completion-detailed t
@@ -187,7 +187,7 @@ to tide."
         "roi" #'tide-organize-imports))
 
 
-(def-package! xref-js2
+(use-package! xref-js2
   :when (featurep! :tools lookup)
   :after (:or js2-mode rjsx-mode)
   :config
@@ -195,7 +195,7 @@ to tide."
     :xref-backend #'xref-js2-xref-backend))
 
 
-(def-package! js2-refactor
+(use-package! js2-refactor
   :hook ((js2-mode rjsx-mode) . js2-refactor-mode)
   :config
   (when (featurep! :editor evil +everywhere)
@@ -203,7 +203,7 @@ to tide."
       (js2r-add-keybindings-with-prefix (format "%s r" doom-localleader-key)))))
 
 
-(def-package! eslintd-fix
+(use-package! eslintd-fix
   :commands eslintd-fix
   :config
   (defun +javascript|set-flycheck-executable-to-eslint ()

modules/lang/kotlin/config.el

@@ -10,7 +10,7 @@
         :desc "gradlew build"    "b" (λ! (+kotlin/run-gradlew "build"))
         :desc "gradlew test"     "t" (λ! (+kotlin/run-gradlew "test"))))
 
-(def-package! flycheck-kotlin
+(use-package! flycheck-kotlin
   :when (featurep! :tools flycheck)
   :after kotlin-mode
   :config (add-hook 'kotlin-mode-hook #'flycheck-kotlin-setup))

modules/lang/latex/+ref.el

@@ -5,7 +5,7 @@
         reftex-default-bibliography bibtex-completion-bibliography))
 
 
-(def-package! reftex
+(use-package! reftex
   :hook (LaTeX-mode . reftex-mode)
   :config
   ;; set up completion for citations and references

modules/lang/latex/config.el

@@ -96,7 +96,7 @@ If no viewers are found, `latex-preview-pane' is used.")
     (add-to-list 'LaTeX-indent-environment-list `(,env +latex/LaTeX-indent-item))))
 
 
-(def-package! preview
+(use-package! preview
   :hook (LaTeX-mode . LaTeX-preview-setup)
   :config
   (setq-default preview-scale 1.4
@@ -105,12 +105,12 @@ If no viewers are found, `latex-preview-pane' is used.")
 
 
 ;; Nicely indent lines that have wrapped when visual line mode is activated
-(def-package! adaptive-wrap
+(use-package! adaptive-wrap
   :hook (LaTeX-mode . adaptive-wrap-prefix-mode)
   :init (setq-default adaptive-wrap-extra-indent 0))
 
 
-(def-package! auctex-latexmk
+(use-package! auctex-latexmk
   :when (featurep! +latexmk)
   :after latex
   :init
@@ -123,14 +123,14 @@ If no viewers are found, `latex-preview-pane' is used.")
   (auctex-latexmk-setup))
 
 
-(def-package! company-auctex
+(use-package! company-auctex
   :when (featurep! :completion company)
   :defer t
   :init
   (add-to-list '+latex--company-backends #'company-auctex-environments nil #'eq)
   (add-to-list '+latex--company-backends #'company-auctex-macros nil #'eq))
 
-(def-package! company-math
+(use-package! company-math
   :when (featurep! :completion company)
   :defer t
   :init

modules/lang/ledger/config.el

@@ -20,12 +20,12 @@
       [tab] #'ledger-reconcile-toggle)
 
 
-(def-package! flycheck-ledger
+(use-package! flycheck-ledger
   :when (featurep! :tools flycheck)
   :after ledger-mode)
 
 
-(def-package! evil-ledger
+(use-package! evil-ledger
   :when (featurep! :editor evil +everywhere)
   :hook (ledger-mode . evil-ledger-mode)
   :config

modules/lang/lua/config.el

@@ -7,7 +7,7 @@
 ;;
 ;; Major modes
 
-(def-package! lua-mode
+(use-package! lua-mode
   :defer t
   :init
   ;; lua-indent-level defaults to 3 otherwise. Madness.
@@ -19,7 +19,7 @@
   (set-company-backend! 'lua-mode '(company-lua company-yasnippet)))
 
 
-(def-package! moonscript
+(use-package! moonscript
   :when (featurep! +moonscript)
   :defer t
   :config

modules/lang/markdown/config.el

@@ -15,7 +15,7 @@ capture, the end position, and the output buffer.")
 ;;
 ;;; Packages
 
-(def-package! markdown-mode
+(use-package! markdown-mode
   :mode ("/README\\(?:\\.\\(?:markdown\\|md\\)\\)?\\'" . gfm-mode)
   :init
   (setq markdown-enable-wiki-links t

modules/lang/nim/config.el

@@ -36,7 +36,7 @@ windows."
         "b" #'nim-compile))
 
 
-(def-package! flycheck-nim
+(use-package! flycheck-nim
   :when (featurep! :tools flycheck)
   :after nim-mode)
 

modules/lang/nix/config.el

@@ -1,6 +1,6 @@
 ;;; lang/nix/config.el -*- lexical-binding: t; -*-
 
-(def-package! nix-mode
+(use-package! nix-mode
   :mode "\\.nix\\'"
   :config
   (set-company-backend! 'nix-mode 'company-nixos-options)
@@ -16,11 +16,11 @@
         (:when (featurep! :completion helm)
           "o" #'helm-nixos-options)))
 
-(def-package! nix-drv-mode
+(use-package! nix-drv-mode
   :mode "\\.drv\\'")
 
-(def-package! nix-update
+(use-package! nix-update
   :commands nix-update-fetch)
 
-(def-package! nix-repl
+(use-package! nix-repl
   :commands nix-repl-show)

modules/lang/ocaml/config.el

@@ -26,7 +26,7 @@
     comment-line-break-function #'+ocaml/comment-indent-new-line)
 
 
-  (def-package! utop
+  (use-package! utop
     :when (featurep! :tools eval)
     :hook (tuareg-mode . +ocaml|init-utop)
     :init
@@ -37,7 +37,7 @@
         (utop-minor-mode)))))
 
 
-(def-package! merlin
+(use-package! merlin
   :unless (featurep! +lsp)
   :hook (tuareg-mode . +ocaml|init-merlin)
   :init
@@ -60,7 +60,7 @@
         "t" #'merlin-type-enclosing
         "a" #'tuareg-find-alternate-file)
 
-  (def-package! flycheck-ocaml
+  (use-package! flycheck-ocaml
     :when (featurep! :tools flycheck)
     :hook (merlin-mode . +ocaml|init-flycheck)
     :config
@@ -72,22 +72,22 @@
         ;; Enable Flycheck checker
         (flycheck-ocaml-setup))))
 
-  (def-package! merlin-eldoc
+  (use-package! merlin-eldoc
     :hook (merlin-mode . merlin-eldoc-setup))
 
-  (def-package! merlin-iedit
+  (use-package! merlin-iedit
     :when (featurep! :editor multiple-cursors)
     :defer t
     :init
     (map! :map tuareg-mode-map
           :v "R" #'merlin-iedit-occurrences))
 
-  (def-package! merlin-imenu
+  (use-package! merlin-imenu
     :when (featurep! :emacs imenu)
     :hook (merlin-mode . merlin-use-merlin-imenu)))
 
 
-(def-package! ocp-indent
+(use-package! ocp-indent
   ;; must be careful to always defer this, it has autoloads that adds hooks
   ;; which we do not want if the executable can't be found
   :hook (tuareg-mode . +ocaml|init-ocp-indent)
@@ -98,7 +98,7 @@
       (ocp-setup-indent))))
 
 
-(def-package! ocamlformat
+(use-package! ocamlformat
   :when (featurep! :editor format)
   :commands ocamlformat
   :hook (tuareg-mode . +ocaml|init-ocamlformat)

modules/lang/org/config.el

@@ -377,14 +377,14 @@ file isn't in `org-directory'."
   (org-link-set-parameters "img"   :image-data-fun #'+org-inline-data-image)
 
   ;; Add support for youtube links + previews
-  (def-package! org-yt))
+  (use-package! org-yt))
 
 
 (defun +org-init-export-h ()
   (when (featurep! :lang markdown)
     (add-to-list 'org-export-backends 'md))
 
-  (def-package! ox-pandoc
+  (use-package! ox-pandoc
     :when (and (featurep! +pandoc)
                (executable-find "pandoc"))
     :after ox
@@ -598,7 +598,7 @@ between the two."
 (defun +org-init-keybinds-for-evil-h (&rest args)
   "TODO"
   (when (featurep! :editor evil +everywhere)
-    (def-package! evil-org
+    (use-package! evil-org
       :hook (org-mode . evil-org-mode)
       :init
       (defvar evil-org-key-theme '(navigation insert textobjects))
@@ -609,7 +609,7 @@ between the two."
       ;; change `evil-org-key-theme' instead
       (advice-add #'evil-org-set-key-theme :override #'ignore))
 
-    (def-package! evil-org-agenda
+    (use-package! evil-org-agenda
       :after org-agenda
       :config (evil-org-agenda-set-keys))
 
@@ -777,7 +777,7 @@ compelling reason, so..."
 ;;
 ;;; Bootstrap
 
-(def-package! org
+(use-package! org
   :defer-incrementally
   calendar find-func format-spec org-macs org-compat org-faces org-entities
   org-list org-pcomplete org-src org-footnote org-macro ob org org-agenda
@@ -859,7 +859,7 @@ compelling reason, so..."
         (when (re-search-forward toc-org-toc-org-regexp (point-max) t)
           (+org/open-fold)))))
 
-  (def-package! org-pdfview
+  (use-package! org-pdfview
     :when (featurep! :tools pdf)
     :commands (org-pdfview-open)
     :init
@@ -869,7 +869,7 @@ compelling reason, so..."
     ;; support for links to specific pages
     (add-to-list 'org-file-apps '("\\.pdf::\\([[:digit:]]+\\)\\'" . (lambda (_file link) (org-pdfview-open link)))))
 
-  (def-package! org-crypt ; built-in
+  (use-package! org-crypt ; built-in
     :commands org-encrypt-entries
     :hook (org-reveal-start . org-decrypt-entry)
     :init
@@ -878,7 +878,7 @@ compelling reason, so..."
     (add-to-list 'org-tags-exclude-from-inheritance "crypt")
     (setq org-crypt-key user-mail-address))
 
-  (def-package! org-clock ; built-in
+  (use-package! org-clock ; built-in
     :commands org-clock-save
     :init
     (setq org-clock-persist t)

modules/lang/org/contrib/dragndrop.el

@@ -1,7 +1,7 @@
 ;;; lang/org/contrib/dragndrop.el -*- lexical-binding: t; -*-
 ;;;###if (featurep! +dragndrop)
 
-(def-package! org-download
+(use-package! org-download
   :commands (org-download-dnd org-download-dnd-base64)
   :init
   ;; HACK We add these manually so that org-download is truly lazy-loaded

modules/lang/org/contrib/ipython.el

@@ -1,7 +1,7 @@
 ;;; lang/org/contrib/babel.el -*- lexical-binding: t; -*-
 ;;;###if (featurep! +ipython)
 
-(def-package! ob-ipython
+(use-package! ob-ipython
   :defer t
   :init
   (defvar +ob-ipython-local-runtime-dir nil)

modules/lang/org/contrib/present.el

@@ -11,7 +11,7 @@
 ;;
 ;;; Packages
 
-(def-package! ox-reveal
+(use-package! ox-reveal
   :after ox
   :init
   ;; Fix #1127, where ox-reveal adds an errant entry to
@@ -22,7 +22,7 @@
         org-reveal-mathjax t))
 
 
-(def-package! org-tree-slide
+(use-package! org-tree-slide
   :commands org-tree-slide-mode
   :config
   (org-tree-slide-simple-profile)

modules/lang/perl/config.el

@@ -2,9 +2,9 @@
 
 ;; There's also `perl-mode' for perl < 6, which is already set up.
 
-(def-package! perl6-detect)
+(use-package! perl6-detect)
 
 
-(def-package! flycheck-perl6
+(use-package! flycheck-perl6
   :when (featurep! :tools flycheck)
   :after perl6-mode)

modules/lang/php/config.el

@@ -1,6 +1,6 @@
 ;;; lang/php/config.el -*- lexical-binding: t; -*-
 
-(def-package! php-mode
+(use-package! php-mode
   :mode "\\.inc\\'"
   :config
   ;; Disable HTML compatibility in php-mode. `web-mode' has superior support for
@@ -33,7 +33,7 @@
         "s" #'phpunit-current-test))
 
 
-(def-package! phpactor
+(use-package! phpactor
   :unless (featurep! +lsp)
   :after php-mode
   :config
@@ -50,7 +50,7 @@
         "ic" #'phpactor-import-class))
 
 
-(def-package! php-refactor-mode
+(use-package! php-refactor-mode
   :hook php-mode
   :config
   (map! :localleader
@@ -62,7 +62,7 @@
         "rv" #'php-refactor--rename-local-variable))
 
 
-(def-package! php-extras
+(use-package! php-extras
   :after php-mode
   :preface
   ;; We'll set up company support ourselves
@@ -87,7 +87,7 @@
                    (message "PHP eldoc updated!")))))
 
 
-(def-package! hack-mode
+(use-package! hack-mode
   :when (featurep! +hack)
   :mode "\\.hh$")
 

modules/lang/plantuml/config.el

@@ -1,6 +1,6 @@
 ;;; lang/plantuml/config.el -*- lexical-binding: t; -*-
 
-(def-package! plantuml-mode
+(use-package! plantuml-mode
   :defer t
   :init
   (setq plantuml-jar-path (concat doom-etc-dir "plantuml.jar")
@@ -9,7 +9,7 @@
   (set-popup-rule! "^\\*PLANTUML" :size 0.4 :select nil :ttl 0))
 
 
-(def-package! flycheck-plantuml
+(use-package! flycheck-plantuml
   :when (featurep! :tools flycheck)
   :after plantuml-mode
   :config (flycheck-plantuml-setup))

modules/lang/purescript/config.el

@@ -9,13 +9,13 @@
     :documentation #'purescript-pursuit))
 
 
-;; (def-package! flycheck-purescript
+;; (use-package! flycheck-purescript
 ;;   :after purescript-mode
 ;;   :config
 ;;   (add-hook 'flycheck-mode-hook #'flycheck-purescript-setup))
 
 
-(def-package! psc-ide
+(use-package! psc-ide
   :hook (purescript-mode . psc-ide-mode)
   :config
   (remove-hook 'company-backends 'company-psc-ide-backend)

modules/lang/python/config.el

@@ -12,7 +12,7 @@ called.")
 ;;
 ;; Packages
 
-(def-package! python
+(use-package! python
   :defer t
   :init
   (setq python-environment-directory doom-cache-dir
@@ -83,7 +83,7 @@ called.")
   (setq-hook! 'python-mode-hook tab-width python-indent-offset))
 
 
-(def-package! anaconda-mode
+(use-package! anaconda-mode
   :hook (python-mode-local-vars . +python|init-anaconda-mode-maybe)
   :init
   (setq anaconda-mode-installation-directory (concat doom-etc-dir "anaconda/")
@@ -122,7 +122,7 @@ called.")
         "u" #'anaconda-mode-find-references))
 
 
-(def-package! pyimport
+(use-package! pyimport
   :after python
   :config
   (map! :map python-mode-map
@@ -133,7 +133,7 @@ called.")
           :desc "Unused imports" "r" #'pyimport-remove-unused)))
 
 
-(def-package! nose
+(use-package! nose
   :commands nose-mode
   :preface (defvar nose-mode-map (make-sparse-keymap))
   :minor ("/test_.+\\.py$" . nose-mode)
@@ -155,7 +155,7 @@ called.")
         "V" #'nosetests-pdb-module))
 
 
-(def-package! python-pytest
+(use-package! python-pytest
   :defer t
   :init
   (map! :after python
@@ -173,7 +173,7 @@ called.")
 ;;
 ;; Environment management
 
-(def-package! pipenv
+(use-package! pipenv
   :commands pipenv-project-p
   :hook (python-mode . pipenv-mode)
   :init (setq pipenv-with-projectile nil)
@@ -188,7 +188,7 @@ called.")
       (:description . "Run Python script"))))
 
 
-(def-package! pyvenv
+(use-package! pyvenv
   :after python
   :init
   (when (featurep! :ui modeline)
@@ -201,7 +201,7 @@ called.")
                'append))
 
 
-(def-package! pyenv-mode
+(use-package! pyenv-mode
   :when (featurep! +pyenv)
   :after python
   :config
@@ -210,7 +210,7 @@ called.")
     (add-to-list 'exec-path (expand-file-name "shims" (or (getenv "PYENV_ROOT") "~/.pyenv")))))
 
 
-(def-package! conda
+(use-package! conda
   :when (featurep! +conda)
   :after python
   :config

modules/lang/racket/config.el

@@ -1,6 +1,6 @@
 ;;; lang/racket/config.el -*- lexical-binding: t; -*-
 
-(def-package! racket-mode
+(use-package! racket-mode
   :hook (racket-repl-mode . racket-unicode-input-method-enable)
   :config
   (set-popup-rule! "^\\*Racket REPL" :size 10 :select t)

modules/lang/rest/config.el

@@ -1,6 +1,6 @@
 ;;; lang/rest/config.el -*- lexical-binding: t; -*-
 
-(def-package! restclient
+(use-package! restclient
   :mode ("\\.http\\'" . restclient-mode)
   :config
   (set-popup-rule! "^\\*HTTP Response" :size 0.4 :quit 'other)
@@ -30,7 +30,7 @@
         "c" #'restclient-copy-curl-command))
 
 
-(def-package! company-restclient
+(use-package! company-restclient
   :when (featurep! :completion company)
   :after restclient
   :config (set-company-backend! 'restclient-mode 'company-restclient))

modules/lang/ruby/config.el

@@ -3,7 +3,7 @@
 ;;
 ;; Packages
 
-(def-package! enh-ruby-mode
+(use-package! enh-ruby-mode
   :mode ("\\.\\(?:pry\\|irb\\)rc\\'" . +ruby|init)
   :mode ("\\.\\(?:rb\\|rake\\|rabl\\|ru\\|builder\\|gemspec\\|jbuilder\\|thor\\)\\'" .  +ruby|init)
   :mode ("/\\(?:Berks\\|Cap\\|Gem\\|Guard\\|Pod\\|Puppet\\|Rake\\|Thor\\|Vagrant\\)file\\'" .  +ruby|init)
@@ -30,7 +30,7 @@
   (setq-hook! (ruby-mode enh-ruby-mode) sp-max-pair-length 6))
 
 
-(def-package! robe
+(use-package! robe
   :defer t
   :init
   (defun +ruby|init-robe-mode-maybe ()
@@ -60,11 +60,11 @@
 
 
 ;; NOTE Must be loaded before `robe-mode'
-(def-package! yard-mode
+(use-package! yard-mode
   :hook (ruby-mode enh-ruby-mode))
 
 
-(def-package! rubocop
+(use-package! rubocop
   :hook (enh-ruby-mode . rubocop-mode)
   :config
   (map! :localleader
@@ -78,7 +78,7 @@
 ;;
 ;; Package & Ruby version management
 
-(def-package! rake
+(use-package! rake
   :defer t
   :init
   (setq rake-cache-file (concat doom-cache-dir "rake.cache"))
@@ -91,7 +91,7 @@
         "R" #'rake-regenerate-cache
         "f" #'rake-find-task))
 
-(def-package! bundler
+(use-package! bundler
   :defer t
   :init
   (map! :after enh-ruby-mode
@@ -113,7 +113,7 @@
 ;;
 ;; Testing frameworks
 
-(def-package! rspec-mode
+(use-package! rspec-mode
   :mode ("/\\.rspec\\'" . text-mode)
   :init
   (when (featurep! :editor evil)
@@ -142,7 +142,7 @@
         "s" #'rspec-dired-verify-single))
 
 
-(def-package! minitest
+(use-package! minitest
   :defer t
   :config
   (when (featurep! :editor evil)

modules/lang/rust/config.el

@@ -1,6 +1,6 @@
 ;;; lang/rust/config.el -*- lexical-binding: t; -*-
 
-(def-package! rust-mode
+(use-package! rust-mode
   :defer t
   :config
   (setq rust-indent-method-chain t)
@@ -32,7 +32,7 @@
                 '(rustic-mode rustic-indent-offset)))))
 
 
-(def-package! racer
+(use-package! racer
   :unless (featurep! +lsp)
   :hook ((rust-mode rustic-mode) . racer-mode)
   :config
@@ -41,7 +41,7 @@
     :documentation '+rust-racer-lookup-documentation))
 
 
-(def-package! rustic
+(use-package! rustic
   :when EMACS26+
   :after rust-mode
   :preface
@@ -64,7 +64,7 @@
 ;;
 ;;; Tools
 
-(def-package! cargo
+(use-package! cargo
   :after rust-mode
   :config
   (defvar +rust-keymap

modules/lang/scala/config.el

@@ -14,7 +14,7 @@
     (add-hook 'scala-mode-local-vars-hook #'lsp!)))
 
 
-(def-package! ensime
+(use-package! ensime
   :unless (featurep! +lsp)
   :defer t
   :config
@@ -31,6 +31,6 @@
   (require 'imenu))
 
 
-(def-package! sbt-mode
+(use-package! sbt-mode
   :after scala-mode
   :config (set-repl-handler! 'scala-mode #'+scala/open-repl))

modules/lang/sh/config.el

@@ -10,7 +10,7 @@
 ;;
 ;; Packages
 
-(def-package! sh-script ; built-in
+(use-package! sh-script ; built-in
   :mode ("\\.zunit\\'" . sh-mode)
   :mode ("/bspwmrc\\'" . sh-mode)
   :mode ("/bin/[^/]+\\'" . sh-mode)
@@ -61,7 +61,7 @@
   (add-hook 'sh-mode-hook #'+sh|detect-zsh))
 
 
-(def-package! company-shell
+(use-package! company-shell
   :when (featurep! :completion company)
   :after sh-script
   :config
@@ -69,7 +69,7 @@
   (setq company-shell-delete-duplicates t))
 
 
-(def-package! fish-mode
+(use-package! fish-mode
   :when (featurep! +fish)
   :defer t
   :config (set-formatter! 'fish-mode #'fish_indent))

modules/lang/solidity/config.el

@@ -7,7 +7,7 @@
 (setq solidity-comment-style 'slash)
 
 
-(def-package! solidity-flycheck  ; included with solidity-mode
+(use-package! solidity-flycheck  ; included with solidity-mode
   :when (featurep! :tools flycheck)
   :after solidity-mode
   :config
@@ -18,7 +18,7 @@
     (add-to-list 'flycheck-checkers 'solium-checker nil #'eq)))
 
 
-(def-package! company-solidity
+(use-package! company-solidity
   :when (featurep! :completion company)
   :after solidity-mode
   :config

modules/lang/swift/config.el

@@ -4,14 +4,14 @@
   (set-repl-handler! 'swift-mode #'run-swift))
 
 
-(def-package! flycheck-swift
+(use-package! flycheck-swift
   :when (and (featurep! :tools flycheck)
              (not (featurep! +lsp)))
   :after swift-mode
   :config (flycheck-swift-setup))
 
 
-(def-package! company-sourcekit
+(use-package! company-sourcekit
   :when (and (featurep! :completion company)
              (not (featurep! +lsp)))
   :after swift-mode
@@ -19,7 +19,7 @@
   (set-company-backend! 'swift-mode '(company-sourcekit company-yasnippet)))
 
 
-(def-package! lsp-sourcekit
+(use-package! lsp-sourcekit
   :when (featurep! +lsp)
   :after swift-mode
   :init (add-hook 'swift-mode-hook #'lsp!))

modules/lang/terra/config.el

@@ -3,7 +3,7 @@
 ;;
 ;; Major modes
 
-(def-package! terra-mode
+(use-package! terra-mode
   :defer t
   :config
   (set-lookup-handlers! 'terra-mode :documentation 'terra-search-documentation)

modules/lang/web/+css.el

@@ -50,7 +50,7 @@
   (add-hook! (css-mode sass-mode less-css-mode) #'lsp!))
 
 
-(def-package! counsel-css
+(use-package! counsel-css
   :when (featurep! :completion ivy)
   :commands counsel-css
   :hook (css-mode . counsel-css-imenu-setup)
@@ -59,7 +59,7 @@
         :localleader ";" #'counsel-css))
 
 
-(def-package! helm-css-scss
+(use-package! helm-css-scss
   :when (featurep! :completion helm)
   :defer t
   :init

modules/lang/web/+html.el

@@ -1,6 +1,6 @@
 ;;; lang/web/+html.el -*- lexical-binding: t; -*-
 
-(def-package! web-mode
+(use-package! web-mode
   :mode "\\.p?html?$"
   :mode "\\.\\(?:tpl\\|blade\\)\\(\\.php\\)?$"
   :mode "\\.erb$"

modules/lang/web/config.el

@@ -4,7 +4,7 @@
 (load! "+css")
 
 
-(def-package! emmet-mode
+(use-package! emmet-mode
   :preface (defvar emmet-mode-keymap (make-sparse-keymap))
   :hook (css-mode web-mode html-mode haml-mode nxml-mode rjsx-mode reason-mode)
   :config

modules/term/eshell/config.el

@@ -152,15 +152,15 @@ You should use `set-eshell-alias!' to change this.")
             [remap evil-window-vsplit]  #'+eshell/split-right))))
 
 
-(def-package! eshell-up
+(use-package! eshell-up
   :commands eshell-up eshell-up-peek)
 
 
-(def-package! shrink-path
+(use-package! shrink-path
   :commands shrink-path-file)
 
 
-(def-package! eshell-z
+(use-package! eshell-z
   :after eshell
   :config
   ;; Use zsh's db if it exists, otherwise, store it in `doom-cache-dir'

modules/term/vterm/config.el

@@ -1,6 +1,6 @@
 ;;; term/vterm/config.el -*- lexical-binding: t; -*-
 
-(def-package! vterm
+(use-package! vterm
   :when (fboundp 'module-load)
   :defer t
   :preface (setq vterm-install t)

modules/tools/ansible/config.el

@@ -1,6 +1,6 @@
 ;;; tools/ansible/config.el -*- lexical-binding: t; -*-
 
-(def-package! ansible
+(use-package! ansible
   :commands ansible-auto-decrypt-encrypt
   :init
   (put 'ansible-vault-password-file 'safe-local-variable #'stringp)
@@ -16,7 +16,7 @@
 (after! ansible-doc
   (set-evil-initial-state! '(ansible-doc-module-mode) 'emacs))
 
-(def-package! jinja2-mode
+(use-package! jinja2-mode
   :mode "\\.j2$")
 
 (def-project-mode! +ansible-yaml-mode

modules/tools/debugger/config.el

@@ -20,7 +20,7 @@
 ;;
 ;;; Packages
 
-(def-package! dap-mode
+(use-package! dap-mode
   :when (featurep! :tools lsp)
   :hook (dap-mode . dap-ui-mode)
   :after lsp-mode
@@ -48,10 +48,10 @@
         (require 'dap-edge)))))
 
 
-(def-package! realgud
+(use-package! realgud
   :defer t
   :init
-  (def-package! realgud-trepan-ni
+  (use-package! realgud-trepan-ni
     :defer t
     :init (add-to-list '+debugger--realgud-alist
                        '(realgud:trepan-ni :modes (javascript-mode js2-mode js3-mode)

modules/tools/direnv/config.el

@@ -7,7 +7,7 @@
     "use" "rvm" "use_nix" "use_guix")
   "TODO")
 
-(def-package! direnv
+(use-package! direnv
   :after-call (after-find-file dired-initial-position-hook)
   :config
   (add-hook 'direnv-mode-hook

modules/tools/editorconfig/config.el

@@ -17,7 +17,7 @@
 
 ;; Handles whitespace (tabs/spaces) settings externally. This way projects can
 ;; specify their own formatting rules.
-(def-package! editorconfig
+(use-package! editorconfig
   :after-call (doom-switch-buffer-hook after-find-file)
   :config
   (def-advice! +editorconfig-smart-detection-a (orig-fn)

modules/tools/flycheck/config.el

@@ -8,7 +8,7 @@ errors.")
 ;;
 ;;; Packages
 
-(def-package! flycheck
+(use-package! flycheck
   :commands flycheck-list-errors flycheck-buffer
   :after-call doom-switch-buffer-hook after-find-file
   :config
@@ -34,7 +34,7 @@ Done to reduce the load flycheck imposes on the current buffer."
   (global-flycheck-mode +1))
 
 
-(def-package! flycheck-popup-tip
+(use-package! flycheck-popup-tip
   :commands flycheck-popup-tip-show-popup flycheck-popup-tip-delete-popup
   :init (add-hook 'flycheck-mode-hook #'+flycheck-init-popups-h)
   :config
@@ -45,7 +45,7 @@ Done to reduce the load flycheck imposes on the current buffer."
     (add-hook 'flycheck-posframe-inhibit-functions #'evil-insert-state-p)))
 
 
-(def-package! flycheck-posframe
+(use-package! flycheck-posframe
   :when EMACS26+
   :when (featurep! +childframe)
   :defer t

modules/tools/flyspell/config.el

@@ -71,7 +71,7 @@ e.g. proselint and langtool."
   (add-hook 'flyspell-mode-hook #'+flyspell-init-predicate-h))
 
 
-(def-package! flyspell-correct
+(use-package! flyspell-correct
   :commands flyspell-correct-word-generic flyspell-correct-previous-word-generic
   :config
   (cond ((and (featurep! :completion helm)

modules/tools/lookup/config.el

@@ -83,7 +83,7 @@ this list.")
 ;;
 ;;; dumb-jump
 
-(def-package! dumb-jump
+(use-package! dumb-jump
   :commands dumb-jump-result-follow
   :config
   (setq dumb-jump-default-project doom-emacs-dir
@@ -116,13 +116,13 @@ this list.")
   ;; Use `better-jumper' instead of xref's marker stack
   (advice-add #'xref-push-marker-stack :around #'doom-set-jump-a)
 
-  (def-package! ivy-xref
+  (use-package! ivy-xref
     :when (featurep! :completion ivy)
     :config
     (setq xref-show-xrefs-function #'ivy-xref-show-xrefs)
     (set-popup-rule! "^\\*xref\\*$" :ignore t))
 
-  (def-package! helm-xref
+  (use-package! helm-xref
     :when (featurep! :completion helm)
     :config (setq xref-show-xrefs-function #'helm-xref-show-xrefs)))
 
@@ -130,7 +130,7 @@ this list.")
 ;;
 ;;; Dash docset integration
 
-(def-package! dash-docs
+(use-package! dash-docs
   :when (featurep! +docsets)
   :init
   (add-hook '+lookup-documentation-functions #'+lookup-dash-docsets-backend-fn)
@@ -154,8 +154,8 @@ See https://github.com/magit/ghub/issues/81"
     (let ((gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3"))
       (funcall orig-fn url)))
 
-  (def-package! helm-dash
+  (use-package! helm-dash
     :when (featurep! :completion helm))
 
-  (def-package! counsel-dash
+  (use-package! counsel-dash
     :when (featurep! :completion ivy)))

modules/tools/lsp/config.el

@@ -21,7 +21,7 @@
   (add-hook! 'kill-emacs-hook (setq lsp-restart 'ignore)))
 
 
-(def-package! lsp-ui
+(use-package! lsp-ui
   :hook (lsp-mode . lsp-ui-mode)
   :init
   (add-hook 'lsp-ui-mode-hook
@@ -54,7 +54,7 @@
     :references 'lsp-ui-peek-find-references))
 
 
-(def-package! company-lsp
+(use-package! company-lsp
   :when (featurep! :completion company)
   :defer t
   :init

modules/tools/magit/config.el

@@ -8,7 +8,7 @@ It is passed a user and repository name.")
 ;;
 ;; Packages
 
-(def-package! magit
+(use-package! magit
   :commands magit-file-delete
   :defer-incrementally (dash f s with-editor git-commit package eieio lv transient)
   :init
@@ -74,7 +74,7 @@ It is passed a user and repository name.")
   (define-key transient-map [escape] #'transient-quit-one))
 
 
-(def-package! forge
+(use-package! 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
@@ -103,7 +103,7 @@ ensure it is built when we actually use Forge."
       (emacsql-sqlite-compile 2))))
 
 
-(def-package! magit-todos
+(use-package! magit-todos
   :after magit
   :config
   (setq magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?") ; make colon optional
@@ -114,11 +114,11 @@ ensure it is built when we actually use Forge."
   (magit-todos-mode +1))
 
 
-(def-package! magit-gitflow
+(use-package! magit-gitflow
   :hook (magit-mode . turn-on-magit-gitflow))
 
 
-(def-package! evil-magit
+(use-package! evil-magit
   :when (featurep! :editor evil +everywhere)
   :after magit
   :init

modules/tools/pdf/config.el

@@ -1,6 +1,6 @@
 ;;; tools/pdf/config.el -*- lexical-binding: t; -*-
 
-(def-package! pdf-tools
+(use-package! pdf-tools
   :mode ("\\.pdf\\'" . pdf-view-mode)
   :config
   (unless noninteractive

modules/tools/terraform/config.el

@@ -8,7 +8,7 @@
       :desc "terraform plan"  "p" (λ! (compile "terraform plan")))
 
 
-(def-package! company-terraform
+(use-package! company-terraform
   :when (featurep! :completion company)
   :after terraform-mode
   :config

modules/tools/upload/config.el

@@ -12,7 +12,7 @@
 ;; Note: `ssh-deploy-root-local' is optional, and will resort to
 ;; `doom-project-root' if unspecified.
 
-(def-package! ssh-deploy
+(use-package! ssh-deploy
   :commands (ssh-deploy-upload-handler
              ssh-deploy-upload-handler-forced
              ssh-deploy-diff-handler

modules/ui/deft/config.el

@@ -1,6 +1,6 @@
 ;;; ui/deft/config.el -*- lexical-binding: t; -*-
 
-(def-package! deft
+(use-package! deft
   :commands deft
   :init
   (setq deft-extensions '("org" "md" "tex" "txt")

modules/ui/doom/config.el

@@ -22,7 +22,7 @@
 ;; Packages
 
 ;; <https://github.com/hlissner/emacs-doom-theme>
-(def-package! doom-themes
+(use-package! doom-themes
   :defer t
   :init
   (unless doom-theme
@@ -40,7 +40,7 @@
     (add-hook 'doom-load-theme-hook #'doom-themes-treemacs-config)))
 
 
-(def-package! solaire-mode
+(use-package! solaire-mode
   :defer t
   :init
   (add-hook 'doom-load-theme-hook

modules/ui/hl-todo/config.el

@@ -1,6 +1,6 @@
 ;;; ui/hl-todo/packages.el -*- lexical-binding: t; -*-
 
-(def-package! hl-todo
+(use-package! hl-todo
   :hook (prog-mode . hl-todo-mode)
   :config
   (setq hl-todo-highlight-punctuation ":"