Browse Source

Reverted to base16 color scheme

master
Josh Wolfe 1 year ago
parent
commit
b5fd1991d8
No account linked to committer's email address
1 changed files with 48 additions and 45 deletions
  1. 48
    45
      emacs/.emacs.d/README.org

+ 48
- 45
emacs/.emacs.d/README.org View File

@@ -164,24 +164,42 @@ This should be run regardless of whether I'm in terminal vs gui or dark vs light
(setq wolfe/using-dark (not result)))
#+END_SRC

This checks which setup we're in and calls the appropriate function above.

#+BEGIN_SRC emacs-lisp :tangle yes
(defun hook-if-daemonp (func)
(if (daemonp)
(add-hook 'after-make-frame-functions
(lambda (frame)
(with-selected-frame frame
(funcall func))))
(funcall func)))
#+END_SRC


** Dark

Configuration for my dark theme =base16 default dark= which is loaded by default.

#+BEGIN_SRC emacs-lisp :tangle yes
(defun wolfe/dark-setup ()
(setq evil-emacs-state-cursor `(,"#81a2be" box)
evil-insert-state-cursor `(,"#81a2be" bar)
evil-motion-state-cursor `(,"#85678f" box)
evil-normal-state-cursor `(,"#f8f8f8" box)
evil-replace-state-cursor `(,"#a54242" (hbar . 10))
evil-visual-state-cursor `(,"#ff6000" box))
(load-theme 'my t)
(set-face-attribute 'fringe nil :background nil)
(use-package base16-theme
:config
(load-theme 'base16-default-dark t)
(defvar my/base16-colors base16-default-dark-colors)
(setq evil-emacs-state-cursor `(,(plist-get my/base16-colors :base0D) box)
evil-insert-state-cursor `(,(plist-get my/base16-colors :base0D) bar)
evil-motion-state-cursor `(,(plist-get my/base16-colors :base0E) box)
evil-normal-state-cursor `(,(plist-get my/base16-colors :base07) box)
evil-replace-state-cursor `(,(plist-get my/base16-colors :base08) bar)
evil-visual-state-cursor `(,(plist-get my/base16-colors :base09) box)))

(eval-after-load 'ivy (lambda () (setq ivy-switch-buffer-faces-alist '((dired-mode . ivy-subdir)))))
(hook-if-daemonp (lambda () (set-face-attribute 'fringe nil :background nil)))

(custom-set-faces
'(lazy-highlight ((t (:background "light gray" :foreground "#000000"))))
'(region ((t (:background "gray19"))))
'(org-block ((t (:foreground "#d8d8d8"))))
'(org-done ((t (:box (:line-width 1) :weight bold))))
'(org-level-1 ((t (:inherit outline-1 :height 1.3))))
'(org-todo ((t (:box (:line-width 1) :weight bold))))))
@@ -203,19 +221,8 @@ specified on the command line.

** Display check

This checks which setup we're in and calls the appropriate function above.

#+BEGIN_SRC emacs-lisp :tangle yes
(defun hook-if-daemonp (func)
(if (daemonp)
(add-hook 'after-make-frame-functions
(lambda (frame)
(with-selected-frame frame
(funcall func))))
(funcall func)))
#+END_SRC

#+BEGIN_SRC emacs-lisp :tangle yes
(if wolfe/using-light
(wolfe/light-setup)
(wolfe/dark-setup))
@@ -506,22 +513,16 @@ a custom mode line configuration.

#+BEGIN_SRC emacs-lisp :tangle yes
(if (or (display-graphic-p) (daemonp))
(use-package doom-modeline
:init
(use-package anzu)
(use-package evil-anzu)
(setq evil-normal-state-tag ""
evil-emacs-state-tag ""
evil-insert-state-tag ""
evil-motion-state-tag ""
evil-visual-state-tag ""
evil-operator-state-tag "")
(use-package powerline
:config
(setq doom-modeline-bar-width 3)
(custom-set-faces
`(doom-modeline-bar ((t (:inherit default :background ,(face-foreground 'match))))))
:defer t
:hook (after-init . doom-modeline-init))
(setq powerline-arrow-shape 'curve
powerline-display-buffer-size nil
powerline-display-mule-info nil)
(powerline-default-theme)
(remove-hook 'focus-out-hook 'powerline-unset-selected-window)
(setq powerline-height 24)
(defpowerline powerline-minor-modes ""))

(setq-default
mode-line-format
(list
@@ -1797,16 +1798,18 @@ Autocomplete engine
#+END_SRC

#+BEGIN_SRC emacs-lisp :tangle yes
(require 'color)
(let ((bg (face-attribute 'default :background))
(ac (face-attribute 'match :foreground)))
(custom-set-faces
`(company-tooltip ((t (:inherit default :background ,(color-lighten-name bg 2)))))
`(company-scrollbar-bg ((t (:background ,(color-lighten-name bg 10)))))
`(company-scrollbar-fg ((t (:background ,(color-lighten-name bg 5)))))
`(company-tooltip-selection ((t (:inherit font-lock-function-name-face))))
`(company-tooltip-common ((t (:inherit font-lock-constant-face))))
`(company-preview-common ((t (:foreground ,ac :background ,(color-lighten-name bg 10))))))))
(hook-if-daemonp
(lambda ()
(require 'color)
(let ((bg (face-attribute 'default :background))
(ac (face-attribute 'match :foreground)))
(custom-set-faces
`(company-tooltip ((t (:inherit default :background ,(color-lighten-name bg 2)))))
`(company-scrollbar-bg ((t (:background ,(color-lighten-name bg 10)))))
`(company-scrollbar-fg ((t (:background ,(color-lighten-name bg 5)))))
`(company-tooltip-selection ((t (:inherit font-lock-function-name-face))))
`(company-tooltip-common ((t (:inherit font-lock-constant-face))))
`(company-preview-common ((t (:foreground ,ac :background ,(color-lighten-name bg 10))))))))))
#+END_SRC

** Flycheck Linting

Loading…
Cancel
Save