diff --git a/dot_config/nixpkgs/home.nix b/dot_config/nixpkgs/home.nix
index 1a58b94..3121bb5 100644
--- a/dot_config/nixpkgs/home.nix
+++ b/dot_config/nixpkgs/home.nix
@@ -123,7 +123,6 @@ in
       pkgs.adementary-theme
       pkgs.alacritty
       pkgs.appimage-run
-      pkgs.neovim
       pkgs.enchant
       pkgs.entr
       (unstable.pkgs.aspellWithDicts (dicts: with dicts; [de en en-computers en-science]))
@@ -425,6 +424,18 @@ in
     extraPackages = epkgs: [ epkgs.vterm epkgs.pdf-tools epkgs.org-pdftools];
   };
 
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    plugins = with pkgs.vimPlugins; [
+      vim-which-key
+      vim-nix
+      vim-fish
+      vim-surround
+    ];
+  };
+
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage
   # when a new Home Manager release introduces backwards