Simplify installing latest Hydra version

1 files changed, 10 insertions, 36 deletions

diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index 2f3941b..fff56e6 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -29,36 +29,10 @@
 (define-public emacs-hydra-next
   (with-master-branch emacs-hydra))
 
-(define with-master-hydra
-  (package-input-rewriting `((,emacs-hydra . ,emacs-hydra-next))))
-
-(define-public emacs-lsp-with-updated-hydra
-  (with-master-hydra emacs-lsp-mode))
-
-(define with-updated-lsp-with-updated-hydra
-  (package-input-rewriting `((,emacs-lsp-mode . ,emacs-lsp-with-updated-hydra))))
-
-(define emacs-treemacs-with-hydra-next
-  (with-master-hydra emacs-treemacs))
-
-(define emacs-lsp-java-with-hydra-next
-  ((package-input-rewriting
-    `((,emacs-dap-mode
-       . ,((package-input-rewriting
-            `((,emacs-lsp-treemacs
-               . ,((package-input-rewriting
-                    `((,emacs-treemacs . ,emacs-treemacs-with-hydra-next)
-                      (,emacs-lsp-mode . ,emacs-lsp-with-updated-hydra)))
-                   emacs-lsp-treemacs))
-              (,emacs-lsp-docker
-               . ,((package-input-rewriting
-                    `((,emacs-lsp-mode . ,emacs-lsp-with-updated-hydra)))
-                   emacs-lsp-docker))
-              (,emacs-lsp-mode . ,emacs-lsp-with-updated-hydra)))
-           emacs-dap-mode))
-      (,emacs-treemacs . ,emacs-treemacs-with-hydra-next)
-      (,emacs-lsp-mode . ,emacs-lsp-with-updated-hydra)))
-   emacs-lsp-java))
+(define with-emacs-hydra-next
+  (package-input-rewriting
+   `((,emacs-hydra . ,emacs-hydra-next))
+   #:recursive? #t))
 
 (define emacs-esh-autosuggest-next
   (with-master-branch emacs-esh-autosuggest))
@@ -294,9 +268,9 @@ Emacs")))
     (arguments
      '(#:include '("oni-lsp.el")))
     (propagated-inputs
-     `(("emacs-lsp-mode" ,emacs-lsp-with-updated-hydra)
-       ("emacs-lsp-ui" ,(with-updated-lsp-with-updated-hydra emacs-lsp-ui))
-       ("emacs-lsp-ivy" ,(with-updated-lsp-with-updated-hydra emacs-lsp-ivy))))
+     `(("emacs-lsp-mode" ,(with-emacs-hydra-next emacs-lsp-mode))
+       ("emacs-lsp-ui" ,(with-emacs-hydra-next emacs-lsp-ui))
+       ("emacs-lsp-ivy" ,(with-emacs-hydra-next emacs-lsp-ivy))))
     (synopsis "My Emacs LSP configuration")
     (description "This package provides my configuration for Emacs LSP")))
 
@@ -310,7 +284,7 @@ Emacs")))
      `(("emacs-oni-flycheck" ,emacs-oni-flycheck)
        ("emacs-oni-lsp" ,emacs-oni-lsp)
        ("emacs-reformatter" ,emacs-reformatter)
-       ("emacs-ccls" ,(with-updated-lsp-with-updated-hydra emacs-ccls))
+       ("emacs-ccls" ,(with-emacs-hydra-next emacs-ccls))
        ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
        ;; For `clang-format'.
        ("clang" ,clang)))
@@ -842,7 +816,7 @@ Emacs")))
      (list emacs-oni-data-dir
            emacs-oni-lsp
            emacs-oni-hydra
-           emacs-lsp-java-with-hydra-next
+           (with-emacs-hydra-next emacs-lsp-java)
            emacs-rainbow-delimiters))
     (synopsis "My configuration for Java")
     (description "This package provides my configuration for writing Java.")))
@@ -979,7 +953,7 @@ Emacs")))
       emacs-yaml-mode
       emacs-oni-flycheck
       emacs-oni-highlight-indent-guides
-      (with-master-hydra emacs-indent-tools)
+      (with-emacs-hydra-next emacs-indent-tools)
       emacs-yaml-imenu
       emacs-yaml-pro
       python-yamllint))