diff --git a/home/alex/programs/neovim/default.nix b/home/alex/programs/neovim/default.nix
new file mode 100644
index 0000000..e455b33
--- /dev/null
+++ b/home/alex/programs/neovim/default.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.neovim = {
+    enable = true;
+    vimAlias = true;
+
+    extraConfig = ''
+      set nowrap
+    '';
+
+    plugins = with pkgs.vimPlugins; [
+      vim-nix
+
+      indentLine
+      indent-blankline-nvim
+      neoformat
+    ];
+  };
+}
diff --git a/home/cli.nix b/home/cli.nix
index 5e9fef0..2b02d49 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -10,10 +10,7 @@ let
 
   myEza = if builtins.hasAttr "eza" pkgs then "eza" else "exa";
 in {
-  imports = [
-    # shell config
-    #./modules/shell
-  ];
+  imports = [ ./alex/programs/neovim/default.nix ];
 
   programs.home-manager.enable = true;
   home = {
@@ -182,8 +179,6 @@ in {
 
     ssh.enable = true;
 
-    neovim = import ./modules/nvim.nix pkgs;
-
     texlive.enable = true;
   };