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)) transmission-refresh-interval 1))
;;; Theme ;;; Theme
(if (ignore-errors (load-theme 'cyberpunk 'no-confirm)) (cond
(progn ((require 'doom-themes nil :noerror)
;; REVIEW: Backport unmerged changes. See (load-theme 'doom-one :no-confirm))
;; https://github.com/n3mo/cyberpunk-theme.el/issues/46.
(set-face-attribute 'lazy-highlight nil ((ignore-errors (load-theme 'cyberpunk :no-confirm))
:underline '(:color "yellow") ;; Backport unmerged changes. See
:foreground 'unspecified ;; https://github.com/n3mo/cyberpunk-theme.el/issues/46.
:background 'unspecified) (set-face-attribute 'lazy-highlight nil
(with-eval-after-load 'magit :underline '(:color "yellow")
(let ((cyberpunk-green-2 "#006400")) :foreground 'unspecified
(set-face-background 'diff-refine-added cyberpunk-green-2))) :background 'unspecified)
(with-eval-after-load 'org (with-eval-after-load 'magit
(set-face-attribute 'org-level-1 nil :height 1.1) (let ((cyberpunk-green-2 "#006400"))
(set-face-attribute 'org-level-2 nil :height 1.0) (set-face-background 'diff-refine-added cyberpunk-green-2)))
(set-face-attribute 'org-level-3 nil :height 1.0))) (with-eval-after-load 'org
(require 'theme-ambrevar)) (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 ;;; Translator
(when (require 'google-translate nil t) (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. ;;; Change mode-line color by Evil state.
(setq evil-default-modeline-color (cons (face-background 'mode-line) (or (face-foreground 'mode-line) "black"))) (setq evil-default-modeline-color (cons (face-background 'mode-line) (or (face-foreground 'mode-line) "black")))
(defun ambrevar/evil-color-modeline () (defun ambrevar/evil-color-modeline ()
(let ((color (cond ((minibufferp) evil-default-modeline-color) ;; Doom themes already have support for Evil.
((evil-insert-state-p) '("#006fa0" . "#ffffff")) ; 00bb00 (if (string-prefix-p "doom" (symbol-name (car custom-enabled-themes)))
((evil-emacs-state-p) '("#444488" . "#ffffff")) (remove-hook 'post-command-hook 'ambrevar/evil-color-modeline)
(t evil-default-modeline-color)))) (let ((color (cond ((minibufferp) evil-default-modeline-color)
(set-face-background 'mode-line (car color)) ((evil-insert-state-p) '("#006fa0" . "#ffffff")) ; 00bb00
(set-face-foreground 'mode-line (cdr color)))) ((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) (add-hook 'post-command-hook 'ambrevar/evil-color-modeline)
(setq evil-mode-line-format nil) (setq evil-mode-line-format nil)