diff --git a/configuration.nix b/configuration.nix
index 7b1ff0a..20cf532 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,6 +2,7 @@
 , pkgs
 , inputs
 , settings
+, lib
 , ...
 }: {
   imports = [
@@ -159,10 +160,10 @@
     autoPrune.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [
-    mergerfs
-    mergerfs-tools
-  ];
+  environment.variables = {
+    EDITOR = lib.getExe pkgs.helix;
+    VISUAL = lib.getExe pkgs.helix;
+  };
 
   programs = {
     mosh.enable = true;
diff --git a/drives.nix b/drives.nix
index 4452cf3..9cde761 100644
--- a/drives.nix
+++ b/drives.nix
@@ -1,4 +1,9 @@
-{ lib, ... }: {
+{ lib, pkgs, ... }: {
+  environment.systemPackages = with pkgs; [
+    mergerfs
+    mergerfs-tools
+  ];
+
   fileSystems = {
     "/mnt/seagate-8tb-1" = {
       device = "/dev/disk/by-uuid/94471772-5f7e-4a59-b731-4cac02cb1c86";