diff --git a/modules/core.nix b/modules/core.nix
index c2a2a96..e2008a5 100644
--- a/modules/core.nix
+++ b/modules/core.nix
@@ -33,6 +33,11 @@
         system.stateVersion = "24.05";
         time.timeZone = "America/New_York";
         nix.settings.experimental-features = ["flakes" "nix-command"];
+        
+        environment.variables = {
+            EDITOR = "nvim";
+            VISUAL = "nvim";
+        };
 
         users = {
             enable = lib.mkDefault true;