GNUmakefile: Update package recipes

These packages don't have snippets anymore and therefore aren't multi-file
packages anymore.

4 files changed, 64 insertions, 168 deletions

diff --git a/GNUmakefile b/GNUmakefile
index d1dc6a3..39f11fa 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -51,7 +51,7 @@ package: \
         bin/$(guile (get-module-version "oni-alert")) \
         bin/$(guile (get-module-version "oni-autohotkey")) \
         bin/$(guile (get-module-version "oni-bat")) \
-        bin/$(guile (get-multifile-module-version "oni-bats")) \
+        bin/$(guile (get-module-version "oni-bats")) \
         bin/$(guile (get-module-version "oni-bookmark")) \
         bin/$(guile (get-module-version "oni-browse-url")) \
         bin/$(guile (get-module-version "oni-c")) \
@@ -61,19 +61,19 @@ package: \
         bin/$(guile (get-module-version "oni-common-lisp")) \
         bin/$(guile (get-module-version "oni-company")) \
         bin/$(guile (get-module-version "oni-compilation")) \
-        bin/$(guile (get-multifile-module-version "oni-conf")) \
+        bin/$(guile (get-module-version "oni-conf")) \
         bin/$(guile (get-module-version "oni-core")) \
         bin/$(guile (get-module-version "oni-counsel")) \
         bin/$(guile (get-module-version "oni-cpp")) \
-        bin/$(guile (get-multifile-module-version "oni-csharp")) \
-        bin/$(guile (get-multifile-module-version "oni-css")) \
+        bin/$(guile (get-module-version "oni-csharp")) \
+        bin/$(guile (get-module-version "oni-css")) \
         bin/$(guile (get-module-version "oni-data-dir")) \
         bin/$(guile (get-module-version "oni-diff-hl")) \
         bin/$(guile (get-module-version "oni-dired")) \
         bin/$(guile (get-module-version "oni-docker")) \
         bin/$(guile (get-module-version "oni-ediff")) \
         bin/$(guile (get-module-version "oni-elfeed")) \
-        bin/$(guile (get-multifile-module-version "oni-elisp")) \
+        bin/$(guile (get-module-version "oni-elisp")) \
         bin/$(guile (get-module-version "oni-elm")) \
         bin/$(guile (get-module-version "oni-embrace")) \
         bin/$(guile (get-module-version "oni-emms")) \
@@ -86,11 +86,11 @@ package: \
         bin/$(guile (get-module-version "oni-gnus")) \
         bin/$(guile (get-module-version "oni-grep")) \
         bin/$(guile (get-module-version "oni-groovy")) \
-        bin/$(guile (get-multifile-module-version "oni-haml")) \
         bin/$(guile (get-multifile-module-version "oni-gui")) \
+        bin/$(guile (get-module-version "oni-haml")) \
         bin/$(guile (get-module-version "oni-haskell")) \
         bin/$(guile (get-module-version "oni-highlight-indent-guides")) \
-        bin/$(guile (get-multifile-module-version "oni-html")) \
+        bin/$(guile (get-module-version "oni-html")) \
         bin/$(guile (get-module-version "oni-hydra")) \
         bin/$(guile (get-module-version "oni-ivy")) \
         bin/$(guile (get-module-version "oni-jabber")) \
@@ -104,7 +104,7 @@ package: \
         bin/$(guile (get-module-version "oni-magit")) \
         bin/$(guile (get-module-version "oni-makefile")) \
         bin/$(guile (get-module-version "oni-notmuch")) \
-        bin/$(guile (get-multifile-module-version "oni-nxml")) \
+        bin/$(guile (get-module-version "oni-nxml")) \
         bin/$(guile (get-multifile-module-version "oni-org")) \
         bin/$(guile (get-module-version "oni-org-roam")) \
         bin/$(guile (get-module-version "oni-package")) \
@@ -113,8 +113,8 @@ package: \
         bin/$(guile (get-module-version "oni-powershell")) \
         bin/$(guile (get-module-version "oni-prescient")) \
         bin/$(guile (get-module-version "oni-projectile")) \
-        bin/$(guile (get-multifile-module-version "oni-python")) \
-        bin/$(guile (get-multifile-module-version "oni-ruby")) \
+        bin/$(guile (get-module-version "oni-python")) \
+        bin/$(guile (get-module-version "oni-ruby")) \
         bin/$(guile (get-module-version "oni-rust")) \
         bin/$(guile (get-module-version "oni-scheme")) \
         bin/$(guile (get-module-version "oni-shackle")) \
@@ -127,7 +127,7 @@ package: \
         bin/$(guile (get-module-version "oni-termux")) \
         bin/$(guile (get-module-version "oni-tramp")) \
         bin/$(guile (get-module-version "oni-tui")) \
-        bin/$(guile (get-multifile-module-version "oni-twig")) \
+        bin/$(guile (get-module-version "oni-twig")) \
         bin/$(guile (get-module-version "oni-ui")) \
         bin/$(guile (get-module-version "oni-vc")) \
         bin/$(guile (get-module-version "oni-vterm")) \
@@ -175,6 +175,9 @@ bin/$(guile (get-module-version "oni-company")): oni-company.el \
 bin/$(guile (get-module-version "oni-compilation")): oni-compilation.el
 	$(call upload,\"$<\")
 
+bin/$(guile (get-module-version "oni-conf")): oni-conf.el
+	$(call upload,\"$<\")
+
 bin/$(guile (get-module-version "oni-core")): oni-core.el
 	$(call upload,\"$<\")
 
@@ -184,6 +187,19 @@ bin/$(guile (get-module-version "oni-counsel")): oni-counsel.el
 bin/$(guile (get-module-version "oni-cpp")): oni-cpp.el
 	$(call upload,\"$<\")
 
+bin/$(guile (get-module-version "oni-csharp")): oni-csharp.el \
+        bin/$(guile (get-module-version "oni-company")) \
+        bin/$(guile (get-module-version "oni-flycheck")) \
+        bin/$(guile (get-module-version "oni-hydra")) \
+        bin/$(guile (get-module-version "oni-lsp")) \
+        bin/$(guile (get-module-version "oni-smartparens"))
+	$(call upload,\"$<\")
+
+bin/$(guile (get-module-version "oni-css")): oni-css.el \
+        bin/$(guile (get-module-version "oni-company")) \
+        bin/$(guile (get-module-version "oni-hydra"))
+	$(call upload,\"$<\")
+
 bin/$(guile (get-module-version "oni-prescient")): oni-prescient.el \
         bin/$(guile (get-module-version "oni-data-dir"))
 	$(call upload,\"$<\")
@@ -206,6 +222,13 @@ bin/$(guile (get-module-version "oni-ediff")): oni-ediff.el
 bin/$(guile (get-module-version "oni-elfeed")): oni-elfeed.el
 	$(call upload,\"$<\")
 
+bin/$(guile (get-module-version "oni-elisp")): oni-elisp.el \
+        bin/$(guile (get-module-version "oni-flycheck")) \
+        bin/$(guile (get-module-version "oni-company")) \
+        bin/$(guile (get-module-version "oni-paredit")) \
+        bin/$(guile (get-module-version "oni-hydra"))
+	$(call upload,\"$<\")
+
 bin/$(guile (get-module-version "oni-elm")): oni-elm.el
 	$(call upload,\"$<\")
 
@@ -239,12 +262,18 @@ bin/$(guile (get-module-version "oni-grep")): oni-grep.el
 bin/$(guile (get-module-version "oni-groovy")): oni-groovy.el
 	$(call upload,\"$<\")
 
+bin/$(guile (get-module-version "oni-haml")): oni-haml.el
+	$(call upload,\"$<\")
+
 bin/$(guile (get-module-version "oni-haskell")): oni-haskell.el
 	$(call upload,\"$<\")
 
 bin/$(guile (get-module-version "oni-highlight-indent-guides")): oni-highlight-indent-guides.el
 	$(call upload,\"$<\")
 
+bin/$(guile (get-module-version "oni-html")): oni-html.el
+	$(call upload,\"$<\")
+
 bin/$(guile (get-module-version "oni-hydra")): oni-hydra.el
 	$(call upload,\"$<\")
 
@@ -284,6 +313,9 @@ bin/$(guile (get-module-version "oni-makefile")): oni-makefile.el
 bin/$(guile (get-module-version "oni-notmuch")): oni-notmuch.el
 	$(call upload,\"$<\")
 
+bin/$(guile (get-module-version "oni-nxml")): oni-nxml.el
+	$(call upload,\"$<\")
+
 bin/$(guile (get-module-version "oni-org-roam")): oni-org-roam.el
 	$(call upload,\"$<\")
 
@@ -299,6 +331,16 @@ bin/$(guile (get-module-version "oni-powershell")): oni-powershell.el
 bin/$(guile (get-module-version "oni-projectile")): oni-projectile.el
 	$(call upload,\"$<\")
 
+bin/$(guile (get-module-version "oni-python")): oni-python.el \
+        bin/$(guile (get-module-version "oni-company")) \
+        bin/$(guile (get-module-version "oni-flycheck")) \
+        bin/$(guile (get-module-version "oni-hydra")) \
+        bin/$(guile (get-module-version "oni-lsp"))
+	$(call upload,\"$<\")
+
+bin/$(guile (get-module-version "oni-ruby")): oni-ruby.el
+	$(call upload,\"$<\")
+
 bin/$(guile (get-module-version "oni-rust")): oni-rust.el
 	$(call upload,\"$<\")
 
@@ -329,6 +371,9 @@ bin/$(guile (get-module-version "oni-tramp")): oni-tramp.el
 bin/$(guile (get-module-version "oni-tui")): oni-tui.el
 	$(call upload,\"$<\")
 
+bin/$(guile (get-module-version "oni-twig")): oni-twig.el
+	$(call upload,\"$<\")
+
 bin/$(guile (get-module-version "oni-ui")): oni-ui.el
 	$(call upload,\"$<\")
 
@@ -353,6 +398,10 @@ bin/$(guile (get-module-version "oni-autohotkey")): oni-autohotkey.el
 bin/$(guile (get-module-version "oni-bat")): oni-bat.el
 	$(call upload,\"$<\")
 
+bin/$(guile (get-module-version "oni-bats")): oni-bats.el \
+        bin/$(guile (get-module-version "oni-sh"))
+	$(call upload,\"$<\")
+
 bin/$(guile (get-module-version "oni-bookmark")): oni-bookmark.el
 	$(call upload,\"$<\")
 
@@ -374,29 +423,6 @@ bin/$(guile (get-module-version "oni-cmake")): oni-cmake.el
 bin/$(guile (get-module-version "oni-common-lisp")): oni-common-lisp.el
 	$(call upload,\"$<\")
 
-## oni-bats
-
-oni-bats/dist/$(guile (get-multifile-module-version "oni-bats")): \
-        oni-bats/oni-bats.el \
-        bin/$(guile (get-module-version "oni-yasnippet")) \
-        bin/$(guile (get-module-version "oni-sh"))
-	cd oni-bats && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-bats")): \
-        oni-bats/dist/$(guile (get-multifile-module-version "oni-bats"))
-	$(call upload-multi-file,oni-bats)
-
-## oni-conf
-
-oni-conf/dist/$(guile (get-multifile-module-version "oni-conf")): \
-        oni-conf/oni-conf.el \
-        bin/$(guile (get-module-version "oni-yasnippet"))
-	cd oni-conf && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-conf")): \
-        oni-conf/dist/$(guile (get-multifile-module-version "oni-conf"))
-	$(call upload-multi-file,oni-conf)
-
 ## oni-gui
 
 oni-gui/dist/$(guile (get-multifile-module-version "oni-gui")): \
@@ -408,88 +434,10 @@ bin/$(guile (get-multifile-module-version "oni-gui")): \
         oni-gui/dist/$(guile (get-multifile-module-version "oni-gui"))
 	$(call upload-multi-file,oni-gui)
 
-## oni-csharp
-
-oni-csharp/dist/$(guile (get-multifile-module-version "oni-csharp")): \
-        oni-csharp/oni-csharp.el \
-        bin/$(guile (get-module-version "oni-company")) \
-        bin/$(guile (get-module-version "oni-flycheck")) \
-        bin/$(guile (get-module-version "oni-yasnippet")) \
-        bin/$(guile (get-module-version "oni-hydra")) \
-        bin/$(guile (get-module-version "oni-lsp")) \
-        bin/$(guile (get-module-version "oni-smartparens"))
-	cd oni-csharp && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-csharp")): \
-        oni-csharp/dist/$(guile (get-multifile-module-version "oni-csharp"))
-	$(call upload-multi-file,oni-csharp)
-
-## oni-css
-
-oni-css/dist/$(guile (get-multifile-module-version "oni-css")): \
-        oni-css/oni-css.el \
-        bin/$(guile (get-module-version "oni-company")) \
-        bin/$(guile (get-module-version "oni-yasnippet")) \
-        bin/$(guile (get-module-version "oni-hydra"))
-	cd oni-css && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-css")): \
-        oni-css/dist/$(guile (get-multifile-module-version "oni-css"))
-	$(call upload-multi-file,oni-css)
-
-## oni-elisp
-
-oni-elisp/dist/$(guile (get-multifile-module-version "oni-elisp")): \
-        oni-elisp/oni-elisp.el \
-        bin/$(guile (get-module-version "oni-company")) \
-        bin/$(guile (get-module-version "oni-flycheck")) \
-        bin/$(guile (get-module-version "oni-paredit")) \
-        bin/$(guile (get-module-version "oni-yasnippet")) \
-        bin/$(guile (get-module-version "oni-hydra"))
-	cd oni-elisp && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-elisp")): \
-        oni-elisp/dist/$(guile (get-multifile-module-version "oni-elisp"))
-	$(call upload-multi-file,oni-elisp)
-
-## oni-haml
-
-oni-haml/dist/$(guile (get-multifile-module-version "oni-haml")): \
-        oni-haml/oni-haml.el \
-        bin/$(guile (get-module-version "oni-yasnippet"))
-	cd oni-haml && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-haml")): \
-        oni-haml/dist/$(guile (get-multifile-module-version "oni-haml"))
-	$(call upload-multi-file,oni-haml)
-
-## oni-html
-
-oni-html/dist/$(guile (get-multifile-module-version "oni-html")): \
-        oni-html/oni-html.el \
-        bin/$(guile (get-module-version "oni-yasnippet"))
-	cd oni-html && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-html")): \
-        oni-html/dist/$(guile (get-multifile-module-version "oni-html"))
-	$(call upload-multi-file,oni-html)
-
-## oni-nxml
-
-oni-nxml/dist/$(guile (get-multifile-module-version "oni-nxml")): \
-        oni-nxml/oni-nxml.el \
-        bin/$(guile (get-module-version "oni-yasnippet"))
-	cd oni-nxml && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-nxml")): \
-        oni-nxml/dist/$(guile (get-multifile-module-version "oni-nxml"))
-	$(call upload-multi-file,oni-nxml)
-
 ## oni-org
 
 oni-org/dist/$(guile (get-multifile-module-version "oni-org")): \
         oni-org/oni-org.el \
-        bin/$(guile (get-module-version "oni-yasnippet")) \
         bin/$(guile (get-module-version "oni-alert")) \
         bin/$(guile (get-module-version "oni-hydra"))
 	cd oni-org && eldev package
@@ -514,43 +462,6 @@ bin/$(guile (get-multifile-module-version "oni-php")): \
         oni-php/dist/$(guile (get-multifile-module-version "oni-php"))
 	$(call upload-multi-file,oni-php)
 
-## oni-python
-
-oni-python/dist/$(guile (get-multifile-module-version "oni-python")): \
-        oni-python/oni-python.el \
-        bin/$(guile (get-module-version "oni-yasnippet")) \
-        bin/$(guile (get-module-version "oni-company")) \
-        bin/$(guile (get-module-version "oni-flycheck")) \
-        bin/$(guile (get-module-version "oni-hydra")) \
-        bin/$(guile (get-module-version "oni-lsp"))
-	cd oni-python && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-python")): \
-        oni-python/dist/$(guile (get-multifile-module-version "oni-python"))
-	$(call upload-multi-file,oni-python)
-
-## oni-ruby
-
-oni-ruby/dist/$(guile (get-multifile-module-version "oni-ruby")): \
-        oni-ruby/oni-ruby.el \
-        bin/$(guile (get-module-version "oni-yasnippet"))
-	cd oni-ruby && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-ruby")): \
-        oni-ruby/dist/$(guile (get-multifile-module-version "oni-ruby"))
-	$(call upload-multi-file,oni-ruby)
-
-## oni-twig
-
-oni-twig/dist/$(guile (get-multifile-module-version "oni-twig")): \
-        oni-twig/oni-twig.el \
-        bin/$(guile (get-module-version "oni-yasnippet"))
-	cd oni-twig && eldev package
-
-bin/$(guile (get-multifile-module-version "oni-twig")): \
-        oni-twig/dist/$(guile (get-multifile-module-version "oni-twig"))
-	$(call upload-multi-file,oni-twig)
-
 ## oni-yasnippet
 
 oni-yasnippet/dist/$(guile (get-multifile-module-version "oni-yasnippet")): \
diff --git a/oni-org/Eldev b/oni-org/Eldev
index 7c2d187..d25b320 100644
--- a/oni-org/Eldev
+++ b/oni-org/Eldev
@@ -15,6 +15,5 @@
 (setf eldev-files-to-package
       `(:or ,eldev-files-to-package
             '("*.el"
-              "./snippets/**/*"
               "./icons/**/*"
               "./capture-templates/**/*")))
diff --git a/oni-php/Eldev b/oni-php/Eldev
index 1ba3134..72e2000 100644
--- a/oni-php/Eldev
+++ b/oni-php/Eldev
@@ -10,4 +10,4 @@
 
 (setf eldev-files-to-package
       `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
+            '("*.el" "scripts/*")))
diff --git a/oni-php/oni-php.el b/oni-php/oni-php.el
index 01c9388..9c96a8c 100644
--- a/oni-php/oni-php.el
+++ b/oni-php/oni-php.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2026.0521.094427
-;; Package-Requires: (oni-yasnippet oni-flycheck oni-hydra oni-corfu fic-mode rainbow-delimiters rainbow-identifiers)
+;; Version: 2026.0628.181545
+;; Package-Requires: (oni-flycheck oni-hydra fic-mode rainbow-delimiters rainbow-identifiers)
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 (require 'map)
 (require 'project)
 (require 'whitespace)
-(require 'yasnippet)
+(require 'php-mode)
 
 (defconst oni-php-root
   (file-name-directory
@@ -40,20 +40,10 @@
        (buffer-file-name)))
   "The directory where ‘oni-php’ was loaded from.")
 
-(defconst oni-php-snippets-dir
-  (expand-file-name "snippets" oni-php-root)
-  "The directory where ‘oni-php’ stores its snippets.")
-
 (defconst oni-php-scripts-dir
   (expand-file-name "scripts" oni-php-root)
   "The directory where ‘oni-php’ stores its scripts.")
 
-(defun oni-php-snippets-initialize ()
-  "Initialize the snippets for ‘oni-php’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-php-snippets-dir))
-  (yas-load-directory oni-php-snippets-dir))
-
 (defun oni-php--set-require-final-newline ()
   "Set `require-final-newline' to t.
 This is necessary because the PHP mode configuration sets this to
@@ -284,10 +274,6 @@ Otherwise call FUNC with ARGS. This is meant as advice around
                (modes . '(php-mode web-mode php-ts-mode))
                (repeat . t)))
 
-(with-eval-after-load 'php-mode
-  (with-eval-after-load 'yasnippet
-    (oni-php-snippets-initialize)))
-
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.inc\\'" . php-mode))