diff --git a/.emacs.d/init.el b/.emacs.d/init.el index c56efd5..d0579f6 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -117,6 +117,18 @@ :bind ("C-;" . avy-goto-char) :bind ("C-'" . avy-goto-char-2)) +(use-package swiper :quelpa + :bind ("C-s" . swiper) + :bind ("C-r" . swiper) + :bind ("C-c C-r" . ivy-resume) + :init + (global-set-key (kbd "C-S-s") 'isearch-forward) + (global-set-key (kbd "C-S-r") 'isearch-backward) + :config + (ivy-mode 1) + (define-key swiper-map (kbd "C-r") 'ivy-previous-line-or-history) + (define-key ivy-minibuffer-map (kbd "C-'") 'ivy-avy)) + (use-package counsel :quelpa :bind ("M-x" . counsel-M-x) :bind ("C-M-y" . counsel-yank-pop) @@ -298,18 +310,6 @@ (company-abort) (call-interactively 'company-yasnippet))) -(use-package swiper - :bind ("C-s" . swiper) - :bind ("C-r" . swiper) - :bind ("C-c C-r" . ivy-resume) - :init - (global-set-key (kbd "C-S-s") 'isearch-forward) - (global-set-key (kbd "C-S-r") 'isearch-backward) - :config - (ivy-mode 1) - (define-key swiper-map (kbd "C-r") 'ivy-previous-line-or-history) - (define-key ivy-minibuffer-map (kbd "C-'") 'ivy-avy)) - (use-package highlight-indent-guides :config (add-hook 'prog-mode-hook 'highlight-indent-guides-mode))