From 5727b6d24f2e462d53d2c44f50bd5b07276eb024 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Tue, 17 Dec 2019 11:46:41 +0000
Subject: refactor(emacs.d): Move ivy configuration to use-package

---
 tools/emacs/config/bindings.el |  6 ------
 tools/emacs/config/init.el     | 32 +++++++++++++++++++++++++++++++-
 tools/emacs/config/settings.el | 14 --------------
 3 files changed, 31 insertions(+), 21 deletions(-)

(limited to 'tools')

diff --git a/tools/emacs/config/bindings.el b/tools/emacs/config/bindings.el
index 9b98d5893f..8f54d9cf55 100644
--- a/tools/emacs/config/bindings.el
+++ b/tools/emacs/config/bindings.el
@@ -5,9 +5,6 @@
 ;; What does <tab> do? Well, it depends ...
 (define-key prog-mode-map (kbd "<tab>") #'company-indent-or-complete-common)
 
-;; Counsel stuff:
-(global-set-key (kbd "C-c r g") 'counsel-rg)
-
 ;; imenu instead of insert-file
 (global-set-key (kbd "C-x i") 'imenu)
 
@@ -40,7 +37,4 @@
 ;; Open a file in project:
 (global-set-key (kbd "C-c f") 'project-find-file)
 
-;; Use swiper instead of isearch
-(global-set-key "\C-s" 'swiper)
-
 (provide 'bindings)
diff --git a/tools/emacs/config/init.el b/tools/emacs/config/init.el
index 83621a99f9..bf36f6651a 100644
--- a/tools/emacs/config/init.el
+++ b/tools/emacs/config/init.el
@@ -36,6 +36,11 @@
   :hook ((prog-mode . company-mode))
   :config (setq company-tooltip-align-annotations t))
 
+(use-package counsel
+  :after (ivy)
+  :config (counsel-mode 1)
+  :bind (("C-c r g" . counsel-rg)))
+
 (use-package dash)
 (use-package dash-functional)
 (use-package dottime :config (dottime-display-mode t))
@@ -43,18 +48,43 @@
 (use-package ht)
 (use-package hydra)
 (use-package idle-highlight-mode :hook ((prog-mode . idle-highlight-mode)))
+
+(use-package ivy
+  :config
+  (ivy-mode 1)
+  (setq enable-recursive-minibuffers t)
+  (setq ivy-use-virtual-buffers t))
+
+(use-package ivy-pass :after (ivy))
+
+(use-package ivy-prescient
+  :after (ivy prescient)
+  :config
+  (ivy-prescient-mode))
+
+(use-package multiple-cursors)
+
 (use-package paredit :hook ((lisp-mode . paredit-mode)
                             (emacs-lisp-mode . paredit-mode)))
-(use-package multiple-cursors)
+
 (use-package pinentry
   :config
   (setq epa-pinentry-mode 'loopback)
   (pinentry-start))
 
+(use-package prescient
+  :after (ivy counsel)
+  :config (prescient-persist-mode))
+
 (use-package rainbow-delimiters :hook (prog-mode . rainbow-delimiters-mode))
 (use-package rainbow-mode)
 (use-package s)
 (use-package string-edit)
+
+(use-package swiper
+  :after (counsel ivy)
+  :bind (("C-s" . swiper)))
+
 (use-package telephone-line) ;; configuration happens outside of use-package
 (use-package term-switcher)
 (use-package undo-tree :config (global-undo-tree-mode))
diff --git a/tools/emacs/config/settings.el b/tools/emacs/config/settings.el
index 0bcf73b0e7..274dcdde35 100644
--- a/tools/emacs/config/settings.el
+++ b/tools/emacs/config/settings.el
@@ -1,18 +1,4 @@
-(require 'prescient)
-(require 'ivy-prescient)
 (require 'uniquify)
-(require 'ivy-pass)
-
-;; Make ivy go!
-(ivy-mode 1)
-(counsel-mode 1)
-
-(setq ivy-use-virtual-buffers t)
-(setq enable-recursive-minibuffers t)
-
-;; Enable support for prescient in ivy & configure it
-(ivy-prescient-mode)
-(prescient-persist-mode)
 
 ;; Move files to trash when deleting
 (setq delete-by-moving-to-trash t)
-- 
cgit 1.4.1