From c3e8f5d5e6fb090fafc12e48f0c25e9fe19f1e06 Mon Sep 17 00:00:00 2001
From: eriedaberrie <eriedaberrie@gmail.com>
Date: Tue, 24 Jan 2023 23:31:15 -0800
Subject: [PATCH] Puni keymaps

---
 init.el | 60 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/init.el b/init.el
index d17b87f..a404019 100644
--- a/init.el
+++ b/init.el
@@ -30,7 +30,7 @@
   (global-set-key (kbd "C-S-z") #'undo-fu-only-redo))
 
 (defun my-meow-undo (arg)
-  "Same as meow-undo, but uses undo-fu to redo if negative prefix"
+  "Same as meow-undo, but uses undo-fu to redo if negative prefix."
   (interactive "P")
   (when (region-active-p)
     (meow--cancel-selection))
@@ -59,7 +59,14 @@
                           '("9" . meow-digit-argument)
                           '("0" . meow-digit-argument)
                           '("/" . meow-keypad-describe-key)
-                          '("?" . meow-cheatsheet))
+                          '("?" . meow-cheatsheet)
+                          '("(" . insert-pair)
+                          '("[" . insert-pair)
+                          '("{" . insert-pair)
+                          '("<" . insert-pair)
+                          '("yy" . meow-clipboard-save)
+                          '("ys" . meow-clipboard-kill)
+                          '("yp" . meow-clipboard-yank))
   (meow-normal-define-key '("0" . meow-expand-0)
                           '("9" . meow-expand-9)
                           '("8" . meow-expand-8)
@@ -112,7 +119,8 @@
                           '("t" . meow-till)
                           '("u" . my-meow-undo)
                           '("U" . meow-undo-in-selection)
-                          '("v" . meow-visit)
+                          '("v" . meow-page-down)
+                          '("V" . meow-page-up)
                           '("w" . meow-mark-word)
                           '("W" . meow-mark-symbol)
                           '("x" . meow-line)
@@ -121,9 +129,29 @@
                           '("Y" . meow-sync-grab)
                           '("z" . meow-pop-selection)
                           '("'" . repeat)
+                          '("/" . meow-visit)
+                          '(">" . meow-forward-slurp)
+                          '("<" . meow-forward-barf)
+                          '("C-<" . meow-backward-slurp)
+                          '("C->" . meow-backward-barf)
+                          '(":" . meow-comment)
+                          '("=" . meow-indent)
                           '("<escape>" . ignore))
   (meow-global-mode))
 
+(use-package puni
+  :hook prog-mode tex-mode
+  :bind (:map puni-mode-map
+              ("C-)" . puni-slurp-forward)
+              ("C-}" . puni-barf-forward)
+              ("C-(" . puni-slurp-backward)
+              ("C-{" . puni-barf-backward)
+              ("C-c p t" . puni-transpose)
+              ("C-c p r" . puni-raise)
+              ("C-c p C-s" . puni-splice)
+              ("C-c p s" . puni-split)
+              ("C-c p z" . puni-squeeze)))
+
 (use-package ace-window
   :bind ("C-c w" . ace-window)
   :custom
@@ -225,18 +253,18 @@
 
 (use-package dap-mode)
 
-;; (use-package dap-java
-;;   :ensure nil
-;;   :hook (java-ts-mode . lsp-deferred)
-;;   :config
-;;   (require '))
+(use-package consult
+  :bind (("M-s r" . consult-ripgrep)
+         ("C-x M-:" . consult-complex-command)
+         ("C-x b" . consult-buffer)
+         ("C-x r b" . consult-bookmark)))
 
 (use-package orderless
   :demand t
   :custom
   (completion-styles '(orderless basic))
   (completion-category-defaults nil)
-  (completion-category-overrides '((file (styles partial-completion)))))
+  (completion-category-overrides '((file (styles . (partial-completion))))))
 
 (use-package marginalia
   :demand t
@@ -255,8 +283,20 @@
   :demand t
   :custom
   (corfu-auto t)
+  (corfu-cycle t)
+  (corfu-preselect-first nil)
+  (corfu-scroll-margin 3)
+  (tab-always-indent 'complete)
   :config
-  (global-corfu-mode))
+  (global-corfu-mode)
+  (add-hook 'minibuffer-setup-hook (lambda ()
+                                     (when (where-is-internal #'completion-at-point
+                                                              (list (current-local-map)))
+                                       (setq-local corfu-echo-display nil
+                                                   corfu-popupinfo-delay nil)
+                                       (corfu-mode 1))))
+  (with-eval-after-load 'meow
+    (add-hook 'meow-insert-exit-hook #'corfu-quit)))
 
 (use-package yasnippet)
 (use-package yasnippet-snippets)