From f97c8ab3073fa4a33f78c70445e021b2f16879c3 Mon Sep 17 00:00:00 2001
From: Aria Nolan <tacocat@chytrid.xyz>
Date: Wed, 1 Nov 2023 10:21:19 -0400
Subject: [PATCH] fixed gitui theme and zvm cursor

---
 users/tacocat/home.nix             |  1 -
 users/tacocat/programs/default.nix | 28 ++++++++++++++++++++++++++++
 users/tacocat/shell/zsh.nix        | 17 +++--------------
 users/tacocat/wayland/foot.nix     |  3 +--
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix
index 0675d67..86f628a 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -35,7 +35,6 @@
       networkmanagerapplet
       htop
       p7zip
-      gitui
     ];
   };
 
diff --git a/users/tacocat/programs/default.nix b/users/tacocat/programs/default.nix
index 642acb3..265a60e 100644
--- a/users/tacocat/programs/default.nix
+++ b/users/tacocat/programs/default.nix
@@ -10,4 +10,32 @@
   programs.bat = {
     enable = true;
   };
+  programs.gitui = {
+    enable = true;
+    theme = ''
+      (
+       selected_tab: Reset,
+       command_fg: DarkGray,
+       selection_bg: Green,
+       selection_fg: White,
+       cmdbar_bg: Blue,
+       cmdbar_extra_lines_bg: Blue,
+       disabled_fg: Magenta,
+       diff_line_add: Green,
+       diff_line_delete: Red,
+       diff_file_added: LightGreen,
+       diff_file_removed: LightRed,
+       diff_file_moved: LightMagenta,
+       diff_file_modified: Yellow,
+       commit_hash: Magenta,
+       commit_time: LightCyan,
+       commit_author: Green,
+       danger_fg: Red,
+       push_gauge_bg: Blue,
+       push_gauge_fg: Reset,
+       tag_fg: LightMagenta,
+       branch_fg: LightYellow,
+      )
+    '';
+  };
 }
diff --git a/users/tacocat/shell/zsh.nix b/users/tacocat/shell/zsh.nix
index c1eb7b7..8951b9e 100644
--- a/users/tacocat/shell/zsh.nix
+++ b/users/tacocat/shell/zsh.nix
@@ -19,17 +19,6 @@
     };
     historySubstringSearch.enable = true;
     plugins = [
-      # {
-      #   name = "powerlevel10k";
-      #   file = "powerlevel10k.zsh-theme";
-      #   src = pkgs.fetchFromGitHub {
-      #     owner = "romkatv";
-      #     repo = "powerlevel10k";
-      #     rev = "v1.19.0";
-      #     sha256 = "+hzjSbbrXr0w1rGHm6m2oZ6pfmD6UUDBfPd7uMg5l5c=";
-      #   };
-      # }
-
       {
         name = "z.lua";
         src = pkgs.fetchFromGitHub {
@@ -53,9 +42,9 @@
     # initExtra = ''
     #   source $HOME/.config/zsh/.p10k.zsh
     # '';
-    # localVariables = {
-    #   POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = true;
-    # };
+    localVariables = {
+      ZVM_TERM = "xterm-256color";
+    };
   };
   # home.file.".config/zsh/.p10k.zsh".source = ./.p10k.zsh;
 }
diff --git a/users/tacocat/wayland/foot.nix b/users/tacocat/wayland/foot.nix
index 63991c4..18a78da 100644
--- a/users/tacocat/wayland/foot.nix
+++ b/users/tacocat/wayland/foot.nix
@@ -6,7 +6,6 @@
       main = {
         shell = "/usr/bin/env zsh";
         font = "Mononoki:size=14,FiraCode Nerd Font:size=14";
-        term = "xterm-256color";
       };
       colors = {
         background = "232136";
@@ -27,7 +26,7 @@
         bright5 = "c4a7e7";
         bright6 = "ea9a97";
         bright7 = "e0def4";
-        alpha = "0.9";
+        alpha = "0.85";
       };
     };
   };