diff --git a/common/default.nix b/common/default.nix
index e979be4..e107561 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -37,9 +37,6 @@
   environment.enableAllTerminfo = true;
   environment.variables.COLORTERM = "truecolor";
 
-  # Set editor
-  environment.variables.EDITOR = "hx";
-
   # Packages used on all systems
   environment.systemPackages = with pkgs; [
     comma
diff --git a/common/home_manager/helix.nix b/common/home_manager/helix.nix
index 91ccc21..50b4ade 100644
--- a/common/home_manager/helix.nix
+++ b/common/home_manager/helix.nix
@@ -1,4 +1,7 @@
 { pkgs, lib, ... }: {
+  # Set editor
+  environment.variables.EDITOR = "hx";
+
   home-manager.users.agatha = {
     # Formatters/Language Servers that Helix uses
     home.packages = with pkgs; [ nixfmt ];