From ad3e4a4d608bd27446604ee2457d009a636ad66b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 15 Jan 2020 12:01:23 +0100 Subject: [PATCH] Move rainbow-delimiters face customization to theme-ambrevar. --- .emacs.d/lisp/init-clojure.el | 1 - .emacs.d/lisp/init-lisp.el | 1 - .emacs.d/lisp/init-racket.el | 1 - .emacs.d/lisp/init-rainbow.el | 20 -------------------- .emacs.d/lisp/init-scheme.el | 1 - .emacs.d/lisp/theme-ambrevar.el | 19 +++++++++++++++++++ 6 files changed, 19 insertions(+), 24 deletions(-) delete mode 100644 .emacs.d/lisp/init-rainbow.el diff --git a/.emacs.d/lisp/init-clojure.el b/.emacs.d/lisp/init-clojure.el index b11b9175..c332ce4d 100644 --- a/.emacs.d/lisp/init-clojure.el +++ b/.emacs.d/lisp/init-clojure.el @@ -4,7 +4,6 @@ (dolist (hook '(clojure-mode-hook cider-repl-mode-hook)) (add-hook hook #'ambrevar/init-lispy)) -(require 'init-rainbow) (when (fboundp 'rainbow-delimiters-mode) (dolist (hook '(clojure-mode-hook cider-repl-mode-hook)) (add-hook hook #'rainbow-delimiters-mode))) diff --git a/.emacs.d/lisp/init-lisp.el b/.emacs.d/lisp/init-lisp.el index 58376765..81ef593e 100644 --- a/.emacs.d/lisp/init-lisp.el +++ b/.emacs.d/lisp/init-lisp.el @@ -1,7 +1,6 @@ ;;; Lisp (require 'init-lispy) -(require 'init-rainbow) (defun ambrevar/enhance-imenu-lisp (&rest keywords) "Add define-KEYWORD to `lisp-imenu-generic-expression'." diff --git a/.emacs.d/lisp/init-racket.el b/.emacs.d/lisp/init-racket.el index ebade379..4a186aae 100644 --- a/.emacs.d/lisp/init-racket.el +++ b/.emacs.d/lisp/init-racket.el @@ -1,7 +1,6 @@ ;;; Racket (require 'init-lispy) -(require 'init-rainbow) (add-hook 'racket-mode-hook 'ambrevar/init-lispy) (add-hook 'racket-repl-mode-hook 'ambrevar/init-lispy) diff --git a/.emacs.d/lisp/init-rainbow.el b/.emacs.d/lisp/init-rainbow.el deleted file mode 100644 index ef0921aa..00000000 --- a/.emacs.d/lisp/init-rainbow.el +++ /dev/null @@ -1,20 +0,0 @@ -;; Rainbow delimiters - -(when (require 'rainbow-delimiters nil t) - ;; See https://yoo2080.wordpress.com/2013/09/08/living-with-rainbow-delimiters-mode/. - ;; TODO: The color saturation metioned in the URL fails when running in daemon mode. - ;; https://github.com/Fanael/rainbow-delimiters/issues/36 - (set-face-foreground 'rainbow-delimiters-depth-1-face "#fe1717") - (set-face-foreground 'rainbow-delimiters-depth-2-face "#589cff") - (set-face-foreground 'rainbow-delimiters-depth-3-face "#f1fe52") - (set-face-foreground 'rainbow-delimiters-depth-4-face "#44ff4c") - (set-face-foreground 'rainbow-delimiters-depth-5-face "#83b2ff") - (set-face-foreground 'rainbow-delimiters-depth-6-face "#6161ff") - (set-face-foreground 'rainbow-delimiters-depth-7-face "#35ff35") - (set-face-foreground 'rainbow-delimiters-depth-8-face "#7ca8ff") - (set-face-foreground 'rainbow-delimiters-depth-9-face "#50fec1") - (set-face-attribute 'rainbow-delimiters-unmatched-face nil - :foreground 'unspecified - :inherit 'error - :strike-through t)) -(provide 'init-rainbow) diff --git a/.emacs.d/lisp/init-scheme.el b/.emacs.d/lisp/init-scheme.el index 5f579481..28472bcf 100644 --- a/.emacs.d/lisp/init-scheme.el +++ b/.emacs.d/lisp/init-scheme.el @@ -1,7 +1,6 @@ ;;; Scheme (require 'init-lispy) -(require 'init-rainbow) (add-hook 'scheme-mode-hook 'ambrevar/turn-on-complete-filename) (add-hook 'scheme-mode-hook 'ambrevar/turn-on-tab-width-to-8) ; Because some existing code uses tabs. diff --git a/.emacs.d/lisp/theme-ambrevar.el b/.emacs.d/lisp/theme-ambrevar.el index d36e91c1..d4be87ca 100644 --- a/.emacs.d/lisp/theme-ambrevar.el +++ b/.emacs.d/lisp/theme-ambrevar.el @@ -75,4 +75,23 @@ (with-eval-after-load 'woman (set-face-foreground 'woman-bold (face-foreground 'font-lock-comment-face))) +;; Rainbow delimiters +(with-eval-after-load 'rainbow-delimiters + ;; See https://yoo2080.wordpress.com/2013/09/08/living-with-rainbow-delimiters-mode/. + ;; TODO: The color saturation metioned in the URL fails when running in daemon mode. + ;; https://github.com/Fanael/rainbow-delimiters/issues/36 + (set-face-foreground 'rainbow-delimiters-depth-1-face "#fe1717") + (set-face-foreground 'rainbow-delimiters-depth-2-face "#589cff") + (set-face-foreground 'rainbow-delimiters-depth-3-face "#f1fe52") + (set-face-foreground 'rainbow-delimiters-depth-4-face "#44ff4c") + (set-face-foreground 'rainbow-delimiters-depth-5-face "#83b2ff") + (set-face-foreground 'rainbow-delimiters-depth-6-face "#6161ff") + (set-face-foreground 'rainbow-delimiters-depth-7-face "#35ff35") + (set-face-foreground 'rainbow-delimiters-depth-8-face "#7ca8ff") + (set-face-foreground 'rainbow-delimiters-depth-9-face "#50fec1") + (set-face-attribute 'rainbow-delimiters-unmatched-face nil + :foreground 'unspecified + :inherit 'error + :strike-through t)) + (provide 'theme-ambrevar)