From b7e63d425a40255df7c8d0bce38c454f21a24f70 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Mon, 19 Apr 2021 23:46:24 -0500
Subject: Change keybindings

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

diff --git a/init.el b/init.el
index d3a4111..816654c 100644
--- a/init.el
+++ b/init.el
@@ -63,7 +63,7 @@
 
 ;;; My packages
 (when-let ((default-directory
-	         (expand-file-name-exists-p "pkg/" user-emacs-directory)))
+             (expand-file-name-exists-p "pkg/" user-emacs-directory)))
   (normal-top-level-add-subdirs-to-load-path))
 
 
@@ -545,10 +545,10 @@
   (:global "C-=" er/expand-region))
 
 (setup (:straight crux)
-  (:global "M-o" crux-other-window-or-switch-buffer
-           "C-k" crux-kill-and-join-forward
-           "C-o" crux-smart-open-line-above
-           "C-S-o" crux-smart-open-line
+  (:advise kill-line :override crux-kill-and-join-forward)
+  (:global "M-`" crux-other-window-or-switch-buffer
+           "C-o" crux-smart-open-line
+           "M-o" crux-smart-open-line-above
            "C-M-\\" crux-cleanup-buffer-or-region)
   (crux-reopen-as-root-mode +1))
 
-- 
cgit 1.4.1-21-gabe81


From ec64f8bdff4600565b398c5219bab3ac311ce511 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Tue, 20 Apr 2021 14:24:03 -0500
Subject: Correct things

---
 init.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.el b/init.el
index 816654c..4cef620 100644
--- a/init.el
+++ b/init.el
@@ -545,7 +545,7 @@
   (:global "C-=" er/expand-region))
 
 (setup (:straight crux)
-  (:advise kill-line :override crux-kill-and-join-forward)
+  (advice-add 'kill-line :override #'crux-kill-and-join-forward)
   (:global "M-`" crux-other-window-or-switch-buffer
            "C-o" crux-smart-open-line
            "M-o" crux-smart-open-line-above
@@ -605,7 +605,7 @@ call `zzz-to-char'."
 (setup (:straight (vertico
                    :host github
                    :repo "minad/vertico"))
-  (setq resize-mini-windows t)
+  (setq resize-mini-windows 'grow-only)
   (if (boundp 'comp-deferred-compilation-deny-list)
       (add-to-list 'comp-deferred-compilation-deny-list "vertico"))
   (icomplete-mode -1)
-- 
cgit 1.4.1-21-gabe81


From 4a9252b1144b548703df4c1c51141e38284b2381 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Tue, 20 Apr 2021 14:24:23 -0500
Subject: Use company for completion-in-region instead of corfu

I found out it does completion-in-region, and honestly, it's a better
interface, and more uniform.
---
 init.el | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/init.el b/init.el
index 4cef620..6627a82 100644
--- a/init.el
+++ b/init.el
@@ -691,7 +691,13 @@ if ripgrep is installed, otherwise `consult-grep'."
            xref-show-definitions-function #'consult-xref)
 
   ;; Projects
-  (:option consult-project-root-function #'vc-root-dir))
+  (:option consult-project-root-function #'vc-root-dir)
+
+  ;; Competion-at-point (complete-region)
+  (:global "M-/" completion-at-point)
+  (:option completion-in-region-function #'consult-completion-in-region
+           completion-cycle-threshold 3
+           tab-always-indent 'complete))
 
 (setup (:straight marginalia)
   (:option marginalia-annotators '(marginalia-annotators-heavy
@@ -779,18 +785,6 @@ if ripgrep is installed, otherwise `consult-grep'."
                      (apheleia--get-formatter-command)))
       (indent-region (point-min) (point-max)))))
 
-(setup (:straight (corfu
-                   :host github
-                   :repo "minad/corfu"))
-  (:option completion-cycle-threshold 3
-           tab-always-indent 'complete
-           corfu-cycle t)
-  (:with-map corfu-map
-    (:bind "TAB" corfu-next
-           "S-TAB" corfu-previous))
-  (:hook-into prog-mode
-              eshell-mode))
-
 ;;; Lisps
 (defvar lispy-modes '(emacs-lisp-mode
                       eval-expression-minibuffer
-- 
cgit 1.4.1-21-gabe81