💥 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.
2019-07-23 12:44:03 +02:00 · 2019-07-23 12:44:03 +02:00 · 76cacb5bfe
commit 76cacb5bfe
parent c795a988e6
110 changed files with 310 additions and 308 deletions
--- a/modules/lang/agda/config.el
+++ b/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
--- a/modules/lang/cc/config.el
+++ b/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
--- a/modules/lang/clojure/config.el
+++ b/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)
--- a/modules/lang/common-lisp/config.el
+++ b/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))
--- a/modules/lang/crystal/config.el
+++ b/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)
--- a/modules/lang/csharp/config.el
+++ b/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
--- a/modules/lang/data/config.el
+++ b/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 ?: ?{ ?})))
--- a/modules/lang/elixir/config.el
+++ b/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
--- a/modules/lang/elm/config.el
+++ b/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))
--- a/modules/lang/emacs-lisp/config.el
+++ b/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))
--- a/modules/lang/erlang/config.el
+++ b/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))
--- a/modules/lang/ess/config.el
+++ b/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)
--- a/modules/lang/go/config.el
+++ b/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
--- a/modules/lang/haskell/+dante.el
+++ b/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:
--- a/modules/lang/haskell/+intero.el
+++ b/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 ()
--- a/modules/lang/haskell/+lsp.el
+++ b/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
--- a/modules/lang/hy/config.el
+++ b/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
--- a/modules/lang/java/+eclim.el
+++ b/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
--- a/modules/lang/java/+lsp.el
+++ b/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
--- a/modules/lang/java/+meghanada.el
+++ b/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/")
--- a/modules/lang/java/config.el
+++ b/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"))
--- a/modules/lang/javascript/config.el
+++ b/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 ()
--- a/modules/lang/kotlin/config.el
+++ b/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))
--- a/modules/lang/latex/+ref.el
+++ b/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
--- a/modules/lang/latex/config.el
+++ b/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
--- a/modules/lang/ledger/config.el
+++ b/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
--- a/modules/lang/lua/config.el
+++ b/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
--- a/modules/lang/markdown/config.el
+++ b/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
--- a/modules/lang/nim/config.el
+++ b/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)

--- a/modules/lang/nix/config.el
+++ b/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)
--- a/modules/lang/ocaml/config.el
+++ b/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)
--- a/modules/lang/org/config.el
+++ b/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)
--- a/modules/lang/org/contrib/dragndrop.el
+++ b/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
--- a/modules/lang/org/contrib/ipython.el
+++ b/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)
--- a/modules/lang/org/contrib/present.el
+++ b/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)
--- a/modules/lang/perl/config.el
+++ b/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)
--- a/modules/lang/php/config.el
+++ b/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$")

--- a/modules/lang/plantuml/config.el
+++ b/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))
--- a/modules/lang/purescript/config.el
+++ b/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)
--- a/modules/lang/python/config.el
+++ b/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
--- a/modules/lang/racket/config.el
+++ b/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)
--- a/modules/lang/rest/config.el
+++ b/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))
--- a/modules/lang/ruby/config.el
+++ b/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)
--- a/modules/lang/rust/config.el
+++ b/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
--- a/modules/lang/scala/config.el
+++ b/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))
--- a/modules/lang/sh/config.el
+++ b/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))
--- a/modules/lang/solidity/config.el
+++ b/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
--- a/modules/lang/swift/config.el
+++ b/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!))
--- a/modules/lang/terra/config.el
+++ b/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)
--- a/modules/lang/web/+css.el
+++ b/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
--- a/modules/lang/web/+html.el
+++ b/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$"
--- a/modules/lang/web/config.el
+++ b/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