From c84be134273e6baa0633d194c9524658e221ee7f Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sun, 27 Sep 2020 12:06:44 -0400 Subject: Drop use-package along with some unused stuff --- lisp/bandali-ivy.el | 61 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) (limited to 'lisp/bandali-ivy.el') diff --git a/lisp/bandali-ivy.el b/lisp/bandali-ivy.el index 3a67cf1..973323a 100644 --- a/lisp/bandali-ivy.el +++ b/lisp/bandali-ivy.el @@ -24,20 +24,14 @@ ;;; Code: -(use-package ivy - :defer 0.3 - :bind - (:map ivy-minibuffer-map - ([escape] . keyboard-escape-quit) - ([S-up] . ivy-previous-history-element) - ([S-down] . ivy-next-history-element) - ("DEL" . ivy-backward-delete-char)) - :config - (setq ivy-wrap t - ;; ivy-height 14 - ivy-use-virtual-buffers t - ivy-virtual-abbreviate 'abbreviate - ivy-count-format "%d/%d ") +(run-with-idle-timer 0.3 nil #'require 'ivy) +(with-eval-after-load 'ivy + ;; ivy + (csetq ivy-wrap t + ;; ivy-height 14 + ivy-use-virtual-buffers t + ivy-virtual-abbreviate 'abbreviate + ivy-count-format "%d/%d ") (defvar b/ivy-ignore-buffer-modes '(;; dired-mode @@ -52,24 +46,29 @@ This function is intended for use with `ivy-ignore-buffers'." (mode (and buf (buffer-local-value 'major-mode buf)))) (and mode (apply #'provided-mode-derived-p mode b/ivy-ignore-buffer-modes)))) - (add-to-list 'ivy-ignore-buffers 'b/ivy-ignore-buffer-p) - - (ivy-mode 1)) - -(use-package swiper - :demand - :after ivy - :bind (("C-S-s" . swiper-isearch))) - -(use-package counsel - :demand - :after ivy - :bind (("C-c f r" . counsel-recentf) - :map minibuffer-local-map - ("C-r" . counsel-minibuffer-history)) - :config + (add-to-list 'ivy-ignore-buffers #'b/ivy-ignore-buffer-p) + + (define-key ivy-minibuffer-map [escape] #'keyboard-escape-quit) + (define-key ivy-minibuffer-map [S-up] + #'ivy-previous-history-element) + (define-key ivy-minibuffer-map [S-down] + #'ivy-next-history-element) + (define-key ivy-minibuffer-map (kbd "DEL") + #'ivy-backward-delete-char) + + (ivy-mode 1) + + ;; swiper + (require 'swiper) + (global-set-key (kbd "C-S-s") #'swiper-isearch) + + ;; counsel + (require 'counsel) (counsel-mode 1) - (defalias 'locate #'counsel-locate)) + (defalias 'locate #'counsel-locate) + (global-set-key (kbd "C-c f r") #'counsel-recentf) + (define-key minibuffer-local-map + (kbd "C-r") #'counsel-minibuffer-history)) (provide 'bandali-ivy) ;;; bandali-ivy.el ends here -- cgit v1.2.3-60-g2f50