Update swiper configuration and colours

This commit is contained in:
Wojciech Kozlowski 2017-09-02 22:15:42 +01:00
parent fb01451ce3
commit 871daa612d
4 changed files with 32 additions and 4 deletions

View File

@ -107,11 +107,11 @@
refresh these colours."
(when (and (fboundp 'fci-mode)
fci-mode)
(member 'fci-mode minor-mode-list))
(fci-mode 1))
(when (and (fboundp 'highlight-parentheses-mode)
(highlight-parentheses-mode))
highlight-parentheses-mode)
(highlight-parentheses-mode 1)))
;; Key-bindings -------------------------------------------------------------

View File

@ -127,6 +127,6 @@
(use-package swiper-helm
:defer t
:bind
(("M-s M-s" . swiper-helm))))
(("C-c h C-s" . swiper-helm))))
)

View File

@ -29,6 +29,7 @@
rust-mode
sr-speedbar
stickyfunc-enhance
swiper
yasnippet)
)
@ -170,6 +171,15 @@
(global-set-key (kbd "M-m") #'goto-speedbar))
;; --------------------------------------------------------------------------
;; Configure `swiper'.
;; --------------------------------------------------------------------------
(use-package swiper
:defer t
:bind
(("M-s M-s" . swiper)))
;; --------------------------------------------------------------------------
;; Enable yasnippet.
;; --------------------------------------------------------------------------

View File

@ -46,6 +46,9 @@
(*fg-standout* (if (eq variant 'dark) "#FFEC99" "#551A8B"))
(*fringe* (if (eq variant 'dark) "#0A1721" "#F2F2F2"))
(*head1* (if (eq variant 'dark) "#4F97D7" "#3A81C3"))
(*head2* (if (eq variant 'dark) "#2D9574" "#2D9574"))
(*head3* (if (eq variant 'dark) "#67B11D" "#67B11D"))
(*head4* (if (eq variant 'dark) "#AF81F4" "#AF81F4"))
(*header-bg* (if (eq variant 'dark) "#495765" "#E2DAEF"))
(*keywords* (if (eq variant 'dark) "#8AC6F2" "#A020F0"))
(*light-purple* (if (eq variant 'dark) "#FFCCFF" "#FFCCFF"))
@ -167,7 +170,7 @@
;; Highglight
`(highlight-numbers-number ((t (:foreground, *keywords*))))
`(highlight-symbol-face ((t (:background, *bg-3*))))
`(highlight-symbol-face ((t (:background, *blue-bg*))))
;; whitespace
`(whitespace-space ((t (:foreground ,*whitespace-fg*))))
@ -379,6 +382,21 @@
`(helm-swoop-target-line-face ((t (:background ,*current-line*))))
`(helm-swoop-target-word-face ((t (:background ,*current-line* :foreground ,*mat*))))
;; swiper
`(swiper-line-face ((t (:background ,*current-line* :inherit bold))))
`(swiper-match-face-1 ((t (:inherit bold :underline t))))
`(swiper-match-face-2 ((t (:foreground ,*head1* :underline t))))
`(swiper-match-face-3 ((t (:foreground ,*head4* :underline t))))
`(swiper-match-face-4 ((t (:foreground ,*head3* :underline t))))
;; ivy
`(ivy-current-match ((t (:background ,*current-line* :inherit bold))))
`(ivy-minibuffer-match-face-1 ((t (:inherit bold))))
`(ivy-minibuffer-match-face-2 ((t (:foreground ,*head1* :underline t))))
`(ivy-minibuffer-match-face-3 ((t (:foreground ,*head4* :underline t))))
`(ivy-minibuffer-match-face-4 ((t (:foreground ,*head3* :underline t))))
`(ivy-remote ((t (:foreground ,*cyan*))))
)
;; Define values for colours that don't use faces.