about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--init/bindings.el4
-rw-r--r--init/custom.el2
-rw-r--r--init/nixos.el2
-rw-r--r--init/settings.el26
4 files changed, 13 insertions, 21 deletions
diff --git a/init/bindings.el b/init/bindings.el
index b8af7751f16e..775128bcd221 100644
--- a/init/bindings.el
+++ b/init/bindings.el
@@ -57,7 +57,7 @@
 ;; Open a file in project:
 (global-set-key (kbd "C-c f") 'project-find-file)
 
-;; Interactively filter lines in current buffer:
-(global-set-key (kbd "C-c o") 'helm-occur)
+;; Use swiper instead of isearch
+(global-set-key "\C-s" 'swiper)
 
 (provide 'bindings)
diff --git a/init/custom.el b/init/custom.el
index 5baf33da0fda..474eeae926b0 100644
--- a/init/custom.el
+++ b/init/custom.el
@@ -14,8 +14,6 @@
  '(elnode-send-file-program "/run/current-system/sw/bin/cat")
  '(frame-brackground-mode (quote dark))
  '(global-auto-complete-mode t)
- '(helm-split-window-in-side-p t)
- '(helm-split-window-inside-p t)
  '(kubernetes-commands-display-buffer-function (quote display-buffer))
  '(magit-log-show-gpg-status t)
  '(ns-alternate-modifier (quote none))
diff --git a/init/nixos.el b/init/nixos.el
index 3caeec9a5c01..4a3e4435b6db 100644
--- a/init/nixos.el
+++ b/init/nixos.el
@@ -66,7 +66,7 @@
 
       ;; Launch applications with completion (dmenu style!)
       (exwm-input-set-key (kbd "s-d") #'helm-run-external-command)
-      (exwm-input-set-key (kbd "s-p") #'helm-pass)
+      (exwm-input-set-key (kbd "s-p") #'ivy-pass)
 
       ;; Toggle between line-mode / char-mode
       (exwm-input-set-key (kbd "C-c C-t C-t") #'exwm-input-toggle-keyboard)
diff --git a/init/settings.el b/init/settings.el
index 2324a38f4559..3f55774fa5f0 100644
--- a/init/settings.el
+++ b/init/settings.el
@@ -1,21 +1,15 @@
 (require 'uniquify)
 
-;; Make Helm go!
-(require 'helm-config)
-
-;; Enable fuzzy matching in Helm.
-;; The wiki recommends the first two options for globally enabling fuzzy
-;; matching, however this does not actually work.
-;; Setting all the options helps!
-(setq helm-mode-fuzzy-match t
-      helm-completion-in-region-fuzzy-match t
-      helm-M-x-fuzzy-match t
-      helm-buffers-fuzzy-matching t
-      )
-(global-set-key (kbd "M-x") #'helm-M-x)
-(global-set-key (kbd "C-x r b") #'helm-filtered-bookmarks)
-(global-set-key (kbd "C-x C-f") #'helm-find-files)
-(helm-mode 1)
+;; Make ivy go!
+(ivy-mode 1)
+(counsel-mode 1)
+
+(setq ivy-use-virtual-buffers t)
+(setq enable-recursive-minibuffers t)
+
+;; Enable fuzzy matching in ivy (requires flx installed for sane
+;; ordering)
+(setq ivy-re-builders-alist '((t . ivy--regex-fuzzy)))
 
 ;; Move files to trash when deleting
 (setq delete-by-moving-to-trash t)