diff --git a/modules/common-packages.nix b/modules/common-packages.nix
index 08e5090..cdd2f22 100644
--- a/modules/common-packages.nix
+++ b/modules/common-packages.nix
@@ -48,6 +48,11 @@
     bat
   ];
 
+  environment.variables = {
+    EDITOR = "nvim";
+    VISUAL = "nvim";
+  };
+
   virtualisation.docker.enable = true;
 
   # Enable the OpenSSH daemon.