2 files changed, 40 insertions, 17 deletions

diff --git a/hm/shell/cli.nix b/hm/shell/cli.nix
index 142fda5..2716e00 100644
--- a/hm/shell/cli.nix
+++ b/hm/shell/cli.nix
@@ -3,21 +3,22 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   cfg = config.hm.shell.cli;
-in {
+in
+{
   options.hm.shell.cli.enable = lib.mkEnableOption "modern cli tools";
   config = lib.mkIf cfg.enable {
     programs.zoxide = {
       enable = true;
-      options = ["--cmd cd"];
+      options = [ "--cmd cd" ];
     };
     programs.bat = {
       enable = true;
       config.theme = "gruvbox-dark";
     };
 
-    programs.eza.enable = true;
     programs.fzf.enable = true;
     programs.fd.enable = true;
     programs.ripgrep.enable = true;
@@ -60,24 +61,44 @@ in {
         ];
       };
     };
-    programs.direnv.enable = true;
-    programs.jq.enable = true;
+    # programs.direnv = {
+    #   enable = true;
+    #   nix-direnv.enable = true;
+    # };
     programs.nix-your-shell = {
       enable = true;
       enableFishIntegration = true;
       nix-output-monitor.enable = true;
     };
+    programs.bottom = {
+      enable = true;
+    };
+    programs.tealdeer = {
+      enable = 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
+      choose
+      doggo
+      gping
+      comma
+      dust
       nix-search-cli
       srm
       file
-      mediainfo
-      chafa
       hexyl
       procs
-      yq-go
-      tldr
+
+      chafa
+      ffmpeg
     ];
   };
 }
diff --git a/hm/shell/fish.nix b/hm/shell/fish.nix
index 88a4493..6338cb1 100644
--- a/hm/shell/fish.nix
+++ b/hm/shell/fish.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.hm.shell.fish;
 in
@@ -14,22 +19,19 @@ in
       '';
 
       shellAliases = {
-        update = "git add . && git commit -m \"$1\" && nh os switch .";
+        update = "git add . && git commit -m \"$1\" && nix flake update && nh os switch .";
 
         nos = "nh os switch .";
         nob = "nh os boot .";
         nfu = "nix flake update";
-        
-        ll = "ls -lah";
-        la = "ls -A";
+
         md = "mkdir -p";
         rmf = "rm -rf";
         untar = "tar -xzvf";
         tarc = "tar -czvf";
-        
+
         ff = "fastfetch";
         cat = "bat";
-        ls = "eza";
         yt = "yt-dlp";
       };