...

1 files changed, 124 insertions, 22 deletions

diff --git a/hm/shell/cli.nix b/hm/shell/cli.nix
index da9c64e..a9e8397 100644
--- a/hm/shell/cli.nix
+++ b/hm/shell/cli.nix
@@ -10,33 +10,75 @@ in
 {
   options.hm.shell.cli.enable = lib.mkEnableOption "modern cli tools";
   config = lib.mkIf cfg.enable {
+    programs.yazi = {
+      # TODO
+      enable = true;
+      shellWrapperName = "y";
+    };
+    # TODO
+    programs.fzf = {
+      enable = true;
+      enableFishIntegration = true;
+    };
     programs.zoxide = {
       enable = true;
+      enableFishIntegration = true;
       options = [ "--cmd cd" ];
     };
     programs.bat = {
       enable = true;
-      config.theme = "gruvbox-dark";
+      config = {
+        theme = "gruvbox-dark";
+        style = "numbers";
+        pager = "less -RSFK";
+        wrap = "never";
+        tabs = "2";
+      };
+      extraPackages = [ pkgs.bat-extras.core ];
+    };
+    programs.fd = {
+      enable = true;
+      hidden = true;
+      ignores = [
+        ".git/"
+        "*.bak"
+      ];
     };
+    programs.ripgrep-all.enable = true;
+    programs.btop = {
+      enable = true;
+      package = pkgs.btop.override { rocmSupport = true; };
+      settings = {
+        presets = "cpu:1:default,proc:0:default cpu:0:default,gpu0:0:default,mem:0:default";
+        vim_keys = true;
+        update_ms = 1000;
+        proc_gradient = false;
+        proc_filter_kernel = true;
+        show_uptime = false;
+        freq_mode = "average";
+        mem_graphs = false;
+        show_disks = false;
 
-    programs.fzf.enable = true;
-    programs.fd.enable = true;
-    programs.ripgrep.enable = true;
-    programs.yazi.enable = true;
-    programs.btop.enable = true;
+        proc_gpu_summary = true;
+      };
+    };
     programs.fastfetch = {
       enable = true;
       settings = {
         display = {
-          size = {
-            binaryPrefix = "iec";
-          };
           separator = "  ";
+          color = {
+            keys = "blue";
+            title = "cyan";
+          };
         };
         multithreading = true;
         modules = [
           "title"
-          "separator"
+          {
+            type = "separator";
+            string = "━";
+          }
           "os"
           {
             type = "command";
@@ -61,10 +103,23 @@ in
         ];
       };
     };
-    # programs.direnv = {
-    #   enable = true;
-    #   nix-direnv.enable = true;
-    # };
+    programs.direnv = {
+      enable = true;
+      enableFishIntegration = true;
+      nix-direnv.enable = true;
+      config = {
+        global = {
+          load_dotenv = true;
+          strict_env = true;
+          hide_env_diff = true;
+        };
+        whitelist = {
+          prefix = [
+            "~/proj"
+          ];
+        };
+      };
+    };
     programs.nix-your-shell = {
       enable = true;
       enableFishIntegration = true;
@@ -72,18 +127,65 @@ in
     };
     programs.bottom = {
       enable = true;
+      settings = {
+        flags = {
+          basic = true;
+
+          current_usage = true;
+          unnormalized_cpu = false;
+          hide_k_threads = true;
+
+          process_memory_as_value = true;
+          enable_cache_memory = true;
+          network_use_bytes = true;
+          network_use_binary_prefix = true;
+
+          battery = true;
+          show_table_scroll_position = true;
+          hide_table_gap = true;
+
+          theme = "gruvbox";
+        };
+        processes.columns = [
+          "PID"
+          "Name"
+          "CPU%"
+          "Mem%"
+          "GPU%"
+          "GMem%"
+          "User"
+        ];
+        disk.columns = [
+          "Disk"
+          "Mount"
+          "Free"
+          "Total"
+          "R/s"
+          "W/s"
+        ];
+      };
     };
     programs.tealdeer = {
       enable = true;
-      enableAutoUpdates = true;
+      settings = {
+        updates.auto_update = true;
+        style = {
+          description.foreground = "white";
+          example_text.foreground = "cyan";
+          command_name.foreground = "yellow";
+          example_variable.foreground = "green";
+          example_code.foreground = "blue";
+        };
+      };
+    };
+    programs.pls = {
+      enable = true;
+      enableFishIntegration = true;
+    };
+    programs.nix-index = {
+      enable = true;
+      enableFishIntegration = true;
     };
-    # programs.lazygit = {
-    #   enable = true;
-    #   enableFishIntegration = true;
-    # };
-    programs.riff.enable = true;
-    programs.pls.enable = true;
-    programs.nix-index.enable = true;
 
     home.packages = with pkgs; [
       sd