From 88fdf32074e17ed3a7e37591d481ab5609234979 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Wed, 4 May 2016 13:24:01 +0100
Subject: [PATCH] Add swiper for C-s searches instead of phi-search

---
 modules/siren-phi-search.el |  2 --
 modules/siren-swiper.el     | 24 ++++++++++++++++++++++++
 siren-modules.el            |  1 +
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 modules/siren-swiper.el

diff --git a/modules/siren-phi-search.el b/modules/siren-phi-search.el
index b44a595..87a4c11 100644
--- a/modules/siren-phi-search.el
+++ b/modules/siren-phi-search.el
@@ -9,8 +9,6 @@
 (siren-require-packages '(phi-search))
 
 (require 'phi-search)
-(global-set-key (kbd "C-s") 'phi-search)
-(global-set-key (kbd "C-r") 'phi-search-backward)
 
 (provide 'siren-phi-search)
 ;;; siren-phi-search.el ends here
diff --git a/modules/siren-swiper.el b/modules/siren-swiper.el
new file mode 100644
index 0000000..07c0a9c
--- /dev/null
+++ b/modules/siren-swiper.el
@@ -0,0 +1,24 @@
+;;; siren-swiper.el --- jimeh's Emacs Siren: swiper configuration.
+
+;;; Commentary:
+
+;; Basic configuration for swiper.
+
+;;; Code:
+
+(siren-require-packages '(swiper))
+
+(require 'swiper)
+
+(ivy-mode 1)
+(setq ivy-use-virtual-buffers t)
+
+(global-set-key (kbd "C-s") 'swiper)
+(global-set-key (kbd "C-c C-r") 'ivy-resume)
+
+(custom-set-faces
+ '(ivy-current-match ((t (:background "#7e9fc9" :foreground "black"))))
+ '(swiper-line-face ((t (:background "#313c4d")))))
+
+(provide 'siren-swiper)
+;;; siren-swiper.el ends here
diff --git a/siren-modules.el b/siren-modules.el
index a148e35..8b2d22e 100644
--- a/siren-modules.el
+++ b/siren-modules.el
@@ -29,6 +29,7 @@
 (require 'siren-scroll-half-screen)
 (require 'siren-smartparens)
 (require 'siren-smex)
+(require 'siren-swiper)
 (require 'siren-text-manipulation)
 (require 'siren-window-management)
 (require 'siren-yasnippet)