1 files changed, 6 insertions, 15 deletions
diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index 024547c..9b012f0 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./fzf.nix
+    ./fish.nix
     ./multiplexers.nix
     ./nix.nix
     ./nix-ld.nix
@@ -60,21 +61,11 @@
         [ git ]
     );
 
-  environment.variables =
-    let
-      editorconf =
-        if config.services.emacs.defaultEditor then
-          { }
-        else
-          {
-            EDITOR = "nvim";
-          };
-    in
-    {
-      PAGER = "less";
-      LESS = "-X -R -F";
-    }
-    // editorconf;
+  environment.variables = {
+    PAGER = "less";
+    LESS = "-X -R -F";
+    EDITOR = "nvim";
+  };
 
   environment.shellAliases = {
     vim = "nvim";