emacs-config: Update to latestHEADmain

The latest configuration files don't include any snippets, those have all moved
to the oni-yasnippet configuration.

1 files changed, 20 insertions, 63 deletions

diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index c1ea083..fd1bbd4 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -38,7 +38,7 @@
 
 (define-public emacs-oni-config
   (let
-      ((commit "59e0a0b53a166d4b1e8d01361a6adf55ad53fa6f")
+      ((commit "09a4099586657170cbdcff071b2d0fac5ed133b7")
        (revision "0"))
     (package (name "emacs-oni-config")
              (version (git-version "0.0.1" revision commit))
@@ -52,7 +52,7 @@
                       (file-name (git-file-name name version))
                       (sha256
                        (base32
-                        "1nsc40z1s7g5gxyqgdm8yqpjrg4qn9c2mykjbk7gdzvdqgfwpzan"))))
+                        "1lhn76r08b2zin45xjpzq60am8jw445s73b0yl4cdq107g0cbk0i"))))
              (build-system emacs-build-system)
              (home-page "https://code.ryuslash.org/emacs-config/")
              (synopsis "My Emacs configuration")
@@ -311,7 +311,11 @@ Emacs")))
     (inherit emacs-oni-config)
     (name "emacs-oni-yasnippet")
     (arguments
-     '(#:include '("oni-yasnippet.el")))
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-oni-yasnippet
+           (λ _ (chdir "oni-yasnippet"))))
+       #:include '("\\.el$" "^snippets\\/")))
     (propagated-inputs
      `(("emacs-yasnippet" ,emacs-yasnippet)
        ("emacs-diminish" ,emacs-diminish)))
@@ -323,15 +327,10 @@ Emacs")))
     (inherit emacs-oni-config)
     (name "emacs-oni-bats")
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'chdir-oni-bats
-           (λ _ (chdir "oni-bats"))))
-       #:include '("\\.el$" "^snippets\\/bats-mode\\/")))
+     '(#:include '("\\.el$")))
     (propagated-inputs
      `(("emacs-bats" ,emacs-bats)
        ("emacs-oni-sh" ,emacs-oni-sh)
-       ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
        ("bats" ,bats)))
     (synopsis "My Emacs Bats coding configuration")
     (description "This package provides my configuration for coding in Bats")))
@@ -346,15 +345,13 @@ Emacs")))
          (add-after 'unpack 'chdir-oni-org
            (λ _ (chdir "oni-org"))))
        #:include '("\\.el$"
-                   "^snippets\\/org-mode\\/"
                    "^capture-templates\\/"
                    "^icons\\/")
        ;; The default #:emacs (emacs-minimal) doesn't include `range.el' and
        ;; throws an error while trying to byte-compile oni-org.
        #:emacs ,emacs))
     (propagated-inputs
-     (list emacs-oni-yasnippet
-           emacs-oni-hydra
+     (list emacs-oni-hydra
            my-emacs-org-roam
            emacs-org
            emacs-org-contrib
@@ -429,14 +426,9 @@ Emacs")))
     (inherit emacs-oni-config)
     (name "emacs-oni-python")
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'chdir-oni-python
-           (λ _ (chdir "oni-python"))))
-       #:include '("\\.el$" "^snippets\\/python-mode\\/")))
+     '(#:include '("oni-python\\.el$")))
     (propagated-inputs
-     (list emacs-oni-yasnippet
-           emacs-oni-company
+     (list emacs-oni-company
            emacs-oni-flycheck
            emacs-oni-hydra
            emacs-oni-lsp
@@ -521,14 +513,7 @@ Emacs")))
     (inherit emacs-oni-config)
     (name "emacs-oni-conf")
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'chdir-oni-conf
-           (λ _ (chdir "oni-conf"))))
-       #:include '("\\.el$"
-                   "^snippets\\/conf-mode\\/")))
-    (propagated-inputs
-     `(("emacs-oni-yasnippet" ,emacs-oni-yasnippet)))
+     '(#:include '("oni-conf\\.el$")))
     (synopsis "My Emacs Conf mode configuration")
     (description "This pakcage provides my configuation for Conf mode")))
 
@@ -562,16 +547,11 @@ Emacs")))
     (inherit emacs-oni-config)
     (name "emacs-oni-csharp")
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'chdir-oni-csharp
-           (λ _ (chdir "oni-csharp"))))
-       #:include '("\\.el$" "^snippets\\/")))
+     '(#:include '("oni-csharp\\.el$")))
     (propagated-inputs
      `(("emacs-csharp-mode" ,emacs-csharp-mode)
        ("emacs-oni-company" ,emacs-oni-company)
        ("emacs-oni-flycheck" ,emacs-oni-flycheck)
-       ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
        ("emacs-oni-hydra" ,emacs-oni-hydra)
        ("emacs-oni-lsp" ,emacs-oni-lsp)
        ("emacs-oni-smartparens" ,emacs-oni-smartparens)))
@@ -583,16 +563,11 @@ Emacs")))
     (inherit emacs-oni-config)
     (name "emacs-oni-css")
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'chdir-oni-css
-           (λ _ (chdir "oni-css"))))
-       #:include '("\\.el$" "^snippets\\/")))
+     '(#:include '("oni-css\\.el$")))
     (propagated-inputs
      `(("emacs-oni-company" ,emacs-oni-company)
        ("emacs-oni-hydra" ,emacs-oni-hydra)
-       ("emacs-rainbow-mode" ,emacs-rainbow-mode)
-       ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)))
+       ("emacs-rainbow-mode" ,emacs-rainbow-mode)))
     (synopsis "My Emacs CSS configuration")
     (description "This package provides my configuration for writing CSS.")))
 
@@ -612,16 +587,11 @@ Emacs")))
     (inherit emacs-oni-config)
     (name "emacs-oni-elisp")
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'chdir-oni-elisp
-           (λ _ (chdir "oni-elisp"))))
-       #:include '("\\.el$" "^snippets\\/")))
+     '(#:include '("oni-elisp\\.el$")))
     (propagated-inputs
      `(("emacs-oni-company" ,emacs-oni-company)
        ("emacs-oni-flycheck" ,emacs-oni-flycheck)
        ("emacs-oni-paredit" ,emacs-oni-paredit)
-       ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
        ("emacs-oni-hydra" ,emacs-oni-hydra)
        ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
        ("emacs-nameless" ,emacs-nameless)
@@ -678,7 +648,6 @@ Emacs")))
     (propagated-inputs
      (list emacs-hy-mode
            emacs-oni-paredit
-           emacs-oni-yasnippet
            emacs-rainbow-delimiters))
     (synopsis "My Hy configuration")
     (description "This package provides my configuration for Hy.")))
@@ -795,13 +764,7 @@ Emacs")))
     (inherit emacs-oni-config)
     (name "emacs-oni-html")
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'chdir-oni-html
-           (λ _ (chdir "oni-html"))))
-       #:include '("\\.el$" "^snippets\\/")))
-    (propagated-inputs
-     (list emacs-oni-yasnippet))
+     '(#:include '("oni-html\\.el$")))
     (synopsis "My HTML configuration")
     (description "This package provides my configuration for HTML.")))
 
@@ -865,14 +828,9 @@ Emacs")))
     (inherit emacs-oni-config)
     (name "emacs-oni-nxml")
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'chdir-oni-nxml
-           (λ _ (chdir "oni-nxml"))))
-       #:include '("\\.el$" "^snippets\\/")))
+     '(#:include '("oni-nxml\\.el$")))
     (propagated-inputs
-     (list emacs-oni-yasnippet
-           emacs-reformatter))
+     (list emacs-reformatter))
     (synopsis "My XML configuration")
     (description "This package provides my configuration for writing XML.")))
 
@@ -970,10 +928,9 @@ Emacs")))
        (modify-phases %standard-phases
          (add-after 'unpack 'chdir-oni-php
            (λ _ (chdir "oni-php"))))
-       #:include '("\\.el$" "^snippets\\/" "^scripts\\/")))
+       #:include '("\\.el$" "^scripts\\/")))
     (propagated-inputs
      (list emacs-php-mode
-           emacs-oni-yasnippet
            emacs-oni-flycheck
            emacs-oni-corfu
            emacs-oni-hydra