diff --git a/core/cli/env.el b/core/cli/env.el
index 1fbc050f9..efa17188d 100644
--- a/core/cli/env.el
+++ b/core/cli/env.el
@@ -5,7 +5,7 @@
     (pcase (car args)
       ((or "refresh" "re")
        (doom-reload-env-file 'force))
-      ("enable"
+      ((or "enable" "auto")
        (setenv "DOOMENV" "1")
        (print! (green "Enabling auto-reload of %S") env-file)
        (doom-reload-env-file 'force)
@@ -17,7 +17,9 @@
        (delete-file env-file)
        (print! (green "Disabled envvar file by deleting %S") env-file))
       (_
-       (message "No valid subcommand provided. See `doom help env`."))))
+       (print! "%s\n\n%s"
+               (bold (red "No valid subcommand provided."))
+               "See `doom help env` to see available commands."))))
   "Manages your envvars file.
 
   env [SUBCOMMAND]
@@ -25,7 +27,7 @@
 Available subcommands:
 
   refresh  Create or regenerate your envvar file
-  enable   enable auto-reloading of your envvars file (on `doom refresh`)
+  auto     enable auto-reloading of your envvars file (on `doom refresh`)
   clear    deletes your envvar file (if it exists) and disables auto-reloading
 
 An envvars file (its location is controlled by the `doom-env-file' variable)
diff --git a/core/cli/patch-macos.el b/core/cli/patch-macos.el
index e680dcd90..74c711dd1 100644
--- a/core/cli/patch-macos.el
+++ b/core/cli/patch-macos.el
@@ -6,6 +6,8 @@
                     (doom--find-emacsapp-path))
   "Patches Emacs.app to respect your shell environment.
 
+WARNING: This command is deprecated. Use 'doom env' instead.
+
 A common issue with GUI Emacs on MacOS is that it launches in an environment
 independent of your shell configuration, including your PATH and any other
 utilities like rbenv, rvm or virtualenv.
@@ -67,7 +69,8 @@ depending on your shell configuration and isn't always reliable.")
 
           ((or doom-auto-accept
                (y-or-n-p
-                (concat "Doom would like to patch your Emacs.app bundle so that it respects\n"
+                (concat "(WARNING: patch-macos is deprecated, use `doom env refresh` instead)\n\n"
+                        "Doom would like to patch your Emacs.app bundle so that it respects\n"
                         "your shell configuration. For more information on why and how, run\n\n"
                         "  bin/doom help patch-macos\n\n"
                         "Patch Emacs.app?")))