diff --git a/nix-conf/machines/djmuk1/configuration.nix b/nix-conf/machines/djmuk1/configuration.nix
index 74e252a..305f45f 100644
--- a/nix-conf/machines/djmuk1/configuration.nix
+++ b/nix-conf/machines/djmuk1/configuration.nix
@@ -54,12 +54,13 @@
      extraRules = [ { users = [ "djm" ]; noPass = true; keepEnv = true; } ];
    };
 
+   programs.vim.defaultEditor = true;
+
    environment.systemPackages = with pkgs; [
      #procmail
      vim
      wget
    ];
-   environment.variables = { EDITOR = "vim"; VISUAL = "vim"; };
 
    nix.trustedUsers = [ "root" "djm" ];
 
diff --git a/nix-conf/machines/djmuk2/configuration.nix b/nix-conf/machines/djmuk2/configuration.nix
index d115655..fcde201 100644
--- a/nix-conf/machines/djmuk2/configuration.nix
+++ b/nix-conf/machines/djmuk2/configuration.nix
@@ -55,13 +55,14 @@
      extraRules = [ { users = [ "djm" ]; noPass = true; keepEnv = true; } ];
    };
 
+   programs.vim.defaultEditor = true;
+
    environment.systemPackages = with pkgs; [
      #procmail
      git
      vim
      wget
    ];
-   environment.variables = { EDITOR = "vim"; VISUAL = "vim"; };
 
    nix.trustedUsers = [ "root" "djm" ];
 
diff --git a/nix-conf/machines/egalmoth/configuration.nix b/nix-conf/machines/egalmoth/configuration.nix
index d9e239f..2988e7d 100644
--- a/nix-conf/machines/egalmoth/configuration.nix
+++ b/nix-conf/machines/egalmoth/configuration.nix
@@ -181,6 +181,8 @@ in
     enableSSHSupport = true;
   };
 
+  programs.vim.defaultEditor = true;
+
   services.openssh.enable = true;
 
   system.stateVersion = "21.05"; # Did you read the comment?