diff --git a/home/cli.nix b/home/cli.nix
index 38c3953..3df83b0 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -67,21 +67,7 @@
 
     ssh.enable = true;
 
-    neovim = {
-      enable = true;
-      vimAlias = true;
-
-      extraConfig = ''
-      set nowrap
-      '';
-
-      plugins = with pkgs.vimPlugins; [
-        vim-nix
-
-        indentLine
-        indent-blankline-nvim
-      ];
-    };
+    neovim = import ./modules/nvim.nix pkgs;
   };
 
   services.gpg-agent = {
diff --git a/home/modules/nvim.nix b/home/modules/nvim.nix
new file mode 100644
index 0000000..d8db130
--- /dev/null
+++ b/home/modules/nvim.nix
@@ -0,0 +1,16 @@
+pkgs:
+{
+  enable = true;
+  vimAlias = true;
+
+  extraConfig = ''
+    set nowrap
+  '';
+
+  plugins = with pkgs.vimPlugins; [
+    vim-nix
+
+    indentLine
+    indent-blankline-nvim
+  ];
+}