1 files changed, 4 insertions, 1 deletions

diff --git a/common/commandline.nix b/common/commandline.nix
index d2735e0..1371beb 100644
--- a/common/commandline.nix
+++ b/common/commandline.nix
@@ -13,6 +13,7 @@ in {
   imports = [
     ./commandline/atuin.nix
     (import ./commandline/dircolors.nix inputs)
+    ./commandline/fish.nix
     (import ./commandline/git.nix inputs)
     (import ./commandline/htop.nix inputs)
     (import ./commandline/starship.nix inputs)
@@ -78,7 +79,7 @@ in {
   };
 
   environment.shellAliases = {
-    e = "\${EDITOR}";
+    e = config.environment.variables.EDITOR;
     o = "xdg-open";
     cpr = "${pkgs.rsync}/bin/rsync -ah --inplace --info=progress2";
   };
@@ -131,6 +132,7 @@ in {
   programs.nix-index = {
     enable = true;
     enableBashIntegration = true;
+    enableFishIntegration = true;
     enableZshIntegration = true;
   };
 
@@ -153,6 +155,7 @@ in {
 
     programs.eza = {
       enable = true;
+      enableFishIntegration = true;
       enableZshIntegration = true;
     };