Commit 48f8a4b8c1f7
Changed files (3)
config/setup-style.el
@@ -185,12 +185,16 @@
(defun set-light-theme ()
"Set the light theme with some customization if needed."
(interactive)
- (load-theme 'shortbrain-light t))
+ (use-package shortbrain-light-theme
+ :config
+ (load-theme 'shortbrain-light t)))
(defun set-dark-theme ()
"Set the dark theme with some customization if needed."
(interactive)
- (load-theme 'shortbrain t))
+ (use-package shortbrain-theme
+ :config
+ (load-theme 'shortbrain t)))
(defun theme-switcher ()
(interactive)
lisp/shortbrain-light-theme.el
@@ -71,6 +71,20 @@
(primary-800 . "#028080")
(primary-900 . "#006666")
+ ;; Greens
+ (default-green . "#0be541")
+ (green . "#0be441")
+ (green-50 . "#e7feec")
+ (green-100 . "#b6fcc7")
+ (green-200 . "#85f9a2")
+ (green-300 . "#3cf66b")
+ (green-400 . "#0be441")
+ (green-500 . "#0adb3f")
+ (green-600 . "#09c338")
+ (green-700 . "#08aa31")
+ (green-800 . "#07922a")
+ (green-900 . "#067a23")
+
;; Reds
(default-red. "#f24965")
(red . "#f24965")
@@ -144,6 +158,14 @@
(error-fg (shortbrain-light-theme-color 'white))
(error-bg (shortbrain-light-theme-color 'red))
+ ;; Org
+ (org-color-1 (shortbrain-light-theme-color 'green-900))
+ (org-color-2 (shortbrain-light-theme-color 'purple))
+ (org-color-3 (shortbrain-light-theme-color 'primary-700))
+ (org-color-4 (shortbrain-light-theme-color 'primary-500))
+ (org-color-5 (shortbrain-light-theme-color 'primary-400))
+ (org-meta-fg (shortbrain-light-theme-color 'primary-900))
+
;; Language syntax highlighting
(variable-fg (shortbrain-light-theme-color 'black))
(function-fg (shortbrain-light-theme-color 'grey-900))
@@ -203,6 +225,16 @@
`(font-lock-variable-name-face ((,class (:foreground ,variable-fg))))
`(font-lock-warning-face ((,class (:foreground ,warning-fg :background ,warning-bg))))
+ ;; Org
+ `(org-level-1 ((,class (:foreground ,org-color-1 :bold t :height 1.2))))
+ `(org-level-2 ((,class (:foreground ,org-color-2 :bold t :height 1.1))))
+ `(org-level-3 ((,class (:foreground ,org-color-3 :bold t :height 1.0))))
+ `(org-level-4 ((,class (:foreground ,org-color-4 :bold t :height 1.0))))
+ `(org-level-5 ((,class (:foreground ,org-color-5 :bold t :height 1.0))))
+ `(org-level-6 ((,class (:foreground ,org-color-5 :bold t :height 1.0))))
+ `(org-document-title ((,class (:bold t :foreground ,org-meta-fg :height 1.4))))
+ `(org-meta-line ((,class (:foreground ,org-meta-fg :bold t))))
+
;; Avy
`(avy-lead-face ((,class (:background ,search-bg-0 :foreground ,search-fg))))
`(avy-lead-face-0 ((,class (:background ,search-bg-1 :foreground ,search-fg))))
emacs.org
@@ -1601,12 +1601,12 @@
:hook (after-init . mouse-wheel-mode))
#+end_src
-** TODO Theme
+** Theme
:PROPERTIES:
:CUSTOM_ID: h:18fcf62d-a919-4614-803d-f5d28bc47985
:END:
-*** TODO My own theme :ATTACH:
+*** My own theme :ATTACH:
:PROPERTIES:
:CUSTOM_ID: h:1a7c1e91-d3c5-4395-b956-8001a1a1a393
:ID: 83bc2073-0681-4fe9-bcf7-3070bd1ab695
@@ -1627,7 +1627,287 @@
I wrote two version, a dark one and a light one. I currently mainly use the light theme
(as this is when I do work 😅).
-- dark theme
+**** Light theme
+
+ [[att:2020-03-03-21-57-41.png]]
+
+ #+begin_src emacs-lisp :tangle lisp/shortbrain-light-theme.el
+ ;;; shortbrain-light-theme.el --- A calm, light, almost monochrome color theme based on emacs-shortbrain-theme.
+
+ ;; Copyright (C) 2020 Vincent Demeester <vincent@sbr.pm>
+
+ ;; Author: Vincent Demeester <vincent@sbr.pm>
+ ;; Keywords: themes
+ ;; URL: https://github.com/vdemeester/emacs-config
+ ;; Version: 2020.03
+ ;; Package-Requires: ((emacs "24.1"))
+
+ ;; This program is free software; you can redistribute it and/or modify
+ ;; it under the terms of the GNU General Public License as published by
+ ;; the Free Software Foundation, either version 3 of the License, or
+ ;; (at your option) any later version.
+
+ ;; This program is distributed in the hope that it will be useful,
+ ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ;; GNU General Public License for more details.
+
+ ;; You should have received a copy of the GNU General Public License
+ ;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ ;;; Commentary:
+
+ ;; To use the shortbrain-light theme, add the following to your Emacs
+ ;; configuration file:
+ ;;
+ ;; (load-theme 'shortbrain-light)
+ ;;
+ ;; Requirements: Emacs 24.
+
+ ;;; Code:
+
+
+ (deftheme shortbrain-light "A calm, light, almost monochrome color theme")
+
+
+ (defconst shortbrain-light-theme-colors
+ '(;; Basics
+ (white . "#ffffff")
+
+ ;; Greys
+ (default-grey . "#0f1619")
+ (grey . "#0f1619")
+ (grey-50 . "#fdfdfe")
+ (grey-100 . "#f5f8fa")
+ (grey-200 . "#d8dcde")
+ (grey-300 . "#bcc0c2")
+ (grey-400 . "#9fa3a6")
+ (grey-500 . "#9fa3a6")
+ (grey-600 . "#656b6e")
+ (grey-700 . "#494f52")
+ (grey-720 . "#474d50")
+ (grey-800 . "#2c3236")
+ (grey-820 . "#1e2428")
+ (grey-850 . "#1d2226")
+ (grey-900 . "#0f1619")
+
+ ;; Primaries
+ (default-primary . "#0be5e5")
+ (primary . "#0be5e5")
+ (primary-50 . "#f3fefe")
+ (primary-100 . "#d4fafa")
+ (primary-200 . "#91f3f3")
+ (primary-300 . "#4eecec")
+ (primary-400 . "#0be5e5")
+ (primary-500 . "#09cccc")
+ (primary-600 . "#07b3b3")
+ (primary-700 . "#059999")
+ (primary-800 . "#028080")
+ (primary-900 . "#006666")
+
+ ;; Greens
+ (default-green . "#0be541")
+ (green . "#0be441")
+ (green-50 . "#e7feec")
+ (green-100 . "#b6fcc7")
+ (green-200 . "#85f9a2")
+ (green-300 . "#3cf66b")
+ (green-400 . "#0be441")
+ (green-500 . "#0adb3f")
+ (green-600 . "#09c338")
+ (green-700 . "#08aa31")
+ (green-800 . "#07922a")
+ (green-900 . "#067a23")
+
+ ;; Reds
+ (default-red. "#f24965")
+ (red . "#f24965")
+ (danger . "#f24965")
+ (red-50 . "#fff0f2")
+ (red-100 . "#ffd9df")
+ (red-200 . "#fba9b6")
+ (red-300 . "#f6798e")
+ (red-400 . "#f24965")
+ (red-500 . "#d6455d")
+ (red-600 . "#ba4054")
+ (red-700 . "#9e3c4c")
+ (red-800 . "#823743")
+ (red-900 . "#66333b")
+
+ ;; Purples
+ (purple . "#b965e8")))
+
+
+ (defun shortbrain-light-theme-color (name)
+ "Return the shortbrain-light theme color with the given NAME."
+ (cdr (assoc name shortbrain-light-theme-colors)))
+
+
+ (let ((class '((class color) (min-colors 256)))
+ (default-fg (shortbrain-light-theme-color 'grey-900))
+ (default-bg (shortbrain-light-theme-color 'grey-50))
+ (inactive-bg (shortbrain-light-theme-color 'grey-200))
+ (minor-fg (shortbrain-light-theme-color 'grey-200))
+ (minor-bg (shortbrain-light-theme-color 'grey-50))
+ (inactive-fg (shortbrain-light-theme-color 'grey-600))
+ (border-fg (shortbrain-light-theme-color 'grey-200))
+ (frame-fg (shortbrain-light-theme-color 'grey-500))
+ (cursor-fg (shortbrain-light-theme-color 'grey-900))
+ (cursor-bg (shortbrain-light-theme-color 'grey-300))
+
+ ;; Scrollbars
+ (scrollbar-fg (shortbrain-light-theme-color 'grey-600))
+ (scrollbar-bg (shortbrain-light-theme-color 'grey-100))
+
+ ;; Highlighting
+ (highlight-fg (shortbrain-light-theme-color 'white))
+ (highlight-bg (shortbrain-light-theme-color 'red))
+
+ ;; Current line
+ (hl-line-bg (shortbrain-light-theme-color 'grey-100))
+
+ ;; Search
+ (search-fg (shortbrain-light-theme-color 'white))
+ (search-bg (shortbrain-light-theme-color 'primary-600))
+ (search-bg-0 (shortbrain-light-theme-color 'primary-500))
+ (search-bg-1 (shortbrain-light-theme-color 'primary-400))
+ (search-bg-2 (shortbrain-light-theme-color 'primary-300))
+ (search-bg-3 (shortbrain-light-theme-color 'primary-100))
+
+ ;; Selection
+ (selection-bg (shortbrain-light-theme-color 'grey-200))
+
+ ;; Auto-completion
+ (completion-fg (shortbrain-light-theme-color 'grey-500))
+ (completion-bg (shortbrain-light-theme-color 'grey-800))
+ (completion-match-fg (shortbrain-light-theme-color 'red-500))
+ (completion-mouse-fg (shortbrain-light-theme-color 'white))
+ (completion-selection-fg (shortbrain-light-theme-color 'red-500))
+ (completion-selection-bg (shortbrain-light-theme-color 'grey-200))
+ (completion-annotation-fg (shortbrain-light-theme-color 'red-400))
+
+ ;; Warnings & errors
+ (warning-fg (shortbrain-light-theme-color 'white))
+ (warning-bg (shortbrain-light-theme-color 'red-600))
+ (error-fg (shortbrain-light-theme-color 'white))
+ (error-bg (shortbrain-light-theme-color 'red))
+
+ ;; Org
+ (org-color-1 (shortbrain-light-theme-color 'green-900))
+ (org-color-2 (shortbrain-light-theme-color 'purple))
+ (org-color-3 (shortbrain-light-theme-color 'primary-700))
+ (org-color-4 (shortbrain-light-theme-color 'primary-500))
+ (org-color-5 (shortbrain-light-theme-color 'primary-400))
+ (org-meta-fg (shortbrain-light-theme-color 'primary-900))
+
+ ;; Language syntax highlighting
+ (variable-fg (shortbrain-light-theme-color 'black))
+ (function-fg (shortbrain-light-theme-color 'grey-900))
+ (type-fg (shortbrain-light-theme-color 'grey-700))
+ (constant-fg (shortbrain-light-theme-color 'grey-600))
+ (keyword-fg (shortbrain-light-theme-color 'grey-500))
+ (builtin-fg (shortbrain-light-theme-color 'grey-400))
+ (string-fg (shortbrain-light-theme-color 'grey-600))
+ (doc-fg (shortbrain-light-theme-color 'primary-600))
+ (doc-bg (shortbrain-light-theme-color 'grey-50)))
+ (custom-theme-set-faces
+ 'shortbrain-light
+ ;; Regular
+ `(cursor ((,class (:foreground ,cursor-fg :background ,cursor-bg))))
+ `(default ((,class (:foreground ,default-fg :background ,default-bg))))
+ `(default-italic ((,class (:italic t))))
+
+ ;; Emacs UI
+ `(fringe ((,class (:foreground ,error-fg :background ,default-bg))))
+ `(header-line ((,class :background ,default-bg)))
+ `(linum ((,class (:inherit shadow :background ,default-bg))))
+ `(mode-line ((,class (:foreground ,frame-fg :background ,default-bg
+ :box (:line-width -1 :color ,default-bg)))))
+ `(mode-line-inactive ((,class (:foreground ,inactive-fg :background ,inactive-bg
+ :box (:line-width -1 :color ,inactive-bg)))))
+ `(nlinum-relative-current-face ((,class (:foreground ,frame-fg :background ,default-bg))))
+ `(vertical-border ((,class (:foreground ,border-fg :background ,default-bg))))
+
+ ;; Highlighting
+ `(highlight ((,class (:foreground ,highlight-fg :background ,highlight-bg))))
+ `(hl-line ((,class (:background ,hl-line-bg))))
+
+ ;; Search
+ `(isearch ((,class (:foreground ,search-fg :background ,search-bg :weight bold))))
+ `(lazy-highlight ((,class (:foreground ,highlight-fg :background ,highlight-bg) :weight normal)))
+
+ ;; Selection
+ `(region ((,class (:background ,selection-bg))))
+
+ ;; Erroneous whitespace
+ `(whitespace-line ((,class (:foreground ,error-fg :background ,error-bg))))
+ `(whitespace-space ((,class (:foreground ,builtin-fg :background ,hl-line-bg))))
+ `(whitespace-tab ((,class (:foreground ,builtin-fg :background ,hl-line-bg))))
+
+ ;; Language syntax highlighting
+ `(font-lock-builtin-face ((,class (:foreground ,builtin-fg))))
+ `(font-lock-comment-face ((,class (:foreground ,doc-fg :background ,doc-bg))))
+ `(font-lock-comment-delimiter-face ((,class (:foreground ,minor-fg, :background ,minor-bg))))
+ `(font-lock-constant-face ((,class (:foreground ,constant-fg))))
+ `(font-lock-doc-face ((,class (:foreground ,doc-fg))))
+ `(font-lock-function-name-face ((,class (:foreground ,function-fg))))
+ `(font-lock-keyword-face ((,class (:foreground ,keyword-fg))))
+ `(font-lock-negation-char-face ((,class (:foreground ,error-fg))))
+ `(font-lock-preprocessor-face ((,class (:foreground ,builtin-fg))))
+ `(font-lock-string-face ((,class (:foreground ,string-fg))))
+ `(font-lock-type-face ((,class (:foreground ,type-fg))))
+ `(font-lock-variable-name-face ((,class (:foreground ,variable-fg))))
+ `(font-lock-warning-face ((,class (:foreground ,warning-fg :background ,warning-bg))))
+
+ ;; Org
+ `(org-level-1 ((,class (:foreground ,org-color-1 :bold t :height 1.2))))
+ `(org-level-2 ((,class (:foreground ,org-color-2 :bold t :height 1.1))))
+ `(org-level-3 ((,class (:foreground ,org-color-3 :bold t :height 1.0))))
+ `(org-level-4 ((,class (:foreground ,org-color-4 :bold t :height 1.0))))
+ `(org-level-5 ((,class (:foreground ,org-color-5 :bold t :height 1.0))))
+ `(org-level-6 ((,class (:foreground ,org-color-5 :bold t :height 1.0))))
+ `(org-document-title ((,class (:bold t :foreground ,org-meta-fg :height 1.4))))
+ `(org-meta-line ((,class (:foreground ,org-meta-fg :bold t))))
+
+ ;; Avy
+ `(avy-lead-face ((,class (:background ,search-bg-0 :foreground ,search-fg))))
+ `(avy-lead-face-0 ((,class (:background ,search-bg-1 :foreground ,search-fg))))
+ `(avy-lead-face-1 ((,class (:background ,search-bg-2 :foreground ,search-fg))))
+ `(avy-lead-face-2 ((,class (:background ,search-bg-3 :foreground ,search-fg))))
+
+ ;; Company (auto-completion)
+ `(company-preview ((,class (:background ,default-bg :foreground ,completion-match-fg))))
+ `(company-preview-common ((,class (:background ,completion-bg :foreground ,completion-fg))))
+ `(company-preview-search ((,class (:background ,completion-bg :foreground ,completion-fg))))
+ `(company-scrollbar-bg ((,class (:background ,scrollbar-bg))))
+ `(company-scrollbar-fg ((,class (:background ,scrollbar-fg))))
+ `(company-tooltip ((,class (:background ,completion-bg :foreground ,completion-fg))))
+ `(company-tooltip-annotation ((,class (:foreground ,completion-annotation-fg))))
+ `(company-tooltip-common ((,class (:background nil :foreground ,completion-match-fg))))
+ `(company-tooltip-common-selection ((,class (:foreground ,completion-selection-fg
+ :background ,completion-selection-bg))))
+ `(company-tooltip-mouse ((,class (:background ,selection-bg :foreground ,completion-mouse-fg))))
+ `(company-tooltip-search ((,class (:foreground ,completion-match-fg))))
+ `(company-tooltip-selection ((,class (:background ,selection-bg :foreground nil))))))
+
+
+ ;;;###autoload
+ (when (and (boundp 'custom-theme-load-path)
+ load-file-name)
+ ;; add theme folder to `custom-theme-load-path' when installing over MELPA
+ (add-to-list 'custom-theme-load-path
+ (file-name-as-directory (file-name-directory load-file-name))))
+
+
+ (provide-theme 'shortbrain-light)
+ (provide 'shortbrain-light-theme)
+
+
+ ;;; shortbrain-light-theme.el ends here
+
+ #+end_src
+
+**** Dark theme
[[att:2020-03-03-21-59-22.png]]
@@ -1869,254 +2149,6 @@
;;; shortbrain-theme.el ends here
#+end_src
-- light theme
-
- [[att:2020-03-03-21-57-41.png]]
-
- #+begin_src emacs-lisp :tangle lisp/shortbrain-light-theme.el
- ;;; shortbrain-light-theme.el --- A calm, light, almost monochrome color theme based on emacs-shortbrain-theme.
-
- ;; Copyright (C) 2020 Vincent Demeester <vincent@sbr.pm>
-
- ;; Author: Vincent Demeester <vincent@sbr.pm>
- ;; Keywords: themes
- ;; URL: https://github.com/vdemeester/emacs-config
- ;; Version: 2020.03
- ;; Package-Requires: ((emacs "24.1"))
-
- ;; This program is free software; you can redistribute it and/or modify
- ;; it under the terms of the GNU General Public License as published by
- ;; the Free Software Foundation, either version 3 of the License, or
- ;; (at your option) any later version.
-
- ;; This program is distributed in the hope that it will be useful,
- ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
- ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ;; GNU General Public License for more details.
-
- ;; You should have received a copy of the GNU General Public License
- ;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- ;;; Commentary:
-
- ;; To use the shortbrain-light theme, add the following to your Emacs
- ;; configuration file:
- ;;
- ;; (load-theme 'shortbrain-light)
- ;;
- ;; Requirements: Emacs 24.
-
- ;;; Code:
-
-
- (deftheme shortbrain-light "A calm, light, almost monochrome color theme")
-
-
- (defconst shortbrain-light-theme-colors
- '(;; Basics
- (white . "#ffffff")
-
- ;; Greys
- (default-grey . "#0f1619")
- (grey . "#0f1619")
- (grey-50 . "#fdfdfe")
- (grey-100 . "#f5f8fa")
- (grey-200 . "#d8dcde")
- (grey-300 . "#bcc0c2")
- (grey-400 . "#9fa3a6")
- (grey-500 . "#9fa3a6")
- (grey-600 . "#656b6e")
- (grey-700 . "#494f52")
- (grey-720 . "#474d50")
- (grey-800 . "#2c3236")
- (grey-820 . "#1e2428")
- (grey-850 . "#1d2226")
- (grey-900 . "#0f1619")
-
- ;; Primaries
- (default-primary . "#0be5e5")
- (primary . "#0be5e5")
- (primary-50 . "#f3fefe")
- (primary-100 . "#d4fafa")
- (primary-200 . "#91f3f3")
- (primary-300 . "#4eecec")
- (primary-400 . "#0be5e5")
- (primary-500 . "#09cccc")
- (primary-600 . "#07b3b3")
- (primary-700 . "#059999")
- (primary-800 . "#028080")
- (primary-900 . "#006666")
-
- ;; Reds
- (default-red. "#f24965")
- (red . "#f24965")
- (danger . "#f24965")
- (red-50 . "#fff0f2")
- (red-100 . "#ffd9df")
- (red-200 . "#fba9b6")
- (red-300 . "#f6798e")
- (red-400 . "#f24965")
- (red-500 . "#d6455d")
- (red-600 . "#ba4054")
- (red-700 . "#9e3c4c")
- (red-800 . "#823743")
- (red-900 . "#66333b")
-
- ;; Purples
- (purple . "#b965e8")))
-
-
- (defun shortbrain-light-theme-color (name)
- "Return the shortbrain-light theme color with the given NAME."
- (cdr (assoc name shortbrain-light-theme-colors)))
-
-
- (let ((class '((class color) (min-colors 256)))
- (default-fg (shortbrain-light-theme-color 'grey-900))
- (default-bg (shortbrain-light-theme-color 'grey-50))
- (inactive-bg (shortbrain-light-theme-color 'grey-200))
- (minor-fg (shortbrain-light-theme-color 'grey-200))
- (minor-bg (shortbrain-light-theme-color 'grey-50))
- (inactive-fg (shortbrain-light-theme-color 'grey-600))
- (border-fg (shortbrain-light-theme-color 'grey-200))
- (frame-fg (shortbrain-light-theme-color 'grey-500))
- (cursor-fg (shortbrain-light-theme-color 'grey-900))
- (cursor-bg (shortbrain-light-theme-color 'grey-300))
-
- ;; Scrollbars
- (scrollbar-fg (shortbrain-light-theme-color 'grey-600))
- (scrollbar-bg (shortbrain-light-theme-color 'grey-100))
-
- ;; Highlighting
- (highlight-fg (shortbrain-light-theme-color 'white))
- (highlight-bg (shortbrain-light-theme-color 'red))
-
- ;; Current line
- (hl-line-bg (shortbrain-light-theme-color 'grey-100))
-
- ;; Search
- (search-fg (shortbrain-light-theme-color 'white))
- (search-bg (shortbrain-light-theme-color 'primary-600))
- (search-bg-0 (shortbrain-light-theme-color 'primary-500))
- (search-bg-1 (shortbrain-light-theme-color 'primary-400))
- (search-bg-2 (shortbrain-light-theme-color 'primary-300))
- (search-bg-3 (shortbrain-light-theme-color 'primary-100))
-
- ;; Selection
- (selection-bg (shortbrain-light-theme-color 'grey-200))
-
- ;; Auto-completion
- (completion-fg (shortbrain-light-theme-color 'grey-500))
- (completion-bg (shortbrain-light-theme-color 'grey-800))
- (completion-match-fg (shortbrain-light-theme-color 'red-500))
- (completion-mouse-fg (shortbrain-light-theme-color 'white))
- (completion-selection-fg (shortbrain-light-theme-color 'red-500))
- (completion-selection-bg (shortbrain-light-theme-color 'grey-200))
- (completion-annotation-fg (shortbrain-light-theme-color 'red-400))
-
- ;; Warnings & errors
- (warning-fg (shortbrain-light-theme-color 'white))
- (warning-bg (shortbrain-light-theme-color 'red-600))
- (error-fg (shortbrain-light-theme-color 'white))
- (error-bg (shortbrain-light-theme-color 'red))
-
- ;; Language syntax highlighting
- (variable-fg (shortbrain-light-theme-color 'black))
- (function-fg (shortbrain-light-theme-color 'grey-900))
- (type-fg (shortbrain-light-theme-color 'grey-700))
- (constant-fg (shortbrain-light-theme-color 'grey-600))
- (keyword-fg (shortbrain-light-theme-color 'grey-500))
- (builtin-fg (shortbrain-light-theme-color 'grey-400))
- (string-fg (shortbrain-light-theme-color 'grey-600))
- (doc-fg (shortbrain-light-theme-color 'primary-600))
- (doc-bg (shortbrain-light-theme-color 'grey-50)))
- (custom-theme-set-faces
- 'shortbrain-light
- ;; Regular
- `(cursor ((,class (:foreground ,cursor-fg :background ,cursor-bg))))
- `(default ((,class (:foreground ,default-fg :background ,default-bg))))
- `(default-italic ((,class (:italic t))))
-
- ;; Emacs UI
- `(fringe ((,class (:foreground ,error-fg :background ,default-bg))))
- `(header-line ((,class :background ,default-bg)))
- `(linum ((,class (:inherit shadow :background ,default-bg))))
- `(mode-line ((,class (:foreground ,frame-fg :background ,default-bg
- :box (:line-width -1 :color ,default-bg)))))
- `(mode-line-inactive ((,class (:foreground ,inactive-fg :background ,inactive-bg
- :box (:line-width -1 :color ,inactive-bg)))))
- `(nlinum-relative-current-face ((,class (:foreground ,frame-fg :background ,default-bg))))
- `(vertical-border ((,class (:foreground ,border-fg :background ,default-bg))))
-
- ;; Highlighting
- `(highlight ((,class (:foreground ,highlight-fg :background ,highlight-bg))))
- `(hl-line ((,class (:background ,hl-line-bg))))
-
- ;; Search
- `(isearch ((,class (:foreground ,search-fg :background ,search-bg :weight bold))))
- `(lazy-highlight ((,class (:foreground ,highlight-fg :background ,highlight-bg) :weight normal)))
-
- ;; Selection
- `(region ((,class (:background ,selection-bg))))
-
- ;; Erroneous whitespace
- `(whitespace-line ((,class (:foreground ,error-fg :background ,error-bg))))
- `(whitespace-space ((,class (:foreground ,builtin-fg :background ,hl-line-bg))))
- `(whitespace-tab ((,class (:foreground ,builtin-fg :background ,hl-line-bg))))
-
- ;; Language syntax highlighting
- `(font-lock-builtin-face ((,class (:foreground ,builtin-fg))))
- `(font-lock-comment-face ((,class (:foreground ,doc-fg :background ,doc-bg))))
- `(font-lock-comment-delimiter-face ((,class (:foreground ,minor-fg, :background ,minor-bg))))
- `(font-lock-constant-face ((,class (:foreground ,constant-fg))))
- `(font-lock-doc-face ((,class (:foreground ,doc-fg))))
- `(font-lock-function-name-face ((,class (:foreground ,function-fg))))
- `(font-lock-keyword-face ((,class (:foreground ,keyword-fg))))
- `(font-lock-negation-char-face ((,class (:foreground ,error-fg))))
- `(font-lock-preprocessor-face ((,class (:foreground ,builtin-fg))))
- `(font-lock-string-face ((,class (:foreground ,string-fg))))
- `(font-lock-type-face ((,class (:foreground ,type-fg))))
- `(font-lock-variable-name-face ((,class (:foreground ,variable-fg))))
- `(font-lock-warning-face ((,class (:foreground ,warning-fg :background ,warning-bg))))
-
- ;; Avy
- `(avy-lead-face ((,class (:background ,search-bg-0 :foreground ,search-fg))))
- `(avy-lead-face-0 ((,class (:background ,search-bg-1 :foreground ,search-fg))))
- `(avy-lead-face-1 ((,class (:background ,search-bg-2 :foreground ,search-fg))))
- `(avy-lead-face-2 ((,class (:background ,search-bg-3 :foreground ,search-fg))))
-
- ;; Company (auto-completion)
- `(company-preview ((,class (:background ,default-bg :foreground ,completion-match-fg))))
- `(company-preview-common ((,class (:background ,completion-bg :foreground ,completion-fg))))
- `(company-preview-search ((,class (:background ,completion-bg :foreground ,completion-fg))))
- `(company-scrollbar-bg ((,class (:background ,scrollbar-bg))))
- `(company-scrollbar-fg ((,class (:background ,scrollbar-fg))))
- `(company-tooltip ((,class (:background ,completion-bg :foreground ,completion-fg))))
- `(company-tooltip-annotation ((,class (:foreground ,completion-annotation-fg))))
- `(company-tooltip-common ((,class (:background nil :foreground ,completion-match-fg))))
- `(company-tooltip-common-selection ((,class (:foreground ,completion-selection-fg
- :background ,completion-selection-bg))))
- `(company-tooltip-mouse ((,class (:background ,selection-bg :foreground ,completion-mouse-fg))))
- `(company-tooltip-search ((,class (:foreground ,completion-match-fg))))
- `(company-tooltip-selection ((,class (:background ,selection-bg :foreground nil))))))
-
-
- ;;;###autoload
- (when (and (boundp 'custom-theme-load-path)
- load-file-name)
- ;; add theme folder to `custom-theme-load-path' when installing over MELPA
- (add-to-list 'custom-theme-load-path
- (file-name-as-directory (file-name-directory load-file-name))))
-
-
- (provide-theme 'shortbrain-light)
- (provide 'shortbrain-light-theme)
-
-
- ;;; shortbrain-light-theme.el ends here
-
- #+end_src
-
* TODO Programming
:PROPERTIES:
@@ -4685,12 +4717,16 @@
(defun set-light-theme ()
"Set the light theme with some customization if needed."
(interactive)
- (load-theme 'shortbrain-light t))
+ (use-package shortbrain-light-theme
+ :config
+ (load-theme 'shortbrain-light t)))
(defun set-dark-theme ()
"Set the dark theme with some customization if needed."
(interactive)
- (load-theme 'shortbrain t))
+ (use-package shortbrain-theme
+ :config
+ (load-theme 'shortbrain t)))
(defun theme-switcher ()
(interactive)