From 285bc6cbe4408385458ccc61e94bab3bf6c64610 Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Fri, 23 Jun 2017 12:22:47 -0400 Subject: [PATCH] Move counsel changes to counsel section --- .emacs.d/init.el | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 38c6f9b..1640630 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -236,8 +236,7 @@ ("C-r" . swiper) ("C-c C-r" . ivy-resume) :map swiper-map ("C-r" . ivy-previous-line-or-history) - :map ivy-minibuffer-map ("C-'" . ivy-avy) - :map counsel-find-file-map ("C-M-i" . counsel-find-file-edit-path)) + :map ivy-minibuffer-map ("C-'" . ivy-avy)) :init (bind-key "C-S-s" 'isearch-forward) (bind-key "C-S-r" 'isearch-backward) @@ -264,7 +263,22 @@ (backward-delete-char 1) (error (when ivy-on-del-error-function - (funcall ivy-on-del-error-function)))))) + (funcall ivy-on-del-error-function))))))) + +(use-package ivy-hydra :ensure) + +(use-package counsel :ensure + :bind (("M-x" . counsel-M-x) + ("C-M-y" . counsel-yank-pop) + ("C-x C-f" . counsel-find-file) + :map counsel-find-file-map ("C-M-i" . counsel-find-file-edit-path)) + :init + (bind-key "C-c C-c M-x" 'execute-extended-command) ;;normal M-x. + :config + (setq ivy-re-builders-alist + '((counsel-M-x . ivy--regex-fuzzy) + (t . ivy--regex-plus))) + (assq-delete-all 'counsel-M-x ivy-initial-inputs-alist) (defun counsel-find-file-edit-path () "Edit the current path in ivy find-file" @@ -274,20 +288,6 @@ (ivy--cd "/") (insert old-path)))) -(use-package ivy-hydra :ensure) - -(use-package counsel :ensure - :bind (("M-x" . counsel-M-x) - ("C-M-y" . counsel-yank-pop) - ("C-x C-f" . counsel-find-file)) - :init - (bind-key "C-c C-c M-x" 'execute-extended-command) ;;normal M-x. - :config - (setq ivy-re-builders-alist - '((counsel-M-x . ivy--regex-fuzzy) - (t . ivy--regex-plus))) - (assq-delete-all 'counsel-M-x ivy-initial-inputs-alist)) - (use-package ace-window :ensure :bind ("M-p" . ace-window))