5 files changed, 17 insertions, 17 deletions
diff --git a/emacs.d/inits/00_bindings.el b/emacs.d/inits/00_bindings.el
index 216d601..ded7005 100644
--- a/emacs.d/inits/00_bindings.el
+++ b/emacs.d/inits/00_bindings.el
@@ -1,4 +1,4 @@
 ;;; some bindings
 (global-set-key (kbd "M-j") 'join-line)
-(global-set-key (kbd "C-x C-b") 'ibuffer)
+(global-set-key (kbd "C-x C-b") 'ivy-switch-buffer)
 (global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen)
diff --git a/emacs.d/inits/20_helm.el b/emacs.d/inits/20_helm.el
index 6795e23..04822a5 100644
--- a/emacs.d/inits/20_helm.el
+++ b/emacs.d/inits/20_helm.el
@@ -1,15 +1,5 @@
 (use-package helm
-  :ensure t
-  :bind (("C-x C-f" . helm-find-files)
-         ("M-x" . helm-M-x))
-  :init
-  (setq helm-display-function
-        (lambda (buf)
-          (split-window-vertically)
-          (other-window 1)
-          (switch-to-buffer buf)))
-  :config
-  (helm-mode))
+  :ensure t)
 
 (use-package helm-ag
   :ensure t)
diff --git a/emacs.d/inits/20_ivy.el b/emacs.d/inits/20_ivy.el
new file mode 100644
index 0000000..cdd488b
--- /dev/null
+++ b/emacs.d/inits/20_ivy.el
@@ -0,0 +1,12 @@
+(use-package swiper
+  :ensure t
+  :diminish ivy-mode
+  :bind ("C-s" . swiper)
+  :config
+  (setq ivy-use-virtual-buffers t)
+  (ivy-mode))
+
+(use-package counsel
+  :ensure t
+  :config
+  (setq counsel-find-file-at-point t))
diff --git a/emacs.d/inits/50_development.el b/emacs.d/inits/50_development.el
index 4c2ae5d..a746355 100644
--- a/emacs.d/inits/50_development.el
+++ b/emacs.d/inits/50_development.el
@@ -11,14 +11,10 @@
   :ensure t
   :init
   (setq projectile-enable-caching t)
+  (setq projectile-completion-system 'ivy)
   :config
   (projectile-global-mode))
 
-(use-package helm-projectile
-  :ensure t
-  :config
-  (helm-projectile-on))
-
 (use-package company
   :ensure t
   :config
diff --git a/emacs.d/inits/50_git.el b/emacs.d/inits/50_git.el
index 5968601..3231df1 100644
--- a/emacs.d/inits/50_git.el
+++ b/emacs.d/inits/50_git.el
@@ -5,4 +5,6 @@
   :bind ("C-x g" . magit-status)
   :config
   (progn
+    (setq magit-completing-read-function 'ivy-completing-read)
+    (setq magit-item-highlight-face 'bold)
     (setenv "GIT_PAGER" "")))