projects
/
~bandali
/
configs
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
emacs: simplify/tweak swiper and counsel use-packages
[~bandali/configs]
/
.emacs.d
/
init.el
diff --git
a/.emacs.d/init.el
b/.emacs.d/init.el
index
8036cf2
..
06fd31f
100644
(file)
--- a/
.emacs.d/init.el
+++ b/
.emacs.d/init.el
@@
-1019,9
+1019,10
@@
This function is intended for use with `ivy-ignore-buffers'."
(ivy-mode 1)
:custom-face
(ivy-mode 1)
:custom-face
+ (ivy-minibuffer-match-face-1 ((t (:background "#eeeeee"))))
(ivy-minibuffer-match-face-2 ((t (:background "#e7e7e7" :weight bold))))
(ivy-minibuffer-match-face-2 ((t (:background "#e7e7e7" :weight bold))))
- (ivy-minibuffer-match-face-3 ((t (:background "
#bbbbff
" :weight semi-bold))))
- (ivy-minibuffer-match-face-4 ((t (:background "
#ffbbff
" :weight semi-bold))))
+ (ivy-minibuffer-match-face-3 ((t (:background "
light goldenrod
" :weight semi-bold))))
+ (ivy-minibuffer-match-face-4 ((t (:background "
misty rose
" :weight semi-bold))))
(ivy-current-match ((((class color) (background light))
:background "#d7d7d7" :foreground "black")
(((class color) (background dark))
(ivy-current-match ((((class color) (background light))
:background "#d7d7d7" :foreground "black")
(((class color) (background dark))
@@
-1030,16
+1031,14
@@
This function is intended for use with `ivy-ignore-buffers'."
(use-package swiper
:demand
:after ivy
(use-package swiper
:demand
:after ivy
- :bind (("C-s" . swiper-isearch)
- ("C-r" . swiper-isearch-backward)
- ("C-S-s" . swiper-isearch)))
+ :bind (("C-S-s" . swiper-isearch)))
(use-package counsel
(use-package counsel
- :
bind (;; ([remap execute-extended-command] . counsel-M-x)
- ;; ([remap find-file] . counsel-find-file)
-
("C-c f r" . counsel-recentf)
+ :
demand
+ :after ivy
+
:bind (
("C-c f r" . counsel-recentf)
:map minibuffer-local-map
:map minibuffer-local-map
-
("C-r" . counsel-minibuffer-history))
+ ("C-r" . counsel-minibuffer-history))
:config
(counsel-mode 1)
(defalias 'locate #'counsel-locate))
:config
(counsel-mode 1)
(defalias 'locate #'counsel-locate))
@@
-1777,7
+1776,7
@@
This function is intended for use with `ivy-ignore-buffers'."
(advice-add 'magit-branch-and-checkout
:after #'my-projectile-invalidate-cache)))
:custom
(advice-add 'magit-branch-and-checkout
:after #'my-projectile-invalidate-cache)))
:custom
-
;;
(projectile-completion-system 'ivy)
+ (projectile-completion-system 'ivy)
(projectile-mode-line-prefix " proj"))
(use-package helpful
(projectile-mode-line-prefix " proj"))
(use-package helpful
@@
-2701,7
+2700,7
@@
https://csclub.uwaterloo.ca/~abandali")
(use-feature erc-pcomplete
:after erc
:custom
(use-feature erc-pcomplete
:after erc
:custom
- (erc-pcomplete-nick-postfix ","))
+ (erc-pcomplete-nick-postfix ",
"))
(use-feature erc-track
:after erc
(use-feature erc-track
:after erc