diff --git a/configuration.nix b/configuration.nix
index 9660ffa..d103198 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -49,12 +49,12 @@ in
 
   environment = {
     systemPackages = with pkgs; [
-      vim
       wget
       curl
       git
       btop
       ripgrep
+      vim
     ];
     gnome.excludePackages = with pkgs; [ gnome-tour gnome.epiphany gnome.geary gnome-console ];
   };
diff --git a/home.nix b/home.nix
index 3d1f87b..4e67cdc 100644
--- a/home.nix
+++ b/home.nix
@@ -12,6 +12,17 @@
 
   programs = {
     home-manager.enable = true;
+    neovim = {
+      enable = true;
+      viAlias = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      defaultEditor = true;
+      plugins = with pkgs.vimPlugins; [
+        mason-nvim
+      ];
+      extraLuaConfig = builtins.readFile ./neovim.lua;
+    };
     alacritty = {
       enable = true;
       settings = (import ./alacritty.nix);
@@ -54,7 +65,7 @@
       enable = true;
       userName = "Pim Kunis";
       userEmail = "pim@kunis.nl";
-      extraConfig.core.editor = "vim";
+      extraConfig.core.editor = "nvim";
     };
   };
 
diff --git a/neovim.lua b/neovim.lua
new file mode 100644
index 0000000..ac26661
--- /dev/null
+++ b/neovim.lua
@@ -0,0 +1 @@
+require("mason").setup()