diff --git a/modules/base/default.nix b/modules/base/default.nix
index 5ad8085..1719344 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -130,7 +130,7 @@
 
       sysdig.enable = pkgs.stdenv.hostPlatform.system == "x86_64-linux";
 
-      vim.defaultEditor = true;
+      #vim.defaultEditor = true;
     };
 
     services = {
diff --git a/modules/base/users/default.nix b/modules/base/users/default.nix
index f75437b..feee467 100644
--- a/modules/base/users/default.nix
+++ b/modules/base/users/default.nix
@@ -56,16 +56,16 @@
 
       programs.direnv.enable = true;
 
-      programs.vim = {
+      programs.neovim = {
         enable = true;
+        vimAlias = true;
+        vimdiffAlias = true;
+        defaultEditor = true;
         plugins = lib.mkIf config.mj.base.users.devEnvironment [
           pkgs.vimPlugins.fugitive
           pkgs.vimPlugins.vim-go
           pkgs.vimPlugins.zig-vim
         ];
-        settings = {
-          background = "light";
-        };
         extraConfig = builtins.readFile ./vimrc;
       };