diff --git a/machines/oracle/configuration.nix b/machines/oracle/configuration.nix
index e5840bf..db3a2ba 100644
--- a/machines/oracle/configuration.nix
+++ b/machines/oracle/configuration.nix
@@ -16,6 +16,7 @@
   };
 
   programs.zsh.enable = true;
+  environment.variables.EDITOR = "nvim";
 
   users.users.michael = {
     isNormalUser  = true;
diff --git a/user/environments/nixos-server/home.nix b/user/environments/nixos-server/home.nix
index 8239aeb..ffd76fb 100644
--- a/user/environments/nixos-server/home.nix
+++ b/user/environments/nixos-server/home.nix
@@ -5,9 +5,12 @@
   ];
 
   home.packages = with pkgs; [
-    neovim
     lazygit
   ];
 
+  programs.neovim = {
+    enable = true;
+  };
+
   home.stateVersion = "21.05";
 }