emacs: move ivy configuration to navigation

There's no need to have this in a separate configuration file.

3 files changed, 44 insertions, 42 deletions

diff --git a/emacs.d/custom/fcuny-ivy.el b/emacs.d/custom/fcuny-ivy.el
deleted file mode 100644
index e4c63f7..0000000
--- a/emacs.d/custom/fcuny-ivy.el
+++ /dev/null
@@ -1,40 +0,0 @@
-(use-package counsel
-  :diminish counsel-mode
-  :ensure t
-  :after ivy
-  :init (counsel-mode 1)
-  :bind
-  (("M-x"     . counsel-M-x)
-   ("C-x C-f" . counsel-find-file)
-   ("C-x C-r" . counsel-recentf)
-   ("C-c f"   . counsel-git)
-   ("C-c /"   . counsel-rg)
-   ("C-x r l" . counsel-bookmark))
-  :custom
-  (counsel-find-file-ignore-regexp "\\.git\\|\\.DS_Store\\|\\.localized\\'")
-  (counsel-find-file-at-point t))
-
-(use-package ivy
-  :ensure t
-  :diminish ivy-mode
-  :init (ivy-mode 1)
-  :custom
-  (ivy-use-virtual-buffers t)
-  (ivy-count-format "(%d/%d) ")
-  (ivy-height 20)
-  (ivy-use-selectable-prompt t)
-  :bind (("C-x b"   . ivy-switch-buffer)
-         ("C-s"     . swiper)))
-
-(use-package ivy-rich
-  :ensure t
-  :after (ivy)
-  :config
-  (ivy-rich-mode 1)
-  :custom
-  (ivy-extra-directories '("../" "./"))
-  (ivy-virtual-abbreviate 'full)
-  (ivy-rich-switch-buffer-align-virtual-buffer t)
-  (ivy-rich-path-style 'abbrev))
-
-(provide 'fcuny-ivy)
diff --git a/emacs.d/custom/fcuny-navigation.el b/emacs.d/custom/fcuny-navigation.el
index b325d62..628efe4 100644
--- a/emacs.d/custom/fcuny-navigation.el
+++ b/emacs.d/custom/fcuny-navigation.el
@@ -79,4 +79,48 @@
   (rg-align-line-column-separator "#")
   (rg-align-position-content-separator "|"))
 
+(use-package counsel
+  :diminish counsel-mode
+  :ensure t
+  :after ivy
+  :init (counsel-mode 1)
+  :bind
+  (("M-x"     . counsel-M-x)
+   ("C-x C-f" . counsel-find-file)
+   ("C-x C-r" . counsel-recentf)
+   ("C-c f"   . counsel-git)
+   ("C-c /"   . counsel-rg)
+   ("C-x r l" . counsel-bookmark))
+  :custom
+  (counsel-find-file-ignore-regexp "\\.git\\|\\.DS_Store\\|\\.localized\\'")
+  (counsel-find-file-at-point t))
+
+(use-package ivy
+  :ensure t
+  :diminish ivy-mode
+  :init (ivy-mode 1)
+  :custom
+  (ivy-use-virtual-buffers t)
+  (ivy-count-format "(%d/%d) ")
+  (ivy-height 20)
+  (ivy-use-selectable-prompt t)
+  :bind (("C-x b"   . ivy-switch-buffer)
+         ("C-s"     . swiper)))
+
+(use-package ivy-rich
+  :ensure t
+  :after (ivy)
+  :config
+  (ivy-rich-mode 1)
+  :custom
+  (ivy-extra-directories '("../" "./"))
+  (ivy-virtual-abbreviate 'full)
+  (ivy-rich-switch-buffer-align-virtual-buffer t)
+  (ivy-rich-path-style 'abbrev))
+
+(use-package which-key
+  :ensure t
+  :config
+  (which-key-mode))
+
 (provide 'fcuny-navigation)
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 672306d..6a9e142 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -28,9 +28,7 @@
 
 (require 'fcuny-settings)
 (require 'fcuny-ui)
-(require 'fcuny-hydra)
 (require 'fcuny-defuns)
-(require 'fcuny-ivy)
 (require 'fcuny-navigation)
 (require 'fcuny-edit)
 (require 'fcuny-text)