diff --git a/home/fish.nix b/home/fish.nix
index 68396eea..4536e4c0 100644
--- a/home/fish.nix
+++ b/home/fish.nix
@@ -50,9 +50,6 @@ in
     set-shell-colors = {
       body =
         ''
-          # Set LS_COLORS
-          set -xg LS_COLORS (${pkgs.vivid}/bin/vivid generate solarized-$term_background)
-
           # Set color variables
           if test "$term_background" = light
             set emphasized_text  brgreen  # base01
@@ -127,8 +124,6 @@ in
     du = "${du-dust}/bin/dust";
     g = "${gitAndTools.git}/bin/git";
     la = "ll -a";
-    ll = "ls -l --time-style long-iso --icons";
-    ls = "${eza}/bin/eza";
     tb = "toggle-background";
   };
 
diff --git a/home/packages.nix b/home/packages.nix
index 6b17dc4c..0f55220d 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -46,6 +46,16 @@ in
   programs.direnv.enable = true;
   programs.direnv.nix-direnv.enable = true;
 
+  # Eza, a modern, maintained replacement for ls, written in rust
+  # https://eza.rocks
+  # https://nix-community.github.io/home-manager/options.xhtml#opt-programs.eza.enable
+  programs.eza.enable = true;
+  programs.eza.git = true;
+  programs.eza.icons = "auto";
+  programs.eza.extraOptions = [ "--group-directories-first" ];
+  home.sessionVariables.EZA_COLORS = "xx=0"; # https://github.com/eza-community/eza/issues/994
+  home.sessionVariables.EZA_ICON_SPACING = 2;
+
   # SSH
   # https://nix-community.github.io/home-manager/options.html#opt-programs.ssh.enable
   # Some options also set in `../darwin/homebrew.nix`.