Add ef-dream themes for bat, fzf, telegram; reorganize polybar with GPU monitoring; fix xmonad tab colors

1 files changed, 18 insertions, 15 deletions

diff --git a/lib/common.nix b/lib/common.nix
index 5675a23..58f8b76 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -67,14 +67,9 @@ in {
 
   programs.bat = {
     enable = true;
-    config = { theme = "catppuccin-mocha"; };
+    config = { theme = "ef-dream"; };
     themes = {
-      catppuccin-mocha = builtins.readFile (pkgs.fetchFromGitHub {
-        owner = "catppuccin";
-        repo = "bat";
-        rev = "d714cc1d358ea51bfc02550dabab693f70cccea0";
-        hash = "sha256-Q5B4NDrfCIK3UAMs94vdXnR42k4AXCqZz6sRn8bzmf4=";
-      } + "/themes/Catppuccin Mocha.tmTheme");
+      ef-dream = builtins.readFile ./ef-dream-bat.tmTheme;
     };
   };
 
@@ -157,17 +152,25 @@ in {
     enable = true;
     enableBashIntegration = true;
     colors = {
-      # ef-dream inspired
-      "bg+" = "#3b393e";
+      # ef-dream palette
       "bg" = "#232025";
-      "hl" = "#ffaacf";
+      "bg+" = "#322f34";
       "fg" = "#efd5c5";
-      "header" = "#d0b0ff";
-      "info" = "#d0b0ff";
-      "pointer" = "#f3c09a";
-      "marker" = "#57b0ff";
       "fg+" = "#efd5c5";
-      "hl+" = "#ffaacf";
+      "hl" = "#ffaacf";
+      "hl+" = "#d0b0ff";
+      "border" = "#8f8886";
+      "gutter" = "#232025";
+      "header" = "#b0a0cf";
+      "info" = "#c0b24f";
+      "marker" = "#51b04f";
+      "pointer" = "#f3c09a";
+      "prompt" = "#57b0ff";
+      "spinner" = "#6fb3c0";
+      "separator" = "#3b393e";
+      "scrollbar" = "#8f8886";
+      "label" = "#b0a0cf";
+      "query" = "#efd5c5";
     };
     defaultCommand = "rg --files";
     changeDirWidgetCommand = "fd --type d"; # M-c