From 70e3ac8640d80e3ae5a9084fb495055977cb4553 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Tue, 31 Mar 2026 15:47:19 -0500
Subject: start using broot again

---
 modules/desktop/hjem/programs/foot.nix   |   7 +-
 modules/terminal/hjem/programs/broot.nix | 153 ++++++++++---------------------
 modules/terminal/hjem/programs/fish.nix  |   2 +
 modules/terminal/hjem/programs/fzf.nix   |   4 +-
 modules/terminal/hjem/programs/helix.nix |   6 +-
 5 files changed, 57 insertions(+), 115 deletions(-)

diff --git a/modules/desktop/hjem/programs/foot.nix b/modules/desktop/hjem/programs/foot.nix
index f1bb0bb..7fe88ab 100644
--- a/modules/desktop/hjem/programs/foot.nix
+++ b/modules/desktop/hjem/programs/foot.nix
@@ -9,12 +9,11 @@
   settings = {
     main = {
       font = "Iosevka Nerd Font:size=12";
-      shell = "${pkgs.fish}/bin/fish";
+      # shell = "${pkgs.fish}/bin/fish";
+      shell = "${pkgs.fish}/bin/fish -c 'br'";
     };
 
-    key-bindings = {
-      spawn-terminal = "Control+Return";
-    };
+    # key-bindings.spawn-terminal = "Control+Return";
 
     colors = with config.collinux.palette; {
       alpha = "0.6";
diff --git a/modules/terminal/hjem/programs/broot.nix b/modules/terminal/hjem/programs/broot.nix
index 2907a85..d382cbe 100644
--- a/modules/terminal/hjem/programs/broot.nix
+++ b/modules/terminal/hjem/programs/broot.nix
@@ -6,119 +6,60 @@
 }: let
   cfg = config.collinux.terminal.programs.broot;
 
-  conf =
-    {
-      verbs = [
-        {
-          name = "open-code";
-          key = "enter";
-          execution = "$EDITOR +{line} {file}";
-          working_dir = "{root}";
-          apply_to = "file";
-          leave_broot = true;
-        }
-      ];
-    }
-    // (lib.optionalAttrs (cfg.theme == "catppuccin") {skin = catppuccin_skin;});
+  conf = {
+    imports = [
+      "skins/catppuccin-mocha.hjson"
+    ];
 
-  catppuccin_skin = {
-    input = "rgb(205, 214, 244) none";
-    selected_line = "none rgb(88, 91, 112)";
-    default = "rgb(205, 214, 244) none";
-    tree = "rgb(108, 112, 134) none";
-    parent = "rgb(116, 199, 236) none";
-    file = "none none";
+    default_flags = "-g";
+    icon_theme = "nerdfont";
+    special_paths."~/.config".show = "always";
 
-    perm__ = "rgb(186, 194, 222) none";
-    perm_r = "rgb(250, 179, 135) none";
-    perm_w = "rgb(235, 160, 172) none";
-    perm_x = "rgb(166, 227, 161) none";
-    owner = "rgb(148, 226, 213) none";
-    group = "rgb(137, 220, 235) none";
-
-    dates = "rgb(186, 194, 222) none";
-
-    directory = "rgb(180, 190, 254) none Bold";
-    exe = "rgb(166, 227, 161) none";
-    link = "rgb(249, 226, 175) none";
-    pruning = "rgb(166, 173, 200) none Italic";
-
-    preview_title = "rgb(205, 214, 244) rgb(24, 24, 37)";
-    preview = "rgb(205, 214, 244) rgb(24, 24, 37)";
-    preview_line_number = "rgb(108, 112, 134) none";
-    preview_separator = "rgb(108, 112, 134) none";
-
-    char_match = "rgb(249, 226, 175) rgb(69, 71, 90) Bold Italic";
-    content_match = "rgb(249, 226, 175) rgb(69, 71, 90) Bold Italic";
-    preview_match = "rgb(249, 226, 175) rgb(69, 71, 90) Bold Italic";
-
-    count = "rgb(249, 226, 175) none";
-    sparse = "rgb(243, 139, 168) none";
-    content_extract = "rgb(243, 139, 168) none Italic";
-
-    git_branch = "rgb(250, 179, 135) none";
-    git_insertions = "rgb(250, 179, 135) none";
-    git_deletions = "rgb(250, 179, 135) none";
-    git_status_current = "rgb(250, 179, 135) none";
-    git_status_modified = "rgb(250, 179, 135) none";
-    git_status_new = "rgb(250, 179, 135) none Bold";
-    git_status_ignored = "rgb(250, 179, 135) none";
-    git_status_conflicted = "rgb(250, 179, 135) none";
-    git_status_other = "rgb(250, 179, 135) none";
-    staging_area_title = "rgb(250, 179, 135) none";
-
-    flag_label = "rgb(243, 139, 168) none";
-    flag_value = "rgb(243, 139, 168) none Bold";
-
-    status_normal = "none rgb(24, 24, 37)";
-    status_italic = "rgb(243, 139, 168) rgb(24, 24, 37) Italic";
-    status_bold = "rgb(235, 160, 172) rgb(24, 24, 37) Bold";
-    status_ellipsis = "rgb(235, 160, 172) rgb(24, 24, 37) Bold";
-    status_error = "rgb(205, 214, 244) rgb(243, 139, 168)";
-    status_job = "rgb(235, 160, 172) rgb(40, 38, 37)";
-    status_code = "rgb(235, 160, 172) rgb(24, 24, 37) Italic";
-    mode_command_mark = "rgb(235, 160, 172) rgb(24, 24, 37) Bold";
-
-    help_paragraph = "rgb(205, 214, 244) none";
-    help_headers = "rgb(243, 139, 168) none Bold";
-    help_bold = "rgb(250, 179, 135) none Bold";
-    help_italic = "rgb(249, 226, 175) none Italic";
-    help_code = "rgb(166, 227, 161) rgb(49, 50, 68)";
-    help_table_border = "rgb(108, 112, 134) none";
-
-    hex_null = "rgb(205, 214, 244) none";
-    hex_ascii_graphic = "rgb(250, 179, 135) none";
-    hex_ascii_whitespace = "rgb(166, 227, 161) none";
-    hex_ascii_other = "rgb(148, 226, 213) none";
-    hex_non_ascii = "rgb(243, 139, 168) none";
-
-    file_error = "rgb(251, 73, 52) none";
-
-    purpose_normal = "none none";
-    purpose_italic = "rgb(177, 98, 134) none Italic";
-    purpose_bold = "rgb(177, 98, 134) none Bold";
-    purpose_ellipsis = "none none";
-
-    scrollbar_track = "rgb(49, 50, 68) none";
-    scrollbar_thumb = "rgb(88, 91, 112) none";
-
-    good_to_bad_0 = "rgb(166, 227, 161) none";
-    good_to_bad_1 = "rgb(148, 226, 213) none";
-    good_to_bad_2 = "rgb(137, 220, 235) none";
-    good_to_bad_3 = "rgb(116, 199, 236) none";
-    good_to_bad_4 = "rgb(137, 180, 250) none";
-    good_to_bad_5 = "rgb(180, 190, 254) none";
-    good_to_bad_6 = "rgb(203, 166, 247) none";
-    good_to_bad_7 = "rgb(250, 179, 135) none";
-    good_to_bad_8 = "rgb(235, 160, 172) none";
-    good_to_bad_9 = "rgb(243, 139, 168) none";
+    verbs = [
+      {
+        name = "open-code";
+        key = "enter";
+        execution = "$EDITOR +{line} {file}";
+        working_dir = "{root}";
+        apply_to = "file";
+        leave_broot = false;
+      }
+      {
+        name = "lazygit";
+        key = "ctrl-g";
+        execution = "lazygit";
+        working_dir = "{root}";
+        apply_to = "any";
+        leave_broot = false;
+      }
+      {
+        name = "justfile";
+        key = "ctrl-j";
+        execution = "${pkgs.just}/bin/just --choose";
+        working_dir = "{root}";
+        apply_to = "any";
+        leave_broot = false;
+      }
+      {
+        name = "terminal";
+        key = "ctrl-t";
+        execution = "$SHELL";
+        working_dir = "{root}";
+        leave_broot = false;
+      }
+      {
+        name = "home";
+        key = "ctrl-h";
+        cmd = ":input_clear;:focus ~";
+      }
+    ];
   };
 in
   lib.mkIf cfg.enable {
     files =
       {
-        ".config/broot/conf.toml" = {
-          generator = (pkgs.formats.toml {}).generate "conf.toml";
+        ".config/broot/conf.hjson" = {
+          generator = (pkgs.formats.json {}).generate "broot-conf.hjson";
           value = conf;
         };
       }
diff --git a/modules/terminal/hjem/programs/fish.nix b/modules/terminal/hjem/programs/fish.nix
index 3210dcf..f06b005 100644
--- a/modules/terminal/hjem/programs/fish.nix
+++ b/modules/terminal/hjem/programs/fish.nix
@@ -20,6 +20,7 @@ in
         set -gx CARGO_HOME "$XDG_DATA_HOME/cargo"
         set -gx ANDROID_USER_HOME "$XDG_DATA_HOME/android"
         set -gx WINE_PREFIX "$XDG_DATA_HOME/wine"
+        set -gx DOTNET_CLI_HOME "$XDG_DATA_HOME/dotnet"
 
         set -gx PYTHON_HISTORY "/dev/null"
       '';
@@ -37,6 +38,7 @@ in
 
     packages = with pkgs; [
       fish
+      just
       ripgrep
       fd
       wget
diff --git a/modules/terminal/hjem/programs/fzf.nix b/modules/terminal/hjem/programs/fzf.nix
index f697a24..e43f5ea 100644
--- a/modules/terminal/hjem/programs/fzf.nix
+++ b/modules/terminal/hjem/programs/fzf.nix
@@ -12,7 +12,7 @@ in
         ".config/fish/conf.d/fzf.fish".text = ''
           fzf --fish | source
           set -Ux FZF_DEFAULT_OPTS "$FZF_NON_COLOR_OPTS"\
-          " --color=bg+:#${base01},bg:#${base00},spinner:#${base12},hl:#${base13}"\
+          " --color=bg+:#${base01},spinner:#${base12},hl:#${base13}"\
           " --color=fg:#${base04},header:#${base13},info:#${base10},pointer:#${base12}"\
           " --color=marker:#${base12},fg+:#${base06},prompt:#${base10},hl+:#${base13}"
         '';
@@ -21,7 +21,7 @@ in
         ".config/bash/conf.d/fzf.bash".text = ''
           eval "$(fzf --bash)"
           export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS"\
-          " --color=bg+:#${base01},bg:#${base00},spinner:#${base12},hl:#${base13}"\
+          " --color=bg+:#${base01},spinner:#${base12},hl:#${base13}"\
           " --color=fg:#${base04},header:#${base13},info:#${base10},pointer:#${base12}"\
           " --color=marker:#${base12},fg+:#${base06},prompt:#${base10},hl+:#${base13}"
         '';
diff --git a/modules/terminal/hjem/programs/helix.nix b/modules/terminal/hjem/programs/helix.nix
index 5a8db19..89d18f4 100644
--- a/modules/terminal/hjem/programs/helix.nix
+++ b/modules/terminal/hjem/programs/helix.nix
@@ -71,7 +71,7 @@
   }: {
     inherit theme;
     editor = {
-      gutters = ["diff" "diagnostics" "line-numbers" "spacer" "spacer"];
+      gutters = [];
       cursorline = true;
       color-modes = true;
 
@@ -80,9 +80,9 @@
       lsp.display-inlay-hints = true;
 
       statusline = {
-        left = ["mode" "file-name" "spacer" "file-modification-indicator"];
+        left = ["mode" "file-name" "position" "spacer" "file-modification-indicator"];
         right = ["spinner" "spacer" "workspace-diagnostics" "file-type"];
-        separator = "x";
+        separator = "+";
       };
 
       cursor-shape = {
-- 
cgit v1.3.1