Theme change

5 files changed, 19 insertions, 18 deletions

diff --git a/modules/email.home/aerc.theme.nix b/modules/email.home/aerc.theme.nix
index f2f525d..e4a0868 100644
--- a/modules/email.home/aerc.theme.nix
+++ b/modules/email.home/aerc.theme.nix
@@ -1,5 +1,6 @@
 let
-  accent = "#4f3aA3";
+  xresources = (import ../xresources.home.nix {}).xresources.properties;
+  accent = xresources."*.accent";
 in {
   "title.bg" = accent;
   "title.fg" = "black";
diff --git a/modules/music/client.home.nix b/modules/music/client.home.nix
index aa106bb..73c7d4d 100644
--- a/modules/music/client.home.nix
+++ b/modules/music/client.home.nix
@@ -43,27 +43,27 @@ in
       browser_display_mode = "columns";
       playlist_editor_display_mode = "classic";
 
-      empty_tag_color = "magenta";
-      header_window_color = "magenta";
+      empty_tag_color = "cyan";
+      header_window_color = "green";
       volume_color = "cyan";
-      state_line_color = "magenta";
-      state_flags_color = "magenta:b";
+      state_line_color = "cyan";
+      state_flags_color = "cyan:b";
       color1 = "white";
-      color2 = "magenta";
+      color2 = "cyan";
       main_window_color = "white";
       progressbar_color = "black:b";
-      progressbar_elapsed_color = "magenta:b";
-      statusbar_color = "magenta";
-      statusbar_time_color = "magenta:b";
-      player_state_color = "magenta:b";
-      alternative_ui_separator_color = "magenta";
-      window_border_color = "magenta";
+      progressbar_elapsed_color = "cyan:b";
+      statusbar_color = "cyan";
+      statusbar_time_color = "cyan:b";
+      player_state_color = "cyan:b";
+      alternative_ui_separator_color = "cyan";
+      window_border_color = "cyan";
       active_window_border = "red";
 
       progressbar_look = "=>-";
       now_playing_prefix = "$(blue)$b";
       now_playing_suffix = "$/b$(end)";
-      current_item_prefix = "$(magenta)$r$b";
+      current_item_prefix = "$(cyan)$r$b";
       current_item_suffix = "$/r$(end)$/b";
       current_item_inactive_column_prefix = "$(white)$r";
       current_item_inactive_column_suffix = "$/r$(end)";
diff --git a/modules/music/mpd.home.nix b/modules/music/mpd.home.nix
index 3619786..12f5ab9 100644
--- a/modules/music/mpd.home.nix
+++ b/modules/music/mpd.home.nix
@@ -15,8 +15,8 @@ in
       user "imsohexy"
       group "users"
       restore_paused "yes"
-      metadata_to_use	"artist,album,title,track,name,genre,date,composer,performer,disc"
-      auto_update	"yes"
+      metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc"
+      auto_update "yes"
       auto_update_depth "5"
       follow_outside_symlinks "yes"
       follow_inside_symlinks "yes"
@@ -37,7 +37,7 @@ in
         format "44100:16:2"
       }
 
-      filesystem_charset		"UTF-8"
+      filesystem_charset "UTF-8"
     '';
   };
 
diff --git a/modules/xresources.home.nix b/modules/xresources.home.nix
index 4138ec5..4f83d45 100644
--- a/modules/xresources.home.nix
+++ b/modules/xresources.home.nix
@@ -29,7 +29,7 @@
       "*.color13" = "#4e3aA3";
 
       "*.color6" = "#56B6C2";
-      "*.color14" = "#0fb9b1";
+      "*.color14" = "#042f2f";
 
       "*.color7" = "#ABB2BF";
       "*.color15" = "#ebdbb2";
diff --git a/modules/xresources/dark.nix b/modules/xresources/dark.nix
index 4762fca..656ed1f 100644
--- a/modules/xresources/dark.nix
+++ b/modules/xresources/dark.nix
@@ -2,5 +2,5 @@
   background = "#000000";
   background-light = "#111111";
   foreground = "#d8dee9";
-  accent = "#4e3aA3";
+  accent = "#007070";
 }