5 files changed, 20 insertions(+), 94 deletions(-)

M init.el
M lisp/setup-dev.el
D lisp/setup-helm.el
A lisp/setup-ivy.el
M lisp/setup-keys.el

@@ 21,7 21,7 @@
 (load "~/.emacs.d/lisp/setup-appearance")
 (load "~/.emacs.d/lisp/setup-org")
 (load "~/.emacs.d/lisp/setup-dev")
-(load "~/.emacs.d/lisp/setup-helm")
+(load "~/.emacs.d/lisp/setup-ivy.el")
 (load "~/.emacs.d/lisp/setup-defaults")
 (load "~/.emacs.d/lisp/setup-lisp")
 (load "~/.emacs.d/lisp/setup-python")

@@ 126,13 126,12 @@
     (evil-define-key '(normal motion) 'global (kbd "M-]") 'rtags-location-stack-forward)
     (use-package company-rtags)
     (use-package flycheck-rtags)
-    (use-package helm-rtags)
     (setq rtags-autostart-diagnostics t
           rtags-completions-enabled t)
     (with-eval-after-load 'company
       ;; (push 'company-rtags company-backends)
       (add-to-list 'company-backends 'company-rtags))
-    (setq rtags-display-result-backend 'helm)))
+    (setq rtags-display-result-backend 'ivy)))
 
 
 (use-package zeal-at-point

@@ 1,89 0,0 @@
-;;; Helm: incremental completion and selection narrowing framework
-(use-package helm
-  :defer nil
-  :bind
-  (("M-x" . helm-M-x)
-   ("C-x r b" . helm-filtered-bookmarks)
-   ("C-x C-f" . helm-find-files)
-   :map mode-specific-map
-   ("SPC" . helm-M-x)
-   :map helm-map
-   ("M-j" . helm-next-line)
-   ("M-k" . helm-previous-line)
-   ("C-h" . helm-next-source)
-   ("C-S-h" . describe-key)
-   ([escape] . helm-keyboard-quit)
-   ("<tab>" . helm-execute-persistent-action)
-   ("C-i" . helm-execute-persistent-action)
-   ("C-l" . helm-execute-persistent-action)
-   :map helm-find-files-map
-   ("C-l" . helm-execute-persistent-action)
-   ("C-h" . helm-find-files-up-one-level)
-   ("M-l" . helm-execute-persistent-action)
-   ("M-h" . helm-find-files-up-one-level)
-   :map helm-read-file-map
-   ("C-l" . helm-execute-persistent-action)
-   ("C-h" . helm-find-files-up-one-level)
-   ("M-l" . helm-execute-persistent-action)
-   ("M-h" . helm-find-files-up-one-level))
-  :config
-  (progn
-    (require 'helm-config)
-    (when (executable-find "curl")
-      (setq helm-net-prefer-curl t))
-    (add-hook 'helm-after-initialize-hook
-              ;; hide the cursor in helm buffers
-              (lambda ()
-                (with-helm-buffer
-                  (setq cursor-in-non-selected-windows nil))))
-    (helm-mode 1)))
-
-
-;;; Helm extension for yasnippet
-(use-package helm-c-yasnippet
-  :after (yasnippet helm)
-  :init
-  (progn
-    (setq helm-yas-space-match-any-greedy t)))
-
-
-;;; Helm extension for gtags
-(use-package helm-gtags
-  :commands (helm-gtags-mode)
-  :init
-  (progn
-    (setq helm-gtags-ignore-case t
-          helm-gtags-auto-update t
-          helm-gtags-use-input-at-cursor t
-          helm-gtags-pulse-at-cursor t
-          helm-gtags-prefix-key (kbd "C-c g")
-          helm-gtags-suggested-key-mapping t)
-    (add-hook 'dired-mode-hook 'helm-gtags-mode)
-    (add-hook 'eshell-mode-hook 'helm-gtags-mode)
-    (add-hook 'asm-made-hook 'helm-gtags-mode))
-  :config
-  (progn
-    (evil-define-key 'normal helm-gtags-mode-map (kbd "C-c g a")
-      'helm-gtags-tags-in-this-function)
-    (evil-define-key 'normal helm-gtags-mode-map (kbd "C-j")
-      'helm-gtags-select)
-    (evil-define-key 'normal helm-gtags-mode-map (kbd "M-.")
-      'helm-gtags-dwim)
-    (evil-define-key 'normal helm-gtags-mode-map (kbd "M-,")
-      'helm-gtags-pop-stack)
-    (evil-define-key 'normal helm-gtags-mode-map (kbd "C-c <")
-      'helm-gtags-previous-history)
-    (evil-define-key 'normal helm-gtags-mode-map (kbd "C-c >")
-      'helm-gtags-next-history)))
-
-
-;;; Helm extension for projectile
-(use-package helm-projectile
-  :after (projectile helm)
-  :config
-  (helm-projectile-on)
-  (setq projectile-completion-system 'helm)
-  (setq projectile-indexing-method 'alien))
-
-
-(use-package helm-pass)

@@ 0,0 1,16 @@
+(use-package ivy)
+
+
+(use-package counsel
+  :defer nil
+  :bind
+  ("C-x b" . counsel-ibuffer)
+  :config
+  (progn
+    (counsel-mode)))
+
+
+(use-package counsel-projectile
+  :config
+  (progn
+    (counsel-projectile-mode)))

@@ 8,8 8,8 @@
   :config
   (progn
     (require 'evil)
-    (define-key evil-ex-map "b " 'helm-mini)
-    (define-key evil-ex-map "e " 'helm-find-files)
+    (define-key evil-ex-map "b " #'counsel-ibuffer)
+    (define-key evil-ex-map "e " #'counsel-find-file)
     (add-hook 'with-editor-mode-hook 'evil-insert-state)
     (evil-global-set-key 'normal (kbd "SPC") mode-specific-map)
     (evil-global-set-key 'motion (kbd "SPC") mode-specific-map)