about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--init.el30
1 files changed, 10 insertions, 20 deletions
diff --git a/init.el b/init.el index 358bcb1..e2c851a 100644 --- a/init.el +++ b/init.el
@@ -71,7 +71,7 @@
71 71
72;;; My packages 72;;; My packages
73(when-let ((default-directory 73(when-let ((default-directory
74 (expand-file-name-exists-p "pkg/" user-emacs-directory))) 74 (expand-file-name-exists-p "pkg/" user-emacs-directory)))
75 (normal-top-level-add-subdirs-to-load-path)) 75 (normal-top-level-add-subdirs-to-load-path))
76 76
77 77
@@ -554,10 +554,10 @@
554 (:global "C-=" er/expand-region)) 554 (:global "C-=" er/expand-region))
555 555
556(setup (:straight crux) 556(setup (:straight crux)
557 (:global "M-o" crux-other-window-or-switch-buffer 557 (advice-add 'kill-line :override #'crux-kill-and-join-forward)
558 "C-k" crux-kill-and-join-forward 558 (:global "M-`" crux-other-window-or-switch-buffer
559 "C-o" crux-smart-open-line-above 559 "C-o" crux-smart-open-line
560 "C-S-o" crux-smart-open-line 560 "M-o" crux-smart-open-line-above
561 "C-M-\\" crux-cleanup-buffer-or-region) 561 "C-M-\\" crux-cleanup-buffer-or-region)
562 (crux-reopen-as-root-mode +1)) 562 (crux-reopen-as-root-mode +1))
563 563
@@ -702,9 +702,11 @@ if ripgrep is installed, otherwise `consult-grep'."
702 ;; Projects 702 ;; Projects
703 (:option consult-project-root-function #'vc-root-dir) 703 (:option consult-project-root-function #'vc-root-dir)
704 704
705 ;; Completion in region (at point) 705 ;; Competion-at-point (complete-region)
706 (:option completion-in-region-function #'consult-completion-in-region) 706 (:global "M-/" completion-at-point)
707 ) 707 (:option completion-in-region-function #'consult-completion-in-region
708 completion-cycle-threshold 3
709 tab-always-indent 'complete))
708 710
709(setup (:straight marginalia) 711(setup (:straight marginalia)
710 (:option marginalia-annotators '(marginalia-annotators-heavy 712 (:option marginalia-annotators '(marginalia-annotators-heavy
@@ -792,18 +794,6 @@ if ripgrep is installed, otherwise `consult-grep'."
792 (apheleia--get-formatter-command))) 794 (apheleia--get-formatter-command)))
793 (indent-region (point-min) (point-max))))) 795 (indent-region (point-min) (point-max)))))
794 796
795(setup (:straight (corfu
796 :host github
797 :repo "minad/corfu"))
798 (:option completion-cycle-threshold 3
799 tab-always-indent 'complete
800 corfu-cycle t)
801 (:with-map corfu-map
802 (:bind "TAB" corfu-next
803 "S-TAB" corfu-previous))
804 (:hook-into prog-mode
805 eshell-mode))
806
807;;; Lisps 797;;; Lisps
808(defvar lispy-modes '(emacs-lisp-mode 798(defvar lispy-modes '(emacs-lisp-mode
809 eval-expression-minibuffer 799 eval-expression-minibuffer