diff --git a/computers/python/apps.nix b/computers/python/apps.nix
index 3de358f..5211ec7 100644
--- a/computers/python/apps.nix
+++ b/computers/python/apps.nix
@@ -1,12 +1,15 @@
 {pkgs, ...}: {
-  environment.systemPackages = builtins.attrValues {
-    inherit
-      (pkgs)
-      nil
-      statix
-      deadnix
-      alejandra
-      ;
+  environment = {
+    systemPackages = builtins.attrValues {
+      inherit
+        (pkgs)
+        nil
+        statix
+        deadnix
+        alejandra
+        ;
+    };
+    sessionVariables = {EDITOR = "nvim";};
   };
   alqueva = {
     mpd = {
diff --git a/computers/shared/emacs.nix b/computers/shared/emacs.nix
index f1f8962..6a6b8bf 100644
--- a/computers/shared/emacs.nix
+++ b/computers/shared/emacs.nix
@@ -13,7 +13,7 @@ in {
   config = lib.mkIf cfg.enable {
     environment = {
       systemPackages = [inputs.pankomacs.packages.${pkgs.system}.pankomacs];
-      sessionVariables."EDITOR" = "emacs";
+      sessionVariables."EDITOR" = lib.mkDefault "emacs";
     };
   };
 }