From bab50446dc539ba186cd8f149f42964513a73bd2 Mon Sep 17 00:00:00 2001
From: Marco Thomas <mail@marco-thomas.net>
Date: Tue, 7 Sep 2021 23:19:21 +0200
Subject: [PATCH] Brighten up everything!

---
 files/.config/alacritty/alacritty.yml         |  2 +-
 .../alacritty/themes/gruvbox_lighter.yml      | 28 ++++++++++++
 files/.config/i3/config                       | 45 +++++++++++--------
 files/.zshrc                                  |  4 +-
 files/init.el                                 |  3 +-
 5 files changed, 59 insertions(+), 23 deletions(-)
 create mode 100644 files/.config/alacritty/themes/gruvbox_lighter.yml

diff --git a/files/.config/alacritty/alacritty.yml b/files/.config/alacritty/alacritty.yml
index c8462b4..7f79770 100644
--- a/files/.config/alacritty/alacritty.yml
+++ b/files/.config/alacritty/alacritty.yml
@@ -9,7 +9,7 @@
 
 import:
   - ~/.alacritty_local.yml
-  - ~/.config/alacritty/themes/gruvbox_light.yml
+  - ~/.config/alacritty/themes/gruvbox_lighter.yml
 
 env:
   TERM: alacritty
diff --git a/files/.config/alacritty/themes/gruvbox_lighter.yml b/files/.config/alacritty/themes/gruvbox_lighter.yml
new file mode 100644
index 0000000..bfbe207
--- /dev/null
+++ b/files/.config/alacritty/themes/gruvbox_lighter.yml
@@ -0,0 +1,28 @@
+# Colors (Gruvbox light)
+colors:
+  # Default colors
+  primary:
+    background: '0xf9f5d7'
+    foreground: '0x282828'
+
+  # Normal colors
+  normal:
+    black:   '0xfbf1c7'
+    red:     '0xcc241d'
+    green:   '0x98971a'
+    yellow:  '0xd79921'
+    blue:    '0x458588'
+    magenta: '0xb16286'
+    cyan:    '0x689d6a'
+    white:   '0x7c6f64'
+
+  # Bright colors
+  bright:
+    black:   '0x928374'
+    red:     '0x9d0006'
+    green:   '0x79740e'
+    yellow:  '0xb57614'
+    blue:    '0x076678'
+    magenta: '0x8f3f71'
+    cyan:    '0x427b58'
+    white:   '0x3c3836'
diff --git a/files/.config/i3/config b/files/.config/i3/config
index f0835cb..f224b5e 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -89,10 +89,25 @@ bindsym XF86MonBrightnessUp exec --no-startup-id light -A 5 # increase screen br
 bindsym XF86MonBrightnessDown exec --no-startup-id light -U 5 # decrease screen brightness
 
 # styling
-new_window none
-default_border pixel 2
+default_border normal
+title_align center
 hide_edge_borders smart
 
+gaps inner 10
+
+#set $gruv_bg "#f2e5bc"
+set $gruv_bg "#f9f5d7"
+set $gruv_bg_1 "#fbf1c7"
+#set $gruv_bg_1 "#f9f5d7"
+set $gruv_fg "#282828"
+#set $green "#98971a"
+# actually aqua
+set $green "#689d6a"
+set $red "#cc242d"
+set $light_red "#fb4934"
+set $yellow "#d79921"
+#set $yellow "#fabd2f"
+
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
@@ -103,35 +118,27 @@ bar {
     tray_output primary
 
     colors {
-        background #f2e5bc
-        statusline #282828
+        background $gruv_bg
+        statusline $gruv_fg
 
         # equivalent to focused
-        focused_workspace       #f2e5bc #98971a #282828
+        focused_workspace       $gruv_bg $green     $gruv_fg
         # equivalent to focused_inactive
-        active_workspace        #f2e5bc #d79921 #282828
+        active_workspace        $grub_bg $yellow    $gruv_fg
         # equivalent to unfocused
-        inactive_workspace      #f2e5bc #f2e5bc #282828
+        inactive_workspace      $gruv_bg $gruv_bg   $gruv_fg
         # equivalent to urgent
-        urgent_workspace        #cc241d #fb4934 #282828
+        urgent_workspace        $red     $light_red $gruv_fg
         # equivalent to urgent
-        binding_mode            #cc241d #fb4934 #282828
+        binding_mode            $red     $light_red $gruv_fg
     }
 }
 
-set $gruv_bg "#f2e5bc"
-set $gruv_bg_darker "#ebdbb2"
-set $gruv_fg "#282828"
-set $green "#98971a"
-set $red "#cc242d"
-set $light_red "#fb4934"
-set $yellow "#d79921"
-
 # gruvbox style window titles
 # class                 border          backgr.           text     indicator        child_border
 client.focused		$green		$green		  $gruv_fg $green	    $green
-client.focused_inactive $yellow	$yellow	  $gruv_fg $yellow 	    $yellow
-client.unfocused	$gruv_bg_darker $gruv_bg_darker   $gruv_fg $gruv_bg_darker  $gruv_bg_darker
+client.focused_inactive $yellow	$yellow	  $gruv_fg $yellow	    $yellow
+client.unfocused	$gruv_bg_1 	$gruv_bg_1	  $gruv_fg $gruv_bg_1 	    $gruv_bg_1
 client.urgent		$red		$light_red	  $gruv_fg $red	    $light_red
 
 # startup
diff --git a/files/.zshrc b/files/.zshrc
index dba59c9..8492ab1 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -123,8 +123,8 @@ export FZF_DEFAULT_OPTS='
        --layout=reverse
        --bind=tab:down
        --bind=btab:up
-       --color=fg:#282828,bg:#f2e5bc,hl:#458588
-       --color=fg+:#282828,bg+:#f2e5bc,hl+:#458588
+       --color=fg:#282828,bg:#f9f5d7,hl:#458588
+       --color=fg+:#282828,bg+:#f9f5d7,hl+:#458588
        --color=info:#282828,prompt:#282828,pointer:#282828
        --color=marker:#282828,spinner:#282828,header:#282828'
 
diff --git a/files/init.el b/files/init.el
index 6e229a1..e260e1a 100644
--- a/files/init.el
+++ b/files/init.el
@@ -140,7 +140,7 @@
 (use-package doom-themes
   :straight t
   :config
-  (setq doom-gruvbox-light-variant "soft")
+  (setq doom-gruvbox-light-variant "hard")
   (load-theme 'doom-gruvbox-light t)
   (doom-themes-org-config)
   (doom-themes-treemacs-config))
@@ -149,6 +149,7 @@
 (use-package doom-modeline
   :straight t
   :config
+  (set-face-attribute 'mode-line nil :background "#f9f5d7")
   (doom-modeline-mode 1)
   (setq doom-modeline-indent-info t))