buffers and rustic mode transient

1 files changed, 23 insertions, 37 deletions

diff --git a/custom/jao-custom-programming.el b/custom/jao-custom-programming.el
index 1bf03e4..c26fa45 100644
--- a/custom/jao-custom-programming.el
+++ b/custom/jao-custom-programming.el
@@ -113,11 +113,7 @@
      ("p" "previous error" flymake-goto-prev-error)
      ("c" "consult flymake" consult-flymake)])
 
-  (add-to-list 'display-buffer-alist
-               '("^\\*Flymake diagnostics .*\\*\\'"
-                 (display-buffer-reuse-window jao-display-below-eldoc)
-                 (height . 0.3)
-                 (dedicated . t)))
+  (jao-attach-below-eldoc "^\\*Flymake diagnostics .*\\*\\'" 0.3)
 
   :bind (:map flymake-mode-map (("M-M" . jao-transient-flymake)
                                 ("M-n" . flymake-goto-next-error)
@@ -349,44 +345,34 @@
                        :diagnostics
                        (:disabled ["macro-error"]))))))
 
-  (keymap-popup-define jao-rust
-    :group "cargo"
-    "C" ("Open Cargo.toml" jao-rust-open-cargo)
-    "D" ("Budild docs" jao-rust-build-doc)
-    "k" ("Run clippy" rustic-cargo-clippy)
-    "K" ("Run clippy fix" rustic-cargo-clippy-fix)
-    "f" ("Format" rustic-cargo-fmt)
-    :group "utilities"
-    "F" ("Open flymake diagnostics" flymake-show-project-diagnostics)
-    "e" ("Consult eglot symobs" consult-eglot-symbols)
-    :group "tests"
-    "g" ("Go to tests" jao-rust-goto-tests)
-    "t" ("Current test" jao-rust-test-current)
-    "m" ("Module tests" jao-rust-test-module)
-    "w" ("Workspace tests" jao-rust-test-workspace)
-    "d" ("Doc tests" jao-rust-doctests)
-    "r" ("Retest last" jao-rust-retest))
-
+  (use-package rust-playground :ensure t)
+
+  (jao-transient-major-mode rustic
+    ["cargo"
+     ("C" "Open Cargo.toml" jao-rust-open-cargo)
+     ("D" "Budild docs" jao-rust-build-doc)
+     ("k" "Run clippy" rustic-cargo-clippy)
+     ("K" "Run clippy fix" rustic-cargo-clippy-fix)
+     ("f" "Format" rustic-cargo-fmt)]
+    ["tests"
+     ("g" "Go to tests" jao-rust-goto-tests)
+     ("t" "Current test" jao-rust-test-current)
+     ("m" "Module tests" jao-rust-test-module)
+     ("w" "Workspace tests" jao-rust-test-workspace)
+     ("d" "Doc tests" jao-rust-test-doctests)
+     ("r" "Retest last" jao-rust-retest)]
+    ["utilities"
+     ("F" "Open flymake diagnostics" flymake-show-project-diagnostics)
+     ("e" "Consult eglot symbolss" consult-eglot-symbols)
+     ("p" "Rust playground" rust-playground)])
 
   :custom
   (rustic-cargo-use-last-stored-arguments nil)
   (rustic-cargo-test-runner 'nextest)
   (rustic-cargo-nextest-exec-command '("nextest" "run" "--color=never" "--show-progress=none"))
-  :bind (:map rustic-mode-map (("M-SPC" . jao-rust-popup)
-                               ("C-c t d" . jao-rust-test-doctests)
-                               ("C-c t g" . jao-rust-goto-tests)
-                               ("C-c t w" . jao-rust-test-workspace)
-                               ("C-c t m" . jao-rust-test-module)
-                               ("C-c t r" . jao-rust-retest)
-                               ("C-c t t" . jao-rust-test-current))))
-
-(use-package rust-playground
-  :ensure t)
+  :bind (:map rustic-mode-map (("s-r" . jao-transient-rustic))))
 
-(add-to-list 'display-buffer-alist
-             '("\\*\\(cargo-.+\\|rustic-compilation\\)\\*"
-               (display-buffer-reuse-window jao-display-below-eldoc)
-               (height . 0.5)))
+(jao-attach-below-eldoc "\\*\\(cargo-.+\\|rustic-compilation\\)\\*" 0.5)
 
 ;;;; Clojure
 (use-package clojure-mode