diff --git a/modules/feature/snippets/autoload/settings.el b/modules/feature/snippets/autoload/settings.el
new file mode 100644
index 000000000..7eff149b3
--- /dev/null
+++ b/modules/feature/snippets/autoload/settings.el
@@ -0,0 +1,15 @@
+;;; feature/snippets/autoload/settings.el -*- lexical-binding: t; -*-
+
+;;;###autodef
+(defun set-yas-minor-mode! (mode)
+  "Register a minor MODE with yasnippet so it can have its own snippets
+category, if the folder exists."
+  (after! yasnippet
+    (let ((fn (intern (format "+snippets--register-%s" mode))))
+      (fset fn (lambda () (+snippets|enable-project-modes mode)))
+      (add-hook (intern (format "%s-hook" mode)) fn))))
+
+;;;###autoload
+(def-setting! :yas-minor-mode (mode)
+  :obsolete set-yas-minor-mode!
+  `(set-yas-minor-mode! ,mode))
diff --git a/modules/feature/snippets/autoload/snippets.el b/modules/feature/snippets/autoload/snippets.el
index 31ae098aa..c232ec0d7 100644
--- a/modules/feature/snippets/autoload/snippets.el
+++ b/modules/feature/snippets/autoload/snippets.el
@@ -1,16 +1,5 @@
 ;;; feature/snippets/autoload/snippets.el -*- lexical-binding: t; -*-
 
-;;;###autoload
-(def-setting! :yas-minor-mode (mode)
-  "Register a minor MODE with yasnippet so it can have its own snippets
-category, if the folder exists."
-  (let* ((mode (doom-unquote mode))
-         (hookfn (intern (format "+snippets--register-%s" mode))))
-    `(after! yasnippet
-       (fset ',hookfn (lambda () (+snippets|enable-project-modes ',mode)))
-       (add-hook! ,mode #',hookfn))))
-
-
 ;;
 ;; Commands
 ;;
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index ab1151d3b..fe015ff0f 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -119,5 +119,5 @@
   :match "/test[/-].+\\.el$")
 
 (after! buttercup
-  (set! :yas-minor-mode 'buttercup-minor-mode))
+  (set-yas-minor-mode! 'buttercup-minor-mode))
 
diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el
index 7e3dffd61..04ac04ae6 100644
--- a/modules/lang/java/config.el
+++ b/modules/lang/java/config.el
@@ -17,7 +17,7 @@
   :init
   (add-hook! (java-mode groovy-mode nxml-mode) #'+java|android-mode-maybe)
   :config
-  (set! :yas-minor-mode 'android-mode)
+  (set-yas-minor-mode! 'android-mode)
   (set! :company-dict-minor-mode 'android-mode))
 
 
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 381bfea00..c2b7a11d0 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -113,7 +113,7 @@ environment variables."
   (associate! nose-mode :match "/test_.+\\.py$" :modes (python-mode))
   :config
   (set-popup-rule! "^\\*nosetests" '((size . 0.4)) '((select)))
-  (set! :yas-minor-mode 'nose-mode)
+  (set-yas-minor-mode! 'nose-mode)
   (map! :map nose-mode-map
         :localleader
         :prefix "t"