1 files changed, 30 insertions, 50 deletions

diff --git a/lib/common.nix b/lib/common.nix
index d1efeb9..d0d51fc 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -67,14 +67,14 @@ in {
 
   programs.bat = {
     enable = true;
-    config = { theme = "catppuccin"; };
+    config = { theme = "catppuccin-mocha"; };
     themes = {
-      catppuccin =  builtins.readFile (pkgs.fetchFromGitHub {
+      catppuccin-mocha = builtins.readFile (pkgs.fetchFromGitHub {
         owner = "catppuccin";
         repo = "bat";
         rev = "d714cc1d358ea51bfc02550dabab693f70cccea0";
         hash = "sha256-Q5B4NDrfCIK3UAMs94vdXnR42k4AXCqZz6sRn8bzmf4=";
-      } + "/themes/Catppuccin Latte.tmTheme");
+      } + "/themes/Catppuccin Mocha.tmTheme");
     };
   };
 
@@ -93,19 +93,20 @@ in {
         "$line_break"
         "$character"
       ];
-      directory.style = "blue";
+      # ef-dream inspired colors
+      directory.style = "#57b0ff";
       character = {
-        success_symbol = "[ϟ](white)";
-        error_symbol = "[ϟ](red)";
+        success_symbol = "[ϟ](#f3c09a)";
+        error_symbol = "[ϟ](#ff6f6f)";
       };
       git_branch = {
         format = "[$branch]($style)";
-        style = "bright-black";
+        style = "#8f8886";
       };
       git_status = {
         format =
-          ''[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)'';
-        style = "cyan";
+          ''[[(*$conflicted$untracked$modified$staged$renamed$deleted)](#ffaacf) ($ahead_behind$stashed)]($style)'';
+        style = "#6fb3c0";
         conflicted = "​";
         untracked = "​";
         modified = "​";
@@ -116,12 +117,12 @@ in {
       };
       git_state = {
         format = "\([$state( $progress_current/$progress_total)]($style)\) ";
-        style = "bright-black";
+        style = "#8f8886";
       };
 
       cmd_duration = {
         format = "[$duration]($style) ";
-        style = "yellow";
+        style = "#c0b24f";
       };
     };
   };
@@ -156,41 +157,17 @@ in {
     enable = true;
     enableBashIntegration = true;
     colors = {
-      # https://github.com/catppuccin/fzf
-      # TODO: use catppuccin/nix, and switch based on xtheme
-      # catppuccin-mocha
-      "bg+" = "#313244";
-      "bg" = "#1e1e2e";
-      "hl" = "#f38ba8";
-      "fg" = "#cdd6f4";
-      "header" = "#f38ba8";
-      "info" = "#cba6f7";
-      "pointer" = "#f5e0dc";
-      "marker" = "#b4befe";
-      "fg+" = "#cdd6f4";
-      "hl+" = "#f38ba8";
-      # these are no longer supported
-      # "prompt" = "#cba6f7";
-      # "spinner" = "#f5e0dc";
-      # these are new colors, but doesn't work for me
-      # https://github.com/catppuccin/fzf/issues/10
-      # "selected-bg" = "#45475a";
-
-      # catppucin-latte:
-      # "bg+" = "#ccd0da";
-      # "bg" = "#eff1f5";
-      # "hl" = "#d20f39";
-      # "fg" = "#4c4f69";
-      # "header" = "#d20f39";
-      # "info" = "#8839ef";
-      # "pointer" = "#dc8a78 ";
-      # "marker" = "#dc8a78";
-      # "fg+" = "#4c4f69";
-      # "hl+" = "#d20f39";
-      # "selected-bg" = "#51576d";
-      # "selected-hl" = "#e78284";
-      # "prompt" = "#8839ef";
-      # "spinner" = "#dc8a78";
+      # ef-dream inspired
+      "bg+" = "#3b393e";
+      "bg" = "#232025";
+      "hl" = "#ffaacf";
+      "fg" = "#efd5c5";
+      "header" = "#d0b0ff";
+      "info" = "#d0b0ff";
+      "pointer" = "#f3c09a";
+      "marker" = "#57b0ff";
+      "fg+" = "#efd5c5";
+      "hl+" = "#ffaacf";
     };
     defaultCommand = "rg --files";
     changeDirWidgetCommand = "fd --type d"; # M-c
@@ -339,12 +316,15 @@ in {
       set -g status-left '#S | #(whoami)@#(hostname) | '
       set -g status-right '~%Y.%m.%d..%H.%M'
       set -g renumber-windows on
-      # white-ish background with dark-grey text
-      set -g status-style bg=colour0,fg=colour13
-      # highlight current window
-      set -g window-status-current-style fg=colour0,bg=colour13
+      # ef-dream colors
+      set -g status-style bg='#232025',fg='#efd5c5'
+      # highlight current window with magenta-cooler
+      set -g window-status-current-style fg='#232025',bg='#d0b0ff'
       set -g window-status-format '#I) #W '
       set -g window-status-current-format '#I) #W '
+      # pane borders
+      set -g pane-border-style fg='#3b393e'
+      set -g pane-active-border-style fg='#d0b0ff'
       #
       set-option -g allow-passthrough on
     '';