summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmin Bandali <amin@aminb.org>2018-04-28 16:34:58 -0400
committerAmin Bandali <amin@aminb.org>2018-04-28 16:34:58 -0400
commitf77522237eccc8f969831966bdefe26ca073774f (patch)
tree1c408cec501a37cd3f6caf1206ee18fbe8e2d0bd
parent7538956fa487b757a40080ee145b9e2abb4142c6 (diff)
downloadconfigs-f77522237eccc8f969831966bdefe26ca073774f.tar.gz
configs-f77522237eccc8f969831966bdefe26ca073774f.tar.xz
configs-f77522237eccc8f969831966bdefe26ca073774f.zip
[emacs] enable Ivy and friends
Diffstat (limited to '')
-rw-r--r--.gitmodules7
-rw-r--r--init.org46
m---------lib/ivy0
m---------lib/smex0
4 files changed, 30 insertions, 23 deletions
diff --git a/.gitmodules b/.gitmodules
index 2ce5dbb..c2b378c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,6 +37,10 @@
[submodule "git-modes"]
path = lib/git-modes
url = git@github.com:magit/git-modes.git
+[submodule "ivy"]
+ path = lib/ivy
+ url = git@github.com:abo-abo/swiper.git
+ info-path = doc
[submodule "magit"]
path = lib/magit
url = git@github.com:magit/magit.git
@@ -53,6 +57,9 @@
[submodule "packed"]
path = lib/packed
url = git@github.com:emacscollective/packed.git
+[submodule "smex"] # used by counsel-M-x
+ path = lib/smex
+ url = git@github.com:nonsequitur/smex.git
[submodule "undo-tree"]
path = lib/undo-tree
url = git@github.com:emacsorphanage/undo-tree.git
diff --git a/init.org b/init.org
index 55e8269..2f5380e 100644
--- a/init.org
+++ b/init.org
@@ -519,39 +519,39 @@ There's no way I could top that, so I won't attempt to.
**** Ivy
#+begin_src emacs-lisp
-;; (use-package ivy
-;; :bind
-;; (:map ivy-minibuffer-map
-;; ([escape] . keyboard-escape-quit)
-;; ("C-j" . ivy-next-line)
-;; ("C-k" . ivy-previous-line)
-;; ([S-up] . ivy-previous-history-element)
-;; ([S-down] . ivy-next-history-element)
-;; ("DEL" . ivy-backward-delete-char))
-;; :config
-;; (ivy-mode 1))
+(use-package ivy
+ :bind
+ (:map ivy-minibuffer-map
+ ([escape] . keyboard-escape-quit)
+ ("C-j" . ivy-next-line)
+ ("C-k" . ivy-previous-line)
+ ([S-up] . ivy-previous-history-element)
+ ([S-down] . ivy-next-history-element)
+ ("DEL" . ivy-backward-delete-char))
+ :config
+ (ivy-mode 1))
#+end_src
**** Swiper
#+begin_src emacs-lisp
-;; (use-package swiper
-;; :bind (([remap isearch-forward] . swiper)
-;; ([remap isearch-backward] . swiper)))
+(use-package swiper
+ :bind (([remap isearch-forward] . swiper)
+ ([remap isearch-backward] . swiper)))
#+end_src
**** Counsel
#+begin_src emacs-lisp
-;; (use-package counsel
-;; :bind (([remap execute-extended-command] . counsel-M-x)
-;; ([remap find-file] . counsel-find-file)
-;; ("s-r" . counsel-recentf)
-;; :map minibuffer-local-map
-;; ("C-r" . counsel-minibuffer-history))
-;; :config
-;; (counsel-mode 1)
-;; (defalias 'locate #'counsel-locate))
+(use-package counsel
+ :bind (([remap execute-extended-command] . counsel-M-x)
+ ([remap find-file] . counsel-find-file)
+ ("s-r" . counsel-recentf)
+ :map minibuffer-local-map
+ ("C-r" . counsel-minibuffer-history))
+ :config
+ (counsel-mode 1)
+ (defalias 'locate #'counsel-locate))
#+end_src
* Borg's =layer/essentials=
diff --git a/lib/ivy b/lib/ivy
new file mode 160000
+Subproject 84989c05b33c7aaedeae21e81121f4bf848f379
diff --git a/lib/smex b/lib/smex
new file mode 160000
+Subproject 55aaebe3d793c2c990b39a302eb26c184281c42