5 files changed, 41 insertions, 32 deletions
diff --git a/modules/file-management/default.nix b/modules/file-management/default.nix
index 4abe437..44fd55e 100644
--- a/modules/file-management/default.nix
+++ b/modules/file-management/default.nix
@@ -2,9 +2,9 @@
 { ... }:
 {
   imports = [
-    ./yazi
-    ./lsd
+    ./eza
     ./ouch
     ./usb
+    ./yazi
   ];
 }
diff --git a/modules/file-management/eza/default.nix b/modules/file-management/eza/default.nix
new file mode 100644
index 0000000..f22b435
--- /dev/null
+++ b/modules/file-management/eza/default.nix
@@ -0,0 +1,32 @@
+# Modern ls replacement with icons and colors
+{ config, lib, ... }:
+{
+  options.file-management.eza = {
+    enable = lib.mkEnableOption "Enables eza.";
+    package = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = config.programs.eza.package;
+      defaultText = lib.literalExpression "config.programs.eza.package";
+      description = "The eza package to use.";
+    };
+  };
+
+  config = lib.mkIf config.file-management.eza.enable {
+    programs.eza = {
+      enable = true;
+      icons = "always";
+      colors = "always";
+      git = config.development.git.enable;
+      enableZshIntegration = config.terminal.zsh.enable;
+      extraOptions = [
+        "--all"
+        "--git"
+        "--group"
+        "--group-directories-first"
+        "--header"
+        "--long"
+      ];
+    };
+  };
+}
diff --git a/modules/file-management/lsd/default.nix b/modules/file-management/lsd/default.nix
deleted file mode 100644
index 995fd29..0000000
--- a/modules/file-management/lsd/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# Ls alternative with icons and colors
-{ config, lib, ... }:
-{
-  options.file-management.lsd = {
-    enable = lib.mkEnableOption "Enables lsd.";
-    package = lib.mkOption {
-      type = lib.types.package;
-      readOnly = true;
-      default = config.programs.lsd.package;
-      description = "The lsd package to use.";
-    };
-  };
-
-  config = lib.mkIf config.file-management.lsd.enable {
-    programs.lsd = {
-      enable = true;
-      settings.icons.separator = "  ";
-    };
-  };
-}
diff --git a/modules/web/chromium/extensions/lib.nix b/modules/web/chromium/extensions/lib.nix
index fed6846..2fdd3a8 100644
--- a/modules/web/chromium/extensions/lib.nix
+++ b/modules/web/chromium/extensions/lib.nix
@@ -4,7 +4,7 @@
   config,
   checkForUpdates ? true,
 }:
-rec {
+let
   # Fetch using the Releases API (Finds the latest official GitHub Release)
   fetchLatestGithubReleaseTag =
     { owner, repo }:
@@ -48,7 +48,7 @@ rec {
       throw "No tags found for ${owner}/${repo} matching prefix '${tagPrefix}' and regex '${toString tagRegex}'";
 
   # Internal helper to handle the version comparison and error message
-  _verifyAndThrow =
+  verifyAndThrow =
     {
       pname,
       version,
@@ -82,7 +82,8 @@ rec {
       ''
     else
       version;
-
+in
+{
   checkExtensionVersion =
     {
       pname,
@@ -98,7 +99,7 @@ rec {
       let
         latestTag = fetchLatestGithubReleaseTag { inherit owner repo; };
       in
-      _verifyAndThrow {
+      verifyAndThrow {
         inherit
           pname
           version
@@ -132,7 +133,7 @@ rec {
             ;
         };
       in
-      _verifyAndThrow {
+      verifyAndThrow {
         inherit
           pname
           version
@@ -143,10 +144,7 @@ rec {
         updateType = "tag";
       };
 
-  # ==========================================
-  # 3. EXTENSION BUILDERS
-  # ==========================================
-
+  # EXTENSION BUILDERS
   # Download and unpack a zip or crx file into an unpacked extension directory
   fetchUnpackedExtension =
     {
diff --git a/modules/web/chromium/extensions/vimium.nix b/modules/web/chromium/extensions/vimium.nix
index 5c9726b..4c1511a 100644
--- a/modules/web/chromium/extensions/vimium.nix
+++ b/modules/web/chromium/extensions/vimium.nix
@@ -1,6 +1,5 @@
 {
   extLib,
-  lib,
   ...
 }:
 let