diff --git a/modules/emacs.nix b/modules/emacs.nix
index a16cb647..680ef280 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -16,7 +16,6 @@
           config = ./emacs/init.el;
           package = pkgs.emacsPgtk;
           alwaysEnsure = true;
-          extraEmacsPackages = epkgs: [ epkgs.diminish ];
         };
       };
       home.file = {
diff --git a/modules/emacs/init.el b/modules/emacs/init.el
index b1aff14a..87d9dec9 100644
--- a/modules/emacs/init.el
+++ b/modules/emacs/init.el
@@ -7,11 +7,11 @@
   (setq use-package-verbose nil)
   (setq use-package-always-ensure t))
 
+;; Dependencies that inject `:keywords' into `use-package' should be
+;; included before all other packages.
 ;; For :diminish in (use-package).
-(require 'diminish)
-;; For :general in (use-package). Needs to be included before
-;; everything else so `use-package' definitely already knows about
-;; `:general'.
+(use-package diminish)
+;; For :general in (use-package) and keybindings management.
 (use-package general
   :config
   (general-evil-setup t)