mirrors
/
ambevar-dotfiles
mirror of https://gitlab.com/ambrevar/dotfiles/
1
0
Fork 0
Code Issues Releases Wiki Activity

Emacs: Support doom-one, doom-modeline.

master
Pierre Neidhardt 2021-02-04 21:05:16 +01:00
parent 725306494c
commit f859612295
2 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.emacs.d/init.el
View File

@ -342,22 +342,29 @@
transmission-refresh-interval 1))
;;; Theme
(if (ignore-errors (load-theme 'cyberpunk 'no-confirm))
(progn
;; REVIEW: Backport unmerged changes. See
;; https://github.com/n3mo/cyberpunk-theme.el/issues/46.
(set-face-attribute 'lazy-highlight nil
:underline '(:color "yellow")
:foreground 'unspecified
:background 'unspecified)
(with-eval-after-load 'magit
(let ((cyberpunk-green-2 "#006400"))
(set-face-background 'diff-refine-added cyberpunk-green-2)))
(with-eval-after-load 'org
(set-face-attribute 'org-level-1 nil :height 1.1)
(set-face-attribute 'org-level-2 nil :height 1.0)
(set-face-attribute 'org-level-3 nil :height 1.0)))
(require 'theme-ambrevar))
(cond
((require 'doom-themes nil :noerror)
(load-theme 'doom-one :no-confirm))
((ignore-errors (load-theme 'cyberpunk :no-confirm))
;; Backport unmerged changes. See
;; https://github.com/n3mo/cyberpunk-theme.el/issues/46.
(set-face-attribute 'lazy-highlight nil
:underline '(:color "yellow")
:foreground 'unspecified
:background 'unspecified)
(with-eval-after-load 'magit
(let ((cyberpunk-green-2 "#006400"))
(set-face-background 'diff-refine-added cyberpunk-green-2)))
(with-eval-after-load 'org
(set-face-attribute 'org-level-1 nil :height 1.1)
(set-face-attribute 'org-level-2 nil :height 1.0)
(set-face-attribute 'org-level-3 nil :height 1.0)))
(require 'theme-ambrevar))
;;; Modeline.
(when (require 'doom-modeline nil :noerror)
(doom-modeline-mode))
;;; Translator
(when (require 'google-translate nil t)

15
.emacs.d/lisp/init-evil.el
View File

@ -66,12 +66,15 @@
;;; Change mode-line color by Evil state.
(setq evil-default-modeline-color (cons (face-background 'mode-line) (or (face-foreground 'mode-line) "black")))
(defun ambrevar/evil-color-modeline ()
(let ((color (cond ((minibufferp) evil-default-modeline-color)
((evil-insert-state-p) '("#006fa0" . "#ffffff")) ; 00bb00
((evil-emacs-state-p) '("#444488" . "#ffffff"))
(t evil-default-modeline-color))))
(set-face-background 'mode-line (car color))
(set-face-foreground 'mode-line (cdr color))))
;; Doom themes already have support for Evil.
(if (string-prefix-p "doom" (symbol-name (car custom-enabled-themes)))
(remove-hook 'post-command-hook 'ambrevar/evil-color-modeline)
(let ((color (cond ((minibufferp) evil-default-modeline-color)
((evil-insert-state-p) '("#006fa0" . "#ffffff")) ; 00bb00
((evil-emacs-state-p) '("#444488" . "#ffffff"))
(t evil-default-modeline-color))))
(set-face-background 'mode-line (car color))
(set-face-foreground 'mode-line (cdr color)))))
(add-hook 'post-command-hook 'ambrevar/evil-color-modeline)
(setq evil-mode-line-format nil)