.gitignore

@@ -1,6 +1,5 @@
 /*/.cask/
 /*/bin/
 /*/dist/
-/*/.eldev/
 
 generated-config.yml*

GNUmakefile

@@ -1,37 +1,6 @@
-define GUILE_MODULE
+FILES := $(wildcard oni-*.el)
-(use-modules (ice-9 rdelim)
-             (ice-9 ports)
-             (ice-9 regex))
 
-(define (convert-version version)
+PACKAGE_TARGETS := $(addprefix package-,$(FILES))
-  (string-join (map (compose number->string string->number) (string-split version #\.)) "."))
-
-(define (get-multifile-module-version module-name)
-  (call-with-input-file (format #f "~a/~a.el" module-name module-name)
-    (lambda (p)
-      (let loop ((line (read-line p)))
-        (if (eof-object? line)
-            "Not found!"
-            (let ((m (string-match "^;; Version: (.*)" line)))
-              (if m
-                  (format #f "~a-~a.tar" module-name
-                          (convert-version (match:substring m 1)))
-                  (loop (read-line p)))))))))
-
-(define (get-module-version module-name)
-  (call-with-input-file (format #f "~a.el" module-name)
-    (lambda (p)
-      (let loop ((line (read-line p)))
-        (if (eof-object? line)
-            "Not found!"
-            (let ((m (string-match "^;; Version: (.*)" line)))
-              (if m
-                  (format #f "~a-~a.el" module-name
-                          (convert-version (match:substring m 1)))
-                  (loop (read-line p)))))))))
-endef
-
-$(guile GUILE_MODULE))
 
 define upload =
 	emacs --quick --batch \
@@ -45,95 +14,55 @@ endef
 
 define upload-multi-file =
 	$(call upload,(car (sort (file-expand-wildcards \"$1/dist/*.tar\") #'string>)))
+	cp $1/dist/$1-readme.txt bin/
 endef
 
-package: \
+package: $(PACKAGE_TARGETS) package-oni-conf package-oni-css package-oni-elisp \
-        bin/$(guile (get-module-version "oni-alert")) \
+    package-oni-haml package-oni-html package-oni-nxml package-oni-org \
-        bin/$(guile (get-module-version "oni-autohotkey")) \
+    package-oni-php package-oni-python package-oni-ruby package-oni-twig \
-        bin/$(guile (get-module-version "oni-bat")) \
+    package-oni-csharp package-oni-bats
-        bin/$(guile (get-multifile-module-version "oni-bats")) \
+
-        bin/$(guile (get-module-version "oni-bookmark")) \
+package-%: %
-        bin/$(guile (get-module-version "oni-browse-url")) \
+	$(call upload,\"$^\")
-        bin/$(guile (get-module-version "oni-c")) \
+
-        bin/$(guile (get-module-version "oni-circe")) \
+package-oni-bats:
-        bin/$(guile (get-module-version "oni-clojure")) \
+	$(call upload-multi-file,oni-bats)
-        bin/$(guile (get-module-version "oni-cmake")) \
+
-        bin/$(guile (get-module-version "oni-common-lisp")) \
+package-oni-conf:
-        bin/$(guile (get-module-version "oni-company")) \
+	$(call upload-multi-file,oni-conf)
-        bin/$(guile (get-module-version "oni-compilation")) \
+
-        bin/$(guile (get-multifile-module-version "oni-conf")) \
+package-oni-css:
-        bin/$(guile (get-module-version "oni-core")) \
+	$(call upload-multi-file,oni-css)
-        bin/$(guile (get-module-version "oni-counsel")) \
+
-        bin/$(guile (get-module-version "oni-cpp")) \
+package-oni-elisp:
-        bin/$(guile (get-multifile-module-version "oni-csharp")) \
+	$(call upload-multi-file,oni-elisp)
-        bin/$(guile (get-multifile-module-version "oni-css")) \
+
-        bin/$(guile (get-module-version "oni-data-dir")) \
+package-oni-haml:
-        bin/$(guile (get-module-version "oni-diff-hl")) \
+	$(call upload-multi-file,oni-haml)
-        bin/$(guile (get-module-version "oni-dired")) \
+
-        bin/$(guile (get-module-version "oni-docker")) \
+package-oni-html:
-        bin/$(guile (get-module-version "oni-ediff")) \
+	$(call upload-multi-file,oni-html)
-        bin/$(guile (get-module-version "oni-elfeed")) \
+
-        bin/$(guile (get-multifile-module-version "oni-elisp")) \
+package-oni-nxml:
-        bin/$(guile (get-module-version "oni-elm")) \
+	$(call upload-multi-file,oni-nxml)
-        bin/$(guile (get-module-version "oni-embrace")) \
+
-        bin/$(guile (get-module-version "oni-emms")) \
+package-oni-org:
-        bin/$(guile (get-module-version "oni-epub")) \
+	$(call upload-multi-file,oni-org)
-        bin/$(guile (get-module-version "oni-eshell")) \
+
-        bin/$(guile (get-module-version "oni-eww")) \
+package-oni-php:
-        bin/$(guile (get-module-version "oni-fish")) \
+	$(call upload-multi-file,oni-php)
-        bin/$(guile (get-module-version "oni-flycheck")) \
+
-        bin/$(guile (get-module-version "oni-git-commit")) \
+package-oni-python:
-        bin/$(guile (get-module-version "oni-gnus")) \
+	$(call upload-multi-file,oni-python)
-        bin/$(guile (get-module-version "oni-grep")) \
+
-        bin/$(guile (get-module-version "oni-groovy")) \
+package-oni-ruby:
-        bin/$(guile (get-module-version "oni-gui")) \
+	$(call upload-multi-file,oni-ruby)
-        bin/$(guile (get-multifile-module-version "oni-haml")) \
+
-        bin/$(guile (get-module-version "oni-haskell")) \
+package-oni-twig:
-        bin/$(guile (get-module-version "oni-highlight-indent-guides")) \
+	$(call upload-multi-file,oni-twig)
-        bin/$(guile (get-multifile-module-version "oni-html")) \
+
-        bin/$(guile (get-module-version "oni-hydra")) \
+package-oni-csharp:
-        bin/$(guile (get-module-version "oni-ivy")) \
+	$(call upload-multi-file,oni-csharp)
-        bin/$(guile (get-module-version "oni-jabber")) \
-        bin/$(guile (get-module-version "oni-java")) \
-        bin/$(guile (get-module-version "oni-js")) \
-        bin/$(guile (get-module-version "oni-json")) \
-        bin/$(guile (get-module-version "oni-log-edit")) \
-        bin/$(guile (get-module-version "oni-lsp")) \
-        bin/$(guile (get-module-version "oni-lua")) \
-        bin/$(guile (get-module-version "oni-lui")) \
-        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-multifile-module-version "oni-org")) \
-        bin/$(guile (get-module-version "oni-org-roam")) \
-        bin/$(guile (get-module-version "oni-package")) \
-        bin/$(guile (get-module-version "oni-paredit")) \
-        bin/$(guile (get-multifile-module-version "oni-php")) \
-        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-rust")) \
-        bin/$(guile (get-module-version "oni-scheme")) \
-        bin/$(guile (get-module-version "oni-shackle")) \
-        bin/$(guile (get-module-version "oni-sh")) \
-        bin/$(guile (get-module-version "oni-shr")) \
-        bin/$(guile (get-module-version "oni-slack")) \
-        bin/$(guile (get-module-version "oni-smartparens")) \
-        bin/$(guile (get-module-version "oni-smt")) \
-        bin/$(guile (get-module-version "oni-sort")) \
-        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-ui")) \
-        bin/$(guile (get-module-version "oni-vc")) \
-        bin/$(guile (get-module-version "oni-vterm")) \
-        bin/$(guile (get-module-version "oni-web")) \
-        bin/$(guile (get-module-version "oni-yaml")) \
-        bin/$(guile (get-module-version "oni-yasnippet")) \
 
 install-%:
 	emacs --batch \
@@ -155,397 +84,5 @@ unit-test-%: install-%
 integration-test-%: install-%
 	bats test/integration/$*.bats
 
-## Single-file packages
+clean:
-
+	rm -fv $(FILES)
-bin/$(guile (get-module-version "oni-yasnippet")): oni-yasnippet.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-smartparens")): oni-smartparens.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-flycheck")): oni-flycheck.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-sh")): oni-sh.el \
-        bin/$(guile (get-module-version "oni-smartparens")) \
-        bin/$(guile (get-module-version "oni-flycheck"))
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-company")): oni-company.el \
-        bin/$(guile (get-module-version "oni-prescient"))
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-compilation")): oni-compilation.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-core")): oni-core.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-counsel")): oni-counsel.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-cpp")): oni-cpp.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-prescient")): oni-prescient.el \
-        bin/$(guile (get-module-version "oni-data-dir"))
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-data-dir")): oni-data-dir.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-diff-hl")): oni-diff-hl.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-dired")): oni-dired.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-docker")): oni-docker.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-ediff")): oni-ediff.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-elfeed")): oni-elfeed.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-elm")): oni-elm.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-embrace")): oni-embrace.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-emms")): oni-emms.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-epub")): oni-epub.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-eshell")): oni-eshell.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-eww")): oni-eww.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-fish")): oni-fish.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-git-commit")): oni-git-commit.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-gnus")): oni-gnus.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-grep")): oni-grep.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-groovy")): oni-groovy.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-gui")): oni-gui.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-hydra")): oni-hydra.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-ivy")): oni-ivy.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-jabber")): oni-jabber.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-java")): oni-java.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-js")): oni-js.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-json")): oni-json.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-log-edit")): oni-log-edit.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-lsp")): oni-lsp.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-lua")): oni-lua.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-lui")): oni-lui.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-magit")): oni-magit.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-makefile")): oni-makefile.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-markdown")): oni-markdown.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-notmuch")): oni-notmuch.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-org-roam")): oni-org-roam.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-package")): oni-package.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-paredit")): oni-paredit.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-powershell")): oni-powershell.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-projectile")): oni-projectile.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-rust")): oni-rust.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-scheme")): oni-scheme.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-shackle")): oni-shackle.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-shr")): oni-shr.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-slack")): oni-slack.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-smt")): oni-smt.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-sort")): oni-sort.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-termux")): oni-termux.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-tramp")): oni-tramp.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-tui")): oni-tui.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-ui")): oni-ui.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-vc")): oni-vc.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-vterm")): oni-vterm.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-web")): oni-web.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-yaml")): oni-yaml.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-alert")): oni-alert.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-autohotkey")): oni-autohotkey.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-bat")): oni-bat.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-bookmark")): oni-bookmark.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-browse-url")): oni-browse-url.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-c")): oni-c.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-circe")): oni-circe.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-clojure")): oni-clojure.el
-	$(call upload,\"$<\")
-
-bin/$(guile (get-module-version "oni-cmake")): oni-cmake.el
-	$(call upload,\"$<\")
-
-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-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
-
-bin/$(guile (get-multifile-module-version "oni-org")): \
-        oni-org/dist/$(guile (get-multifile-module-version "oni-org"))
-	$(call upload-multi-file,oni-org)
-
-## oni-php
-
-oni-php/dist/$(guile (get-multifile-module-version "oni-php")): \
-        oni-php/oni-php.el \
-        bin/$(guile (get-module-version "oni-yasnippet")) \
-        bin/$(guile (get-module-version "oni-flycheck")) \
-        bin/$(guile (get-module-version "oni-company")) \
-        bin/$(guile (get-module-version "oni-prescient")) \
-        bin/$(guile (get-module-version "oni-data-dir")) \
-        bin/$(guile (get-module-version "oni-hydra"))
-	cd oni-php && eldev package
-
-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-bats/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-bats.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-bats/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-conf/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-conf.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-conf/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-core.el

@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.0524.235720
+;; Version: 2023.0416.003045
 ;; Package-Requires: (oni-data-dir oni-embrace oni-hydra expand-region multiple-cursors gcmh diminish ws-butler which-key insert-char-preview mixed-pitch ace-window vertico marginalia orderless consult embark docstr mini-frame)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -358,11 +358,6 @@ _s_: String list"
     (backward-char)
     (looking-back (rx word) (1- (point)))))
 
-(defun oni-core-ace-window-select-other-window ()
-  "Use ‘ace-window’ to select which window is considered “other”."
-  (interactive)
-  (setq other-window-scroll-buffer (ace-select-window)))
-
 (with-eval-after-load 'electric
   (add-hook 'electric-quote-inhibit-functions #'oni-core-in-word-p))
 
@@ -404,7 +399,6 @@ _s_: String list"
 
 (global-set-key (kbd "C-c w d") '("Delete a window" . ace-delete-window))
 (global-set-key (kbd "C-c w k") '("Keep a single window" . ace-delete-other-windows))
-(global-set-key (kbd "C-c w o") '("Select other window" . oni-core-ace-window-select-other-window))
 (global-set-key (kbd "M-g M") '("Jump to a mark anywhere" . consult-global-mark))
 (global-set-key (kbd "M-g m") '("Jump to a mark" . consult-mark))
 (global-set-key [remap bookmark-jump] 'consult-bookmark)
@@ -415,23 +409,6 @@ _s_: String list"
 (global-set-key [remap switch-to-buffer] 'consult-buffer)
 (global-set-key [remap yank-pop] 'consult-yank-pop)
 
-(global-set-key (kbd "M-0") #'delete-window)
-(global-set-key (kbd "C-x 0") (lambda () (interactive) (error "Use M-0 instead")))
-(global-set-key (kbd "M-1") #'delete-other-windows)
-(global-set-key (kbd "C-x 1") (lambda () (interactive) (error "Use M-1 instead")))
-(global-set-key (kbd "M-2") #'split-window-below)
-(global-set-key (kbd "C-x 2") (lambda () (interactive) (error "Use M-2 instead")))
-(global-set-key (kbd "M-3") #'split-window-right)
-(global-set-key (kbd "C-x 3") (lambda () (interactive) (error "Use M-3 instead")))
-(global-set-key (kbd "M-4") #'ctl-x-4-prefix)
-(global-set-key (kbd "C-x 4") (lambda () (interactive) (error "Use M-4 instead")))
-(global-set-key (kbd "M-5") #'ctl-x-5-prefix)
-(global-set-key (kbd "C-x 5") (lambda () (interactive) (error "Use M-5 instead")))
-(global-set-key (kbd "M-6") #'2C-command)
-(global-set-key (kbd "C-x 6") (lambda () (interactive) (error "Use M-6 instead")))
-(global-set-key (kbd "M-8") (keymap-lookup global-map "C-x 8"))
-(global-set-key (kbd "C-x 8") (lambda () (interactive) (error "Use M-8 instead")))
-
 (defun oni-core-related-files ()
   "Return a list of files related to the current buffer."
   (let* ((jumpers related-files-jumpers)
@@ -450,14 +427,11 @@ _s_: String list"
     :enabled buffer-file-name
     :action find-file))
 
-(defun oni-core-remove-consult-buffer-preview ()
-  (consult-customize consult-buffer :preview-key nil))
-
 (with-eval-after-load 'consult
   (with-eval-after-load 'related-files
     (add-to-list 'consult-buffer-sources 'oni-core-related-places-source))
 
-  (oni-core-remove-consult-buffer-preview))
+  (consult-customize consult-buffer :preview-key nil))
 
 ;;; Embark
 

oni-csharp/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-csharp.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-csharp/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-csharp/oni-csharp.el

@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.0525.001714
+;; Version: 2022.0202.115001
 ;; Package-Requires: (csharp-mode oni-company oni-flycheck oni-yasnippet oni-hydra oni-lsp oni-smartparens)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -186,34 +186,24 @@ _cs_: Solution
   (interactive)
   (save-excursion
     (goto-char (point-min))
+    (remove-overlays (point-min) (point-max) 'oni-csharp--overlayp t)
     (while (re-search-forward
             (rx bol
                 (zero-or-more whitespace)
-                (group
+                "{"
-                 "{"
+                (group (minimal-match (one-or-more (or alphanumeric "-"))))
-                 (group (minimal-match (one-or-more (or alphanumeric "-"))))
+                "} = {"
-                 "}")
+                (group (minimal-match (one-or-more (or alphanumeric "-"))))
-                " = "
+                "}"
-                (group
-                 "{"
-                 (group (minimal-match (one-or-more (or alphanumeric "-"))))
-                 "}")
                 eol)
             nil
             :noerror)
-      (add-text-properties
+      (let ((current-overlay (make-overlay (line-beginning-position) (line-end-position))))
-       (match-beginning 1) (match-end 1)
+        (overlay-put current-overlay 'after-string
-       (list 'display (gethash (match-string 2) oni-csharp--projects)
+                     (propertize (format "  => %s" (gethash (match-string 1) oni-csharp--projects))
-             'face 'font-lock-variable-name-face
+                                 'face '(:foreground "#808080")))
-             'help-echo (buffer-substring-no-properties
+        (overlay-put current-overlay 'oni-csharp--overlayp t)
-                         (match-beginning 1) (match-end 1))
+        (overlay-put current-overlay 'evaporate t)))))
-             'intangile nil))
-      (add-text-properties
-       (match-beginning 3) (match-end 3)
-       (list 'display (gethash (match-string 4) oni-csharp--projects)
-             'face 'font-lock-variable-name-face
-             'help-echo (buffer-substring-no-properties
-                         (match-beginning 3) (match-end 3)))))))
 
 (define-derived-mode csharp-solution-mode prog-mode "Sln"
   "A major mode for viewing and editing C# ‘.sln’ files."
@@ -223,37 +213,5 @@ _cs_: Solution
 ;;;###autoload
 (add-to-list 'auto-mode-alist `(,(rx ".sln" eos) . csharp-solution-mode))
 
-(defun oni-csharp-add-file-to-project ()
-  (interactive)
-  (let* ((file-name (buffer-file-name))
-         (project-dir (locate-dominating-file file-name
-                                              (lambda (file)
-                                                (if (file-directory-p file)
-                                                    (directory-files file nil (rx ".csproj" eos))
-                                                  (string-suffix-p ".csproj" file)))))
-         (project-files (directory-files project-dir nil (rx ".csproj" eos)))
-         (project-file (cl-case (length project-files)
-                         (0 (error "No project files found in %s" project-dir))
-                         (1 (car project-files))
-                         (t (completing-read "Which project file? " project-files))))
-         (relative-file-name (file-relative-name file-name project-dir))
-         (project-file-absolute-path (expand-file-name project-file project-dir)))
-    (with-current-buffer (find-file-noselect project-file-absolute-path)
-      (save-excursion
-        (re-search-forward (rx "<Compile"))
-        (end-of-line)
-        (when (and buffer-file-read-only
-                   (vc-registered project-file-absolute-path))
-          (vc-checkout project-file-absolute-path))
-        (insert "\n" "<Compile Include=\"" (string-replace "/" "\\" relative-file-name) "\" />")
-        (re-search-backward (rx "<ItemGroup>"))
-        (forward-line)
-        (let ((start (line-beginning-position)))
-          (re-search-forward (rx "</ItemGroup>"))
-          (forward-line -1)
-          (indent-region start (line-end-position))
-          (sort-lines nil start (line-end-position)))
-        (save-buffer)))))
-
 (provide 'oni-csharp)
 ;;; oni-csharp.el ends here

oni-css/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-css.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-css/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-elisp/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-elisp.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-elisp/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-groovy.el

@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.0505.164419
+;; Version: 2022.0926.132722
 ;; Package-Requires: (groovy-mode oni-embrace oni-smartparens groovy-imports rainbow-delimiters jenkinsfile-mode)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -88,13 +88,5 @@
 (with-eval-after-load 'grep
   (add-to-list 'grep-files-aliases '("groovy" . "*.groovy *.pipeline Jenkinsfile")))
 
-(setf (alist-get "Functions" groovy-imenu-regexp nil nil #'string=)
-      (list (rx line-start "def"
-                (minimal-match (one-or-more whitespace))
-                (group alpha (minimal-match (zero-or-more alphanumeric)))
-                (minimal-match (zero-or-more whitespace))
-                "(")
-            1))
-
 (provide 'oni-groovy)
 ;;; oni-groovy.el ends here

oni-haml/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-haml.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-haml/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-html/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-html.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-html/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-nxml/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-nxml.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-nxml/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-org/Cask

@@ -0,0 +1,10 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-org.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*")
+ ("icons" "./icons/*")
+ ("capture-templates" "./capture-templates/*"))

oni-org/Eldev

@@ -1,20 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-local-dependency
- (car (directory-files (format "%s/share/emacs/site-lisp" (getenv "GUIX_ENVIRONMENT"))
-                       t "org-pretty-table" nil 1)))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el"
-              "./snippets/**/*"
-              "./icons/**/*"
-              "./capture-templates/**/*")))

oni-org/oni-org.el

@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.0517.001154
+;; Version: 2023.0411.202312
-;; Package-Requires: (oni-yasnippet oni-alert oni-hydra org org-bullets org-edna diminish all-the-icons olivetti form-feed org-pretty-table)
+;; Package-Requires: (oni-yasnippet oni-alert oni-hydra org org-contrib org-bullets org-edna diminish all-the-icons olivetti form-feed org-pretty-table)
 
 ;; 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
@@ -658,8 +658,8 @@ After running it once remove it from `org-capture-after-finalize-hook'."
                                      (height . 24)))
     (org-capture nil "t")
     (delete-other-windows)
-    (set-frame-width nil 80)
+    (setf (frame-width) 80)
-    (set-frame-height nil 24)
+    (setf (frame-height) 24)
     (add-hook 'org-capture-after-finalize-hook 'oni-org-delete-frame-once)))
 
 (defun oni-org-get-url-title (url)
@@ -1170,27 +1170,5 @@ placed above TARGET. Otherwise it will be placed below it."
                     (quit nil)))))
           (widen))))))
 
-(defun oni-org-clock+post-drawer ()
-  (if (and (markerp org-clock-hd-marker)
-		   (marker-buffer org-clock-hd-marker))
-	  (progn (set-buffer (marker-buffer org-clock-hd-marker))
-		     (org-capture-put-target-region-and-position)
-		     (widen)
-		     (goto-char org-clock-hd-marker)
-             (let ((end (org-entry-end-position)))
-               (while (search-forward ":END:" end t))))
-	(user-error "No running clock that could be used as capture target")))
-
-(defun init-find-weekly-review-file ()
-  (interactive)
-  (find-file (format-time-string "u:/documents/gtd/weekly-reviews/%Y-%W.org"))
-  (if (= (point-min) (point-max))
-      (progn
-        (insert (format-time-string "#+TITLE: Weekly Review Report for Week %-W %Y\n"))
-        (insert "\n")
-        (insert "See [[file:u:/documents/gtd/checklists/weekly-review.org][Weekly Review Checklist]]\n")
-        (insert "\n"))
-    (goto-char (point-min))))
-
 (provide 'oni-org)
 ;;; oni-org.el ends here

oni-php/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-php.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-php/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-python/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-python.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-python/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-ruby/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-ruby.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-ruby/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))

oni-twig/Cask

@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "./oni-twig.el")
+
+(files
+ "*.el"
+ ("snippets" "./snippets/*"))

oni-twig/Eldev

@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))