From 1a509a861a8b576c520252d520d2fd0056e05c6d Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Wed, 25 Apr 2018 20:02:24 +0100 Subject: Moving counsel away --- emacs/loader.org | 118 +++++++++++++++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/emacs/loader.org b/emacs/loader.org index 002210c..b7104f7 100644 --- a/emacs/loader.org +++ b/emacs/loader.org @@ -173,65 +173,6 @@ using the emacsclient. (global-set-key (kbd "C-:") 'avy-goto-char) (global-set-key (kbd "C-'") 'avy-goto-char-2)) #+END_SRC - -*** Ivy / Swiper / Counsel - -#+BEGIN_SRC - (use-package counsel - :ensure t - :bind - (("M-x" . counsel-M-x) - ("M-y" . counsel-yank-pop) - :map ivy-minibuffer-map - ("M-y" . ivy-next-line))) - - (use-package swiper - :pin melpa-stable - :diminish ivy-mode - :ensure t - :bind* - (("C-s" . swiper) - ("C-c C-r" . ivy-resume) - ("C-x C-f" . counsel-find-file) - ("C-c h f" . counsel-describe-function) - ("C-c h v" . counsel-describe-variable) - ("C-c i u" . counsel-unicode-char) - ("M-i" . counsel-imenu) - ("C-c g" . counsel-git) - ("C-c j" . counsel-git-grep) - ("C-c k" . counsel-ag) - ;; ("C-c l" . scounsel-locate) - ) - :config - (progn - (ivy-mode 1) - (setq ivy-use-virtual-buffers t) - (define-key read-expression-map (kbd "C-r") #'counsel-expression-history) - (ivy-set-actions - 'counsel-find-file - '(("d" (lambda (x) (delete-file (expand-file-name x))) - "delete" - ))) - (ivy-set-actions - 'ivy-switch-buffer - '(("k" - (lambda (x) - (kill-buffer x) - (ivy--reset-state ivy-last)) - "kill") - ("j" - ivy--switch-buffer-other-window-action - "other window"))))) - - (use-package counsel-projectile - :ensure t - :config - (counsel-projectile-mode)) - - (use-package ivy-hydra :ensure t) - -#+END_SRC - *** Helm #+BEGIN_SRC emacs-lisp @@ -912,3 +853,62 @@ Setting the gc-cons threshold back to what it was at the beginning. (setq gc-cons-threshold 10000000) #+END_SRC + +* Not used anymore +** Ivy / Swiper / Counsel + +#+BEGIN_SRC + (use-package counsel + :ensure t + :bind + (("M-x" . counsel-M-x) + ("M-y" . counsel-yank-pop) + :map ivy-minibuffer-map + ("M-y" . ivy-next-line))) + + (use-package swiper + :pin melpa-stable + :diminish ivy-mode + :ensure t + :bind* + (("C-s" . swiper) + ("C-c C-r" . ivy-resume) + ("C-x C-f" . counsel-find-file) + ("C-c h f" . counsel-describe-function) + ("C-c h v" . counsel-describe-variable) + ("C-c i u" . counsel-unicode-char) + ("M-i" . counsel-imenu) + ("C-c g" . counsel-git) + ("C-c j" . counsel-git-grep) + ("C-c k" . counsel-ag) + ;; ("C-c l" . scounsel-locate) + ) + :config + (progn + (ivy-mode 1) + (setq ivy-use-virtual-buffers t) + (define-key read-expression-map (kbd "C-r") #'counsel-expression-history) + (ivy-set-actions + 'counsel-find-file + '(("d" (lambda (x) (delete-file (expand-file-name x))) + "delete" + ))) + (ivy-set-actions + 'ivy-switch-buffer + '(("k" + (lambda (x) + (kill-buffer x) + (ivy--reset-state ivy-last)) + "kill") + ("j" + ivy--switch-buffer-other-window-action + "other window"))))) + + (use-package counsel-projectile + :ensure t + :config + (counsel-projectile-mode)) + + (use-package ivy-hydra :ensure t) + +#+END_SRC -- cgit