Change which-key key order

.emacs.d/config.org

@@ -193,7 +193,7 @@ Install and configure packages.
 	(which-key-add-column-padding 1)
 	(which-key-max-display-columns nil)
 	(which-key-min-display-lines 5)
-	(which-key-sort-order 'which-key-prefix-then-key-order)
+	(which-key-sort-order 'dot/which-key-prefix-then-key-order-alpha)
 	(which-key-sort-uppercase-first nil))
 
   (use-package general)
@@ -1082,7 +1082,7 @@ Functions that use package functionality.
 		  name)
 		 )))
 
-	(defun dot/buffer-cleanup ()
+	(defun dot/centaur-tabs-buffer-cleanup ()
 	  "Clean up all the hidden buffers."
 	  (interactive)
 	  (dolist (buffer (buffer-list))
@@ -1091,7 +1091,7 @@ Functions that use package functionality.
 		)
 	  )
 
-	(defun dot/kill-buffer-or-window ()
+	(defun dot/centaur-tabs-kill-buffer-or-window ()
 	  "Delete window of the current buffer, also kill if the buffer is hidden."
 	  (interactive)
 	  (if (centaur-tabs-hide-tab (buffer-name))
@@ -1109,6 +1109,16 @@ Functions that use package functionality.
 		(dashboard-refresh-buffer))
 	  (switch-to-buffer buffer)))
 
+  (with-eval-after-load 'which-key
+	(defun dot/which-key-prefix-then-key-order-alpha (acons bcons)
+	  "Order y prefix, then lexicographical."
+	  (let ((apref? (which-key--group-p (cdr acons)))
+			(bpref? (which-key--group-p (cdr bcons))))
+		(if (not (eq apref? bpref?))
+			(and (not apref?) bpref?)
+		  (which-key-key-order-alpha acons bcons))))
+	)
+
   (defun dashboard-goto-bookmarks ()
 	"Go to bookmarks."
 	(interactive)
@@ -1410,7 +1420,7 @@ General.el ~leader key binds.
 	"b r"       '(revert-buffer                     :which-key "Revert buffer")
 	"b s"       '(basic-save-buffer                 :which-key "Save buffer")
 	"b B"       '(ibuffer                           :which-key "List buffers")
-	"b C"       '(dot/buffer-cleanup         :which-key "Cleanup buffers")
+	"b C"       '(dot/centaur-tabs-buffer-cleanup   :which-key "Cleanup buffers")
 	"b M"       '(bookmark-delete                   :which-key "Delete bookmark")
 	"b S"       '(evil-write-all                    :which-key "Save all buffers")
 	"b <left>"  '(previous-buffer                   :which-key "Previous buffer")
@@ -1509,7 +1519,7 @@ General.el ~leader key binds.
 	"w s"       '(split-follow-horizontally               :which-key "Split horizontal")
 	"w v"       '(split-follow-vertically                 :which-key "Split vertical")
 	"w w"       '(other-window                            :which-key "Focus other window")
-	"w q"       '(dot/kill-buffer-or-window   :which-key "Close window")
+	"w q"       '(dot/centaur-tabs-kill-buffer-or-window  :which-key "Close window")
 	"w <left>"  '(windmove-left                           :which-key "Focus window left")
 	"w <right>" '(windmove-right                          :which-key "Focus window right")
 	"w <up>"    '(windmove-up                             :which-key "Focus window up")