diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix
index 00441120..f26425f1 100644
--- a/modules/editors/emacs.nix
+++ b/modules/editors/emacs.nix
@@ -20,9 +20,11 @@ in {
     nixpkgs.overlays = [ inputs.emacs-overlay.overlay ];
 
     user.packages = with pkgs; [
-      ## Doom dependencies
+      ## Emacs itself
       binutils       # native-comp needs 'as', provided by this
       emacsGcc       # 28 + native-comp
+
+      ## Doom dependencies
       git
       (ripgrep.override {withPCRE2 = true;})
       gnutls              # for TLS connectivity
diff --git a/modules/options.nix b/modules/options.nix
index b2ac6a2f..9ada8288 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -3,17 +3,17 @@
 with lib;
 with lib.my;
 {
-  options = {
-    user = mkOpt types.attrs {};
+  options = with types; {
+    user = mkOpt attrs {};
 
-    home = with types; {
+    home = {
       file       = mkOpt' attrs {} "Files to place directly in $HOME";
       configFile = mkOpt' attrs {} "Files to place in $XDG_CONFIG_HOME";
       dataFile   = mkOpt' attrs {} "Files to place in $XDG_DATA_HOME";
     };
 
     env = mkOption {
-      type = with types; attrsOf (oneOf [ str path (listOf (either str path)) ]);
+      type = attrsOf (oneOf [ str path (listOf (either str path)) ]);
       apply = mapAttrs
         (n: v: if isList v
                then concatMapStringsSep ":" (x: toString x) v