Switch to ivy

I've tried it for a few months and quite happy with it.

4 files changed, 11 insertions, 95 deletions

diff --git a/lisp/km-helm.el b/lisp/km-helm.el
deleted file mode 100644
index 7195de4..0000000
--- a/lisp/km-helm.el
+++ /dev/null
@@ -1,85 +0,0 @@
-;;; km-helm.el --- Helm configuration
-
-;; Copyright (C) 2012-2020 Kyle Meyer <kyle@kyleam.com>
-
-;; Author: Kyle Meyer <kyle@kyleam.com>
-;; URL: https://git.kyleam.com/emacs.d
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'helm)
-
-;;;###autoload
-(defun km/helm-display-buffer ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-exit-and-execute-action #'display-buffer)))
-
-;;;###autoload
-(defun km/helm-visit-in-dired ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-exit-and-execute-action #'helm-point-file-in-dired)))
-
-;;;###autoload
-(defun km/helm-display-file ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-exit-and-execute-action
-     (lambda (f)
-       (display-buffer (find-file-noselect f))))))
-
-(autoload 'org-open-file "org")
-;;;###autoload
-(defun km/helm-ff-org-open-file ()
-  "Run `org-open-file' from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-exit-and-execute-action #'org-open-file)))
-
-;;;###autoload
-(defun km/helm-display-buffer-below ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-exit-and-execute-action
-     (lambda (b)
-       (display-buffer b '(display-buffer-below-selected))))))
-
-;;;###autoload
-(defun km/helm-find-file-below ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-exit-and-execute-action
-     (lambda (f)
-       (select-window
-        (display-buffer (find-file-noselect f)
-                        '(display-buffer-below-selected)))))))
-
-(defvar km/helm-etags-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "M-.") #'helm-etags-select)
-    map))
-
-(define-minor-mode km/helm-etags-mode
-  "Override `xref-find-definitions' with `helm-etags-select'."
-  :keymap km/helm-etags-mode-map)
-
-(defun km/helm-maybe-override-xref ()
-  (when (helm-etags-find-tag-file-directory default-directory)
-    (km/helm-etags-mode 1)))
-
-(provide 'km-helm)
-;;; km-helm.el ends here
diff --git a/lisp/km-hydra.el b/lisp/km-hydra.el
index 22c4eb8..fcd0716 100644
--- a/lisp/km-hydra.el
+++ b/lisp/km-hydra.el
@@ -162,9 +162,9 @@ _y_ Unmark  _u_ Unmark
   "
   ^^Defining                ^^Applying
 _?_ Query                 _c_ Call
-_b_ Bind to key           _h_ Execute with Helm
-_e_ Edit                  _o_ Call 2nd in ring
-_E_ Step edit             _r_ Apply to region lines
+_b_ Bind to key           _o_ Call 2nd in ring
+_e_ Edit                  _r_ Apply to region lines
+_E_ Step edit
 _N_ Name last
 _l_ Use recent strokes
 _s_ Start defining
@@ -187,7 +187,6 @@ _v_ View
   ("o" kmacro-call-ring-2nd-repeat)
   ("e" kmacro-edit-macro)
   ("E" kmacro-step-edit-macro)
-  ("h" helm-execute-kmacro)
   ("n" kmacro-cycle-ring-next :exit nil)
   ("p" kmacro-cycle-ring-previous :exit nil)
   ("t" kmacro-swap-ring)
diff --git a/lisp/km-outline.el b/lisp/km-outline.el
index 3c9f290..b5b7b2a 100644
--- a/lisp/km-outline.el
+++ b/lisp/km-outline.el
@@ -63,16 +63,12 @@ text is taken as everything on the line after the
         (push (cons head-level head) path-alist)))
     (nreverse index)))
 
-(declare-function helm-imenu "helm-imenu")
 ;;;###autoload
 (defun km/outline-jump-to-heading ()
   "Jump to heading specified by `outline-regexp'."
   (interactive)
-  (let ((imenu-create-index-function #'km/outline-imenu-create-index)
-        helm-cached-imenu-tick
-        helm-cached-imenu-alist
-        helm-cached-imenu-candidates)
-    (call-interactively #'helm-imenu)))
+  (let ((imenu-create-index-function #'km/outline-imenu-create-index))
+    (call-interactively #'imenu)))
 
 (provide 'km-outline)
 ;;; km-outline.el ends here
diff --git a/lisp/km-projectile.el b/lisp/km-projectile.el
index 0d52bdf..cb4d0fe 100644
--- a/lisp/km-projectile.el
+++ b/lisp/km-projectile.el
@@ -208,5 +208,11 @@ Like `projectile-kill-buffers', but
                          (get-buffer-window b)))
          (projectile-project-buffers))))
 
+(defun km/projectile-maybe-activate-xref-etags-mode ()
+  (let ((root (projectile-project-root)))
+    (when (and root
+               (file-exists-p (expand-file-name "TAGS" root)))
+      (xref-etags-mode 1))))
+
 (provide 'km-projectile)
 ;;; km-projectile.el ends here