diff --git a/modules/home/all/git.nix b/modules/home/all/git.nix
index c65b770..a1a5695 100644
--- a/modules/home/all/git.nix
+++ b/modules/home/all/git.nix
@@ -31,7 +31,6 @@
     lfs.enable = true;
     extraConfig = {
       init.defaultBranch = "master"; # Undo breakage due to https://srid.ca/luxury-belief
-      core.editor = "nvim";
       #protocol.keybase.allow = "always";
       credential.helper = "store --file ~/.git-credentials";
       pull.rebase = "false";
diff --git a/modules/home/all/helix.nix b/modules/home/all/helix.nix
index f1d4575..b9838ab 100644
--- a/modules/home/all/helix.nix
+++ b/modules/home/all/helix.nix
@@ -2,6 +2,7 @@
 {
   programs.helix = {
     enable = true;
+    defaultEditor = true;
     extraPackages = with pkgs; [
       marksman
     ];
diff --git a/modules/home/all/nushell/default.nix b/modules/home/all/nushell/default.nix
index f73910b..f40d811 100644
--- a/modules/home/all/nushell/default.nix
+++ b/modules/home/all/nushell/default.nix
@@ -5,8 +5,5 @@
     envFile.source = ./env.nu;
     configFile.source = ./config.nu;
     shellAliases = config.home.shellAliases;
-    environmentVariables = {
-      EDITOR = "nvim";
-    };
   };
 }
diff --git a/modules/home/all/terminal.nix b/modules/home/all/terminal.nix
index 3dfab4c..52f385f 100644
--- a/modules/home/all/terminal.nix
+++ b/modules/home/all/terminal.nix
@@ -63,7 +63,7 @@ in
   fonts.fontconfig.enable = true;
 
   home.shellAliases = {
-    e = "nvim";
+    e = "hx";
     g = "git";
     lg = "lazygit";
     l = "ls";