5 files changed, 18 insertions, 6 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;
     };
 
diff --git a/common/commandline/atuin.nix b/common/commandline/atuin.nix
index 5dcde48..e4097a1 100644
--- a/common/commandline/atuin.nix
+++ b/common/commandline/atuin.nix
@@ -1,6 +1,7 @@
 {
   home-manager.users.minijackson.programs.atuin = {
     enable = true;
+    enableFishIntegration = true;
     enableZshIntegration = true;
     flags = [ "--disable-up-arrow" ];
   };
diff --git a/common/commandline/dircolors.nix b/common/commandline/dircolors.nix
index 3d27f73..75fe06f 100644
--- a/common/commandline/dircolors.nix
+++ b/common/commandline/dircolors.nix
@@ -317,9 +317,4 @@ inputs: {
         // (style compiled_files compiled_style));
     in "rs=0:${colors}";
   };
-
-  home-manager.users.root = {...}: {
-    programs.dircolors =
-      lib.mkDefault config.home-manager.users.minijackson.programs.dircolors;
-  };
 }
diff --git a/common/commandline/fish.nix b/common/commandline/fish.nix
new file mode 100644
index 0000000..a371a1d
--- /dev/null
+++ b/common/commandline/fish.nix
@@ -0,0 +1,12 @@
+{
+  programs.fish = {
+    enable = true;
+    useBabelfish = true;
+  };
+
+  home-manager.sharedModules = [
+    {
+      programs.fish.enable = true;
+    }
+  ];
+}
diff --git a/common/commandline/starship.nix b/common/commandline/starship.nix
index cb12611..473d201 100644
--- a/common/commandline/starship.nix
+++ b/common/commandline/starship.nix
@@ -7,6 +7,7 @@ _inputs:
     {
       programs.starship = {
         enable = true;
+        enableFishIntegration = true;
         enableZshIntegration = true;
 
         settings = lib.mkMerge [