From 084360dd6cae51f00570f7bdac3d8df04966791b Mon Sep 17 00:00:00 2001
From: Raul Benencia <rul@kalgan.cc>
Date: Wed, 21 Apr 2021 22:53:14 -0700
Subject: Use ivy instead of helm/ido

---
 .emacs                      |  5 +++--
 .emacs.local.d/modes/ivy.el | 27 +++++++++++++++++++++++++++
 debian/control              | 10 +++-------
 3 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 .emacs.local.d/modes/ivy.el

diff --git a/.emacs b/.emacs
index a7220ae..7070d42 100644
--- a/.emacs
+++ b/.emacs
@@ -25,9 +25,10 @@
 (load-file "~/.emacs.local.d/modes/flyspell.el")
 (load-file "~/.emacs.local.d/modes/go-lang.el")
 (load-file "~/.emacs.local.d/modes/ibuffer.el")
-(load-file "~/.emacs.local.d/modes/helm.el")
-(load-file "~/.emacs.local.d/modes/ido.el")
+;(load-file "~/.emacs.local.d/modes/helm.el")
+;(load-file "~/.emacs.local.d/modes/ido.el")
 (load-file "~/.emacs.local.d/modes/imenu.el")
+(load-file "~/.emacs.local.d/modes/ivy.el")
 (load-file "~/.emacs.local.d/modes/latex.el")
 (load-file "~/.emacs.local.d/modes/lsp.el")
 (load-file "~/.emacs.local.d/modes/mail-mode.el")
diff --git a/.emacs.local.d/modes/ivy.el b/.emacs.local.d/modes/ivy.el
new file mode 100644
index 0000000..8533676
--- /dev/null
+++ b/.emacs.local.d/modes/ivy.el
@@ -0,0 +1,27 @@
+(use-package ivy
+  :diminish (ivy-mode . "")
+  :init (ivy-mode 1) ; globally at startup
+  :config
+  (setq ivy-use-virtual-buffers t)
+  (setq ivy-height 20)
+  (setq ivy-count-format "%d/%d "))
+(provide 'init-ivy)
+
+;; Override the basic Emacs commands
+(use-package counsel
+  :bind* ; load when pressed
+  (("M-x"     . counsel-M-x)
+   ("C-s"     . swiper)
+   ("C-x C-f" . counsel-find-file)
+   ("C-x C-r" . counsel-recentf)  ; search for recently edited
+   ("C-c g"   . counsel-git)      ; search for files in git repo
+   ("C-c j"   . counsel-git-grep) ; search for regexp in git repo
+   ("C-c /"   . counsel-ag)       ; Use ag for regexp
+   ("C-x l"   . counsel-locate)
+   ("C-x C-f" . counsel-find-file)
+   ("<f1> f"  . counsel-describe-function)
+   ("<f1> v"  . counsel-describe-variable)
+   ("<f1> l"  . counsel-find-library)
+   ("<f2> i"  . counsel-info-lookup-symbol)
+   ("<f2> u"  . counsel-unicode-char)
+   ("C-c C-r" . ivy-resume)))     ; Resume last Ivy-based completion
diff --git a/debian/control b/debian/control
index 071bac8..2376ab2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,23 +2,19 @@ Source: rul-dotfiles-deps
 Section: admin
 Priority: optional
 Maintainer: Raúl Benencia <rul@kalgan.cc>
-Build-Depends: debhelper-compat (= 13),
-               elpa-anzu,
+Build-Depends: elpa-anzu,
                elpa-auto-complete,
                elpa-clues-theme,
                elpa-company,
                elpa-company-lsp,
+               elpa-counsel,
                elpa-debian-el,
                elpa-dpkg-dev-el,
                elpa-fill-column-indicator,
                elpa-flx-ido,
-               elpa-helm,
-               elpa-helm-core,
-               elpa-helm-projectile,
                elpa-ibuffer-vc,
-               elpa-ido-completing-read+,
-               elpa-ido-vertical-mode,
                elpa-imenu-list,
+               elpa-ivy,
                elpa-magit,
                elpa-monokai-theme,
                elpa-neotree,
-- 
cgit v1.2.3