commit 06ac8d77db6a6821073c67c24c09d3b5a7a5b31a
parent 5b3e03c776ea2f6317f5a06f63df548c10226b39
Author: mokou <mokou@posteo.de>
Date: Sat, 25 Apr 2020 15:18:57 +0200
Use a mix of gruvbox-dark and custom colors
Diffstat:
6 files changed, 89 insertions(+), 254 deletions(-)
diff --git a/dot_config/alacritty/alacritty.yml b/dot_config/alacritty/alacritty.yml
@@ -138,35 +138,67 @@ font:
# If `true`, bold text is drawn using the bright color variants.
draw_bold_text_with_bright_colors: true
+# # Colors (Gruvbox light)
+# colors:
+# # Default colors
+# primary:
+# # hard contrast: background = '#f9f5d7'
+# background: '#fbf1c7'
+# # soft contrast: background = '#f2e5bc'
+# foreground: '#3c3836'
+
+# # Normal colors
+# normal:
+# black: '#fbf1c7'
+# red: '#cc241d'
+# green: '#98971a'
+# yellow: '#d79921'
+# blue: '#458588'
+# magenta: '#b16286'
+# cyan: '#689d6a'
+# white: '#7c6f64'
+
+# # Bright colors
+# bright:
+# black: '#928374'
+# red: '#9d0006'
+# green: '#79740e'
+# yellow: '#b57614'
+# blue: '#076678'
+# magenta: '#8f3f71'
+# cyan: '#427b58'
+# white: '#3c3836'
+
+# Colors (Gruvbox dark)
colors:
# Default colors
primary:
- background: '0x004043'
- foreground: '0x069993'
+ # hard contrast: background = '#1d2021'
+ background: '#282828'
+ # soft contrast: background = '#32302f'
+ foreground: '#ebdbb2'
# Normal colors
normal:
- black: '0x24262a'
- red: '0xa54242'
- green: '0x8c9440'
- yellow: '0xde935f'
- blue: '0x5f819d'
- magenta: '0x85678f'
- cyan: '0x5e8d87'
- white: '0x949494'
+ black: '#282828'
+ red: '#cc241d'
+ green: '#98971a'
+ yellow: '#d79921'
+ blue: '#458588'
+ magenta: '#b16286'
+ cyan: '#689d6a'
+ white: '#a89984'
# Bright colors
bright:
- black: '0x5f5f5f'
- red: '0xcc6666'
- green: '0xb5bd68'
- yellow: '0xf0c674'
- blue: '0x81a2be'
- magenta: '0xb294bb'
- cyan: '0x8abeb7'
- white: '0xc5c8c6'
-
-
+ black: '#928374'
+ red: '#fb4934'
+ green: '#b8bb26'
+ yellow: '#fabd2f'
+ blue: '#83a598'
+ magenta: '#d3869b'
+ cyan: '#8ec07c'
+ white: '#ebdbb2'
# Visual Bell
#
# Any time the BEL code is received, Alacritty "rings" the visual bell. Once
diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css
@@ -8,9 +8,9 @@
}
window#waybar {
- background-color: #004043;
- border-bottom: 3px solid #004043;
- color: #069993;
+ background-color: #111;
+ border-bottom: 3px solid #111;
+ color: #fff;
transition-property: background-color;
transition-duration: .5s;
}
@@ -30,32 +30,32 @@ window#waybar.solo {
#workspaces button {
padding: 0 5px;
- background-color: #004043;
- color: #069993;
- border-bottom: 3px solid #004043;
+ background-color: #111;
+ color: #fff;
+ border-bottom: 3px solid #111;
}
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
#workspaces button:hover {
background: rgba(0, 0, 0, 0.2);
box-shadow: inherit;
- border-bottom: 3px solid #ffffff;
+ border-bottom: 3px solid #111;
}
#workspaces button.focused {
- background-color: #004043;
- color: #fff;
+ background-color: #fff;
+ color: #111;
+ border-bottom: 3px solid #fff;
}
#workspaces button.urgent {
- background-color: #004043;
- color: navy;
- border-bottom: 3px solid #004043;
+ background-color: #111;
+ color: #2ecc40;
+ border-bottom: 3px solid #111;
}
#mode {
- background-color: #004043;
- border-bottom: 3px solid #004043;
+ background-color: #111;
+ border-bottom: 3px solid #111;
}
#clock,
@@ -77,30 +77,30 @@ window#waybar.solo {
}
#clock {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#battery {
background-color: #ffffff;
- color: #000000;
+ color: #111;
}
#battery.charging {
color: #ffffff;
- background-color: #26A65B;
+ background-color: #3d9970;
}
@keyframes blink {
to {
background-color: #ffffff;
- color: #000000;
+ color: #111;
}
}
#battery.critical:not(.charging) {
- background-color: #f53c3c;
+ background-color: #ff4136;
color: #ffffff;
animation-name: blink;
animation-duration: 0.5s;
@@ -110,66 +110,66 @@ window#waybar.solo {
}
label:focus {
- background-color: #000000;
+ background-color: #111;
}
#cpu {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#memory {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#backlight {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#network {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#network.disconnected {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#pulseaudio {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#pulseaudio.muted {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#temperature {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#temperature.critical {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#tray {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#idle_inhibitor {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
#idle_inhibitor.activated {
- background-color: #004043;
+ background-color: #111;
color: #fff;
}
diff --git a/dot_doom.d/config.el b/dot_doom.d/config.el
@@ -1,6 +1,6 @@
;;; ~/.doom.d/config.el -*- lexical-binding: t; -*-
-(setq doom-theme 'deepsea)
+(setq doom-theme 'gruvbox-dark-soft)
;; Set to 2 spaces
(setq default-tab-width 2)
diff --git a/dot_doom.d/packages.el b/dot_doom.d/packages.el
@@ -6,7 +6,6 @@
;; (package! another-package :recipe (:fetcher github :repo "username/repo"))
;; (package! builtin-package :disable t)
(package! monky)
-(package! kaolin-themes)
(package! exec-path-from-shell)
(package! editorconfig)
-(package! autothemer)
+(package! gruvbox-theme)
diff --git a/dot_doom.d/themes/deepsea-theme.el b/dot_doom.d/themes/deepsea-theme.el
@@ -1,197 +0,0 @@
-;;; deepsea.el --- Deep dark theme -*- no-byte-compile: t; -*-
-(require 'doom-themes)
-
-;;; Variables
-(defgroup doom-solarized-dark-theme nil
- "Options for doom-themes"
- :group 'doom-themes)
-
-(defcustom doom-solarized-dark-brighter-modeline nil
- "If non-nil, more vivid colors will be used to style the mode-line."
- :group 'doom-solarized-dark-theme
- :type 'boolean)
-
-(defcustom doom-solarized-dark-brighter-comments nil
- "If non-nil, comments will be highlighted in more vivid colors."
- :group 'doom-solarized-dark-theme
- :type 'boolean)
-
-(defcustom doom-solarized-dark-comment-bg doom-solarized-dark-brighter-comments
- "If non-nil, comments will have a subtle, darker background. Enhancing their
-legibility."
- :group 'doom-solarized-dark-theme
- :type 'boolean)
-
-(defcustom doom-solarized-dark-padded-modeline doom-themes-padded-modeline
- "If non-nil, adds a 4px padding to the mode-line. Can be an integer to
-determine the exact padding."
- :group 'doom-solarized-dark-theme
- :type '(choice integer boolean))
-
-
-;;; Theme definition
-(def-doom-theme deepsea
- "A dark theme"
-
-;;;; Colors
- ;; name default 256 16
- ((bg '("#004043" "color-233" "black" ))
- (bg-alt '("#004043" "color-232" "brightblack" ))
-(base0 '("#073642" "black" "black" ))
- (base1 '("#03282F" "#1e1e1e" "brightblack" ))
- (base2 '("#00212C" "#2e2e2e" "brightblack" ))
- (base3 '("#13383C" "#262626" "brightblack" ))
- (base4 '("#56697A" "#3f3f3f" "brightblack" ))
- (base5 '("#405A61" "#525252" "brightblack" ))
- (base6 '("#96A7A9" "#6b6b6b" "brightblack" ))
- (base7 '("#788484" "#979797" "brightblack" ))
- (base8 '("#626C6C" "#dfdfdf" "white" ))
- (fg-alt '("#657b83" "#2d2d2d" "white" ))
- (fg '("#069993" "#bfbfbf" "brightwhite" ))
-
- (grey base4)
- (red '("#ff4136" "#ff4136" "red" ))
- (orange '("#cb4b16" "#dd8844" "brightred" ))
- (green '("#859900" "#99bb66" "green" ))
- (teal '("#35a69c" "#33aa99" "brightgreen" ))
- (yellow '("#b58900" "#ECBE7B" "yellow" ))
- (blue '("#268bd2" "#51afef" "brightblue" ))
- (dark-blue '("#3F88AD" "#2257A0" "blue" ))
- (magenta '("#d33682" "#c678dd" "magenta" ))
- (violet '("#6c71c4" "#a9a1e1" "brightmagenta"))
- (cyan '("#2aa198" "#46D9FF" "brightcyan" ))
- (dark-cyan '("#204052" "#5699AF" "cyan" ))
-
- ;; face categories -- required for all themes
- (highlight blue)
- (vertical-bar (doom-darken base1 0.5))
- (selection dark-blue)
- (builtin blue)
- (comments (if doom-solarized-dark-brighter-comments blue base5))
- (doc-comments teal)
- (constants magenta)
- (functions blue)
- (keywords green)
- (methods cyan)
- (operators orange)
- (type yellow)
- (strings cyan)
- (variables violet)
- (numbers magenta)
- (region base0)
- (error red)
- (warning yellow)
- (success green)
- (vc-modified orange)
- (vc-added green)
- (vc-deleted red)
-
- ;; custom categories
- (hidden `(,(car bg) "black" "black"))
- (-modeline-bright doom-solarized-dark-brighter-modeline)
- (-modeline-pad
- (when doom-solarized-dark-padded-modeline
- (if (integerp doom-solarized-dark-padded-modeline) doom-solarized-dark-padded-modeline 4)))
-
- (modeline-fg nil)
- (modeline-fg-alt base5)
-
- (modeline-bg
- (if -modeline-bright
- base3
- `(,(doom-darken (car bg) 0.15) ,@(cdr base0))))
- (modeline-bg-l
- (if -modeline-bright
- base3
- `(,(doom-darken (car bg) 0.1) ,@(cdr base0))))
- (modeline-bg-inactive (doom-darken bg 0.1))
- (modeline-bg-inactive-l `(,(car bg) ,@(cdr base1))))
-
-
- ;; --- extra faces ------------------------
- ((company-tooltip-selection :background dark-cyan)
- (elscreen-tab-other-screen-face :background "#353a42" :foreground "#1e2022")
-
- ((line-number &override) :foreground base4)
- ((line-number-current-line &override) :foreground fg)
-
- (helm-selection :inherit 'bold
- :background selection
- :distant-foreground bg
- :extend t)
-
- (font-lock-comment-face
- :foreground comments
- :background (if doom-solarized-dark-comment-bg (doom-lighten bg 0.05)))
- (font-lock-doc-face
- :inherit 'font-lock-comment-face
- :foreground doc-comments)
- (font-lock-keyword-face
- :weight 'bold
- :foreground keywords)
- (font-lock-constant-face
- :weight 'bold
- :foreground constants)
-
- ;; Centaur tabs
- (centaur-tabs-active-bar-face :background blue)
- (centaur-tabs-modified-marker-selected :inherit 'centaur-tabs-selected
- :foreground blue)
- (centaur-tabs-modified-marker-unselected :inherit 'centaur-tabs-unselected
- :foreground blue)
- ;; Doom modeline
- (doom-modeline-bar :background blue)
-
- (mode-line
- :background modeline-bg :foreground modeline-fg
- :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))
- (mode-line-inactive
- :background modeline-bg-inactive :foreground modeline-fg-alt
- :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive)))
- (mode-line-emphasis
- :foreground (if -modeline-bright base8 highlight))
-
- (solaire-mode-line-face
- :inherit 'mode-line
- :background modeline-bg-l
- :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-l)))
- (solaire-mode-line-inactive-face
- :inherit 'mode-line-inactive
- :background modeline-bg-inactive-l
- :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-l)))
-
- (tooltip :background bg-alt :foreground fg)
- ;; --- major-mode faces -------------------
- ;; css-mode / scss-mode
- (css-proprietary-property :foreground orange)
- (css-property :foreground green)
- (css-selector :foreground blue)
-
- ;; markdown-mode
- (markdown-markup-face :foreground base5)
- (markdown-header-face :inherit 'bold :foreground blue)
- (markdown-url-face :foreground teal :weight 'normal)
- (markdown-reference-face :foreground base6)
- ((markdown-bold-face &override) :foreground fg)
- ((markdown-italic-face &override) :foreground fg-alt)
-
- ;; outline (affects org-mode)
- ((outline-1 &override) :foreground blue)
- ((outline-2 &override) :foreground green)
- ((outline-3 &override) :foreground teal)
- ((outline-4 &override) :foreground (doom-darken blue 0.2))
- ((outline-5 &override) :foreground (doom-darken green 0.2))
- ((outline-6 &override) :foreground (doom-darken teal 0.2))
- ((outline-7 &override) :foreground (doom-darken blue 0.4))
- ((outline-8 &override) :foreground (doom-darken green 0.4))
-
- ;; org-mode
- ((org-block &override) :background base0)
- ((org-block-begin-line &override) :foreground comments :background base0)
- (org-hide :foreground hidden)
- (solaire-org-hide-face :foreground hidden))
- ;; --- extra variables ---------------------
- ;; ()
- )
-
-;;; doom-solarized-dark-theme.el ends here
diff --git a/notes.org b/notes.org
@@ -1 +1,2 @@
-* TODO Fix icons for battery gauge (source them from the character table)
+* DONE Fix icons for battery gauge (source them from the character table)
+* DONE Use a normal, dark theme
