From 83d48975bd82deb2a0d4afc9a28e9a9dc002398b Mon Sep 17 00:00:00 2001
From: "kujiu (@uberwald)" <kujiu-git@kujiu.eu>
Date: Wed, 6 Sep 2023 03:30:40 +0200
Subject: [PATCH] Fix colors of aerc

---
 common/.config/fish/config.fish               | 23 +--------------
 .../.config/fish/functions/fish_prompt.fish   |  1 +
 .../fish/functions/set_nightfox_vars.fish     | 29 +++++++++++++++++++
 desktop/.local/share/aerc/stylesets/nightfox  |  8 +++--
 4 files changed, 37 insertions(+), 24 deletions(-)
 create mode 100644 common/.config/fish/functions/set_nightfox_vars.fish

diff --git a/common/.config/fish/config.fish b/common/.config/fish/config.fish
index 9a620ea..fdc90b5 100644
--- a/common/.config/fish/config.fish
+++ b/common/.config/fish/config.fish
@@ -1,27 +1,6 @@
 #!/usr/bin/env fish
 #
-set -U nightfox_black 393b44
-set -U nightfox_red c94f6d
-set -U nightfox_green 81b29a
-set -U nightfox_yellow dbc074
-set -U nightfox_blue 719cd6
-set -U nightfox_magenta 9d79d6
-set -U nightfox_cyan 63cdcf
-set -U nightfox_white dfdfe0
-set -U nightfox_orange f4a261
-set -U nightfox_pink d67ad2
-set -U nightfox_comment 738091
-set -U nightfox_bg0 131a24
-set -U nightfox_bg1 192330
-set -U nightfox_bg2 212e3f
-set -U nightfox_bg3 29394f
-set -U nightfox_bg4 39506d
-set -U nightfox_fg0 d6d6d7
-set -U nightfox_fg1 cdcecf
-set -U nightfox_fg2 aeafb0
-set -U nightfox_fg3 71839b
-set -U nightfox_sel0 2b3b51
-set -U nightfox_sel1 3c5372
+set_nightfox_vars
 
 fundle plugin 'edc/bass'
 fundle plugin 'jorgebucaran/nvm.fish'
diff --git a/common/.config/fish/functions/fish_prompt.fish b/common/.config/fish/functions/fish_prompt.fish
index 6a778e7..c3b46f6 100755
--- a/common/.config/fish/functions/fish_prompt.fish
+++ b/common/.config/fish/functions/fish_prompt.fish
@@ -3,6 +3,7 @@
 # description: based on Astronaut of Radu Potop and on Disco of Fabian Homborg, colors from Nightfox by EdenEast
 
 function fish_prompt --description 'Write out the prompt'
+    set_nightfox_vars
     set -f color_venv $nightfox_fg3
     set -f color_bind normal
     set -f color_text $nightfox_bg0
diff --git a/common/.config/fish/functions/set_nightfox_vars.fish b/common/.config/fish/functions/set_nightfox_vars.fish
new file mode 100644
index 0000000..1404053
--- /dev/null
+++ b/common/.config/fish/functions/set_nightfox_vars.fish
@@ -0,0 +1,29 @@
+# Set nightfox vars
+#
+# From https://github.com/EdenEast/nightfox.nvim/
+#
+
+function set_nightfox_vars -d "Set Nightfox vars for colors"
+    set -U nightfox_black 393b44
+    set -U nightfox_red c94f6d
+    set -U nightfox_green 81b29a
+    set -U nightfox_yellow dbc074
+    set -U nightfox_blue 719cd6
+    set -U nightfox_magenta 9d79d6
+    set -U nightfox_cyan 63cdcf
+    set -U nightfox_white dfdfe0
+    set -U nightfox_orange f4a261
+    set -U nightfox_pink d67ad2
+    set -U nightfox_comment 738091
+    set -U nightfox_bg0 131a24
+    set -U nightfox_bg1 192330
+    set -U nightfox_bg2 212e3f
+    set -U nightfox_bg3 29394f
+    set -U nightfox_bg4 39506d
+    set -U nightfox_fg0 d6d6d7
+    set -U nightfox_fg1 cdcecf
+    set -U nightfox_fg2 aeafb0
+    set -U nightfox_fg3 71839b
+    set -U nightfox_sel0 2b3b51
+    set -U nightfox_sel1 3c5372
+end
diff --git a/desktop/.local/share/aerc/stylesets/nightfox b/desktop/.local/share/aerc/stylesets/nightfox
index 1e2a94b..e1eaf6a 100644
--- a/desktop/.local/share/aerc/stylesets/nightfox
+++ b/desktop/.local/share/aerc/stylesets/nightfox
@@ -3,8 +3,9 @@
 # Based on: https://github.com/EdenEast/nightfox.nvim/
 #
 
-*.normal=true
-*.fg=#cdcecf
+*.default=true
+default.fg=#cdcecf
+default.bg=#212e3f
 *.selected.bg=#3c5372
 *.selected.italic=true
 
@@ -19,6 +20,7 @@ statusline_error.fg=#c94f6d
 statusline_warning.fg=#f4a261
 statusline_success.fg=#81b29a
 
+msglist_*.default=true
 msglist_default.fg=#cdcecf
 msglist_unread.bold=true
 msglist_unread.fg=#719cd6
@@ -34,6 +36,7 @@ msglist_deleted.fg=#c94f6d
 msglist_deleted.italic=true
 msglist_result.fg=#9d79d6
 
+dirlist_*.default=true
 dirlist_default.fg=#cdcecf
 dirlist_unread.fg=#719cd6
 dirlist_recent.fg=#63cdcf
@@ -49,6 +52,7 @@ tab.selected.bg=#719cd6
 tab.selected.fg=#131a24
 stack.fg=#63cdcf
 stack.bg=#192330
+spinner*.default=true
 spinner.fg=#f4a261
 border.bg=#39506d
 selector_*.bg=#212e3f