Merge branch 'main' of https://tildegit.org/acdw/emacs

1 files changed, 10 insertions, 20 deletions

@@ -71,7 +71,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))
 
 
@@ -554,10 +554,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
+  (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
            "C-M-\\" crux-cleanup-buffer-or-region)
   (crux-reopen-as-root-mode +1))
 
@@ -702,9 +702,11 @@ if ripgrep is installed, otherwise `consult-grep'."
   ;; Projects
   (:option consult-project-root-function #'vc-root-dir)
 
-  ;; Completion in region (at point)
-  (:option completion-in-region-function #'consult-completion-in-region)
-  )
+  ;; 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
@@ -792,18 +794,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