From 2e786959194ae542b70f71ef67cd442040b506ab Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Wed, 31 Jan 2024 08:31:25 +0000
Subject: [PATCH] Partially re-theme btm to use base16 colour definitions

Still a few left to change, todo another time

Explicitly define fzf command to use fd
---
 home/default.nix | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index daeb5860..c0588c4a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,4 +1,9 @@
-{lib, ...}: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [./config/default.nix ./scripts/default.nix];
   stylix.targets.fzf.enable = true;
   programs = rec {
@@ -10,27 +15,27 @@
     };
     bottom = {
       enable = true;
-      settings.colors = {
-        table_header_color = "#f5e0dc";
-        all_cpu_color = "#f5e0dc";
+      settings.colors = with config.lib.stylix.colors.withHashtag; {
+        table_header_color = base06;
+        all_cpu_color = base06;
         avg_cpu_color = "#eba0ac";
-        cpu_core_colors = ["#f38ba8" "#fab387" "#f9e2af" "#a6e3a1" "#74c7ec" "#cba6f7"];
-        ram_color = "#a6e3a1";
-        swap_color = "#fab387";
-        rx_color = "#a6e3a1";
-        tx_color = "#f38ba8";
-        widget_title_color = "#f2cdcd";
-        border_color = "#585b70";
-        highlighted_border_color = "#f5c2e7";
-        text_color = "#cdd6f4";
+        cpu_core_colors = [base08 base09 base0A base0B "#74c7ec" base0E];
+        ram_color = base0B;
+        swap_color = base09;
+        rx_color = base0B;
+        tx_color = base08;
+        widget_title_color = base0F;
+        border_color = base02;
+        highlighted_border_color = base07;
+        text_color = base04;
         graph_color = "#a6adc8";
         cursor_color = "#f5c2e7";
-        selected_text_color = "#11111b";
-        selected_bg_color = "#cba6f7";
-        high_battery_color = "#a6e3a1";
-        medium_battery_color = "#f9e2af";
-        low_battery_color = "#f38ba8";
-        gpu_core_colors = ["#74c7ec" "#cba6f7" "#f38ba8" "#fab387" "#f9e2af" "#a6e3a1"];
+        selected_text_color = base05;
+        selected_bg_color = base0E;
+        high_battery_color = base0B;
+        medium_battery_color = base0A;
+        low_battery_color = base08;
+        gpu_core_colors = ["#74c7ec" base0E base08 base09 base0A base0B];
         arc_color = "#89dceb";
       };
     };
@@ -55,6 +60,9 @@
     fzf = {
       enable = true;
       enableFishIntegration = true;
+      defaultCommand = "${pkgs.fd}/bin/fd --type f";
+      changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
+      fileWidgetCommand = "${pkgs.fd}/bin/fd --type f";
     };
     git = {
       enable = true;