From f8b1af8d5869a463a6925c5d9f2ebadfacfbe440 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sat, 12 Sep 2026 02:19:21 -0700
Subject: emacs: Use latest git version of ace-window

---
 oni/packages/emacs-config.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'oni')

diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index b0a4f27..09aeee9 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -29,9 +29,13 @@
 (define-public emacs-hydra-next
   (with-master-branch emacs-hydra))
 
-(define with-emacs-hydra-next
+(define-public emacs-ace-window-next
+  (with-master-branch emacs-ace-window))
+
+(define with-next-packages
   (package-input-rewriting
-   `((,emacs-hydra . ,emacs-hydra-next))
+   `((,emacs-hydra . ,emacs-hydra-next)
+     (,emacs-ace-window . ,emacs-ace-window-next))
    #:recursive? #t))
 
 (define emacs-esh-autosuggest-next
@@ -226,7 +230,7 @@ Emacs")))
        ("emacs-which-key" ,emacs-which-key)
        ("emacs-insert-char-preview" ,emacs-insert-char-preview)
        ("emacs-mixed-pitch" ,emacs-mixed-pitch)
-       ("emacs-ace-window" ,emacs-ace-window)
+       ("emacs-ace-window" ,emacs-ace-window-next)
        ("emacs-vertico" ,emacs-vertico)
        ("emacs-marginalia" ,emacs-marginalia)
        ("emacs-orderless" ,emacs-orderless)
@@ -268,9 +272,9 @@ Emacs")))
     (arguments
      '(#:include '("oni-lsp.el")))
     (propagated-inputs
-     `(("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))))
+     `(("emacs-lsp-mode" ,(with-next-packages emacs-lsp-mode))
+       ("emacs-lsp-ui" ,(with-next-packages emacs-lsp-ui))
+       ("emacs-lsp-ivy" ,(with-next-packages emacs-lsp-ivy))))
     (synopsis "My Emacs LSP configuration")
     (description "This package provides my configuration for Emacs LSP")))
 
@@ -284,7 +288,7 @@ Emacs")))
      `(("emacs-oni-flycheck" ,emacs-oni-flycheck)
        ("emacs-oni-lsp" ,emacs-oni-lsp)
        ("emacs-reformatter" ,emacs-reformatter)
-       ("emacs-ccls" ,(with-emacs-hydra-next emacs-ccls))
+       ("emacs-ccls" ,(with-next-packages emacs-ccls))
        ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
        ;; For `clang-format'.
        ("clang" ,clang)))
@@ -780,7 +784,7 @@ Emacs")))
      (list emacs-oni-data-dir
            emacs-oni-lsp
            emacs-oni-hydra
-           (with-emacs-hydra-next emacs-lsp-java)
+           (with-next-packages emacs-lsp-java)
            emacs-rainbow-delimiters))
     (synopsis "My configuration for Java")
     (description "This package provides my configuration for writing Java.")))
@@ -912,7 +916,7 @@ Emacs")))
       emacs-yaml-mode
       emacs-oni-flycheck
       emacs-oni-highlight-indent-guides
-      (with-emacs-hydra-next emacs-indent-tools)
+      (with-next-packages emacs-indent-tools)
       emacs-yaml-imenu
       emacs-yaml-pro
       python-yamllint
-- 
cgit v1.3-2-g0d8e