diff --git a/programs/fish.nix b/programs/fish.nix
index 074fbbf..a4bb0f4 100644
--- a/programs/fish.nix
+++ b/programs/fish.nix
@@ -10,10 +10,6 @@
   hm.programs.fish = {
     enable = true;
 
-    shellInit = ''
-      set -x EDTIOR nvim
-    '';
-
     interactiveShellInit = with pkgs; ''
       ${lib.getExe starship} init fish | source
       ${lib.getExe nix-your-shell} fish | source
diff --git a/systems/common.nix b/systems/common.nix
index 67daf6d..26fe648 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -4,11 +4,17 @@
   nixpkgs,
   ...
 }: {
-  environment.systemPackages = with pkgs; [
-    neovim
-    git
-    curl
-  ];
+  environment = {
+    systemPackages = with pkgs; [
+      neovim
+      git
+      curl
+    ];
+
+    variables = {
+      EDITOR = lib.getExe pkgs.neovim;
+    };
+  };
 
   programs = {
     ssh.startAgent = true;