Fix using updated emacs-hydra package

1 files changed, 39 insertions, 7 deletions

diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index 34e0bd0..2f3941b 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -32,6 +32,37 @@
 (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 emacs-esh-autosuggest-next
+  (with-master-branch emacs-esh-autosuggest))
+
 (define-public emacs-oni-config
   (let
       ((commit "ea20080f5ce3a4e7f87455308afc30d21d5a8a24")
@@ -263,9 +294,9 @@ Emacs")))
     (arguments
      '(#:include '("oni-lsp.el")))
     (propagated-inputs
-     `(("emacs-lsp-mode" ,emacs-lsp-mode)
-       ("emacs-lsp-ui" ,emacs-lsp-ui)
-       ("emacs-lsp-ivy" ,emacs-lsp-ivy)))
+     `(("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))))
     (synopsis "My Emacs LSP configuration")
     (description "This package provides my configuration for Emacs LSP")))
 
@@ -279,7 +310,7 @@ Emacs")))
      `(("emacs-oni-flycheck" ,emacs-oni-flycheck)
        ("emacs-oni-lsp" ,emacs-oni-lsp)
        ("emacs-reformatter" ,emacs-reformatter)
-       ("emacs-ccls" ,emacs-ccls)
+       ("emacs-ccls" ,(with-updated-lsp-with-updated-hydra emacs-ccls))
        ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
        ;; For `clang-format'.
        ("clang" ,clang)))
@@ -550,7 +581,8 @@ Emacs")))
      `(("emacs-oni-company" ,emacs-oni-company)
        ("emacs-oni-flycheck" ,emacs-oni-flycheck)))
     (synopsis "My Emacs C++ configuration")
-    (description "This package provides my configuration for programming in C++.")))
+    (description
+     "This package provides my configuration for programming in C++.")))
 
 (define-public emacs-oni-csharp
   (package
@@ -633,7 +665,7 @@ Emacs")))
     (arguments
      '(#:include '("oni-eshell.el")))
     (propagated-inputs
-     `(("emacs-esh-autosuggest" ,(with-master-branch emacs-esh-autosuggest))
+     `(("emacs-esh-autosuggest" ,emacs-esh-autosuggest-next)
        ("emacs-xterm-color" ,emacs-xterm-color)
        ("emacs-eshell-syntax-highlighting" ,emacs-eshell-syntax-highlighting)
        ("emacs-eshell-fringe-status" ,emacs-eshell-fringe-status)))
@@ -810,7 +842,7 @@ Emacs")))
      (list emacs-oni-data-dir
            emacs-oni-lsp
            emacs-oni-hydra
-           emacs-lsp-java
+           emacs-lsp-java-with-hydra-next
            emacs-rainbow-delimiters))
     (synopsis "My configuration for Java")
     (description "This package provides my configuration for writing Java.")))