diff --git a/nixosModules/base.nix b/nixosModules/base.nix
index be177d3..00e7ca7 100644
--- a/nixosModules/base.nix
+++ b/nixosModules/base.nix
@@ -10,6 +10,7 @@
       ./systemd.nix
       ./fonts.nix
       ./intel-gpu.nix
+      ./neovim-config.nix
     ];
 
   # Bootloader.
diff --git a/nixosModules/home.nix b/nixosModules/home.nix
index 7cbb0d5..c2bdd12 100644
--- a/nixosModules/home.nix
+++ b/nixosModules/home.nix
@@ -117,7 +117,27 @@
     bashrcExtra = ''
       export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
     '';
+  };
 
+  # neovim setup
+  vim = {
+    theme = {
+      enable = true;
+      name = "gruvbox";
+      style = "dark";
+    };
+    statusLine.lualine.enable = true;
+    telescope.enable = true;
+    autocomplete.nvim-cmp.enable = true;
+    
+    languages = {
+      enableLSP = true;
+      enableTreesitter = true;
+      
+      nix.enable = true;
+      ts.enable = true;
+      rust.enable = true;
+    };
   };
 
   # This value determines the home Manager release that your
diff --git a/nixosModules/neovim-config.nix b/nixosModules/neovim-config.nix
new file mode 100644
index 0000000..ed20acf
--- /dev/null
+++ b/nixosModules/neovim-config.nix
@@ -0,0 +1,26 @@
+{ pkgs, lib, ... }:
+
+{
+  # neovim setup with NVF
+  # https://github.com/NotAShelf/nvf
+  vim = {
+    theme = {
+      enable = true;
+      name = "gruvbox";
+      style = "dark";
+    };
+    statusLine.lualine.enable = true;
+    telescope.enable = true;
+    autocomplete.nvim-cmp.enable = true;
+    
+    languages = {
+      enableLSP = true;
+      enableTreesitter = true;
+      
+      nix.enable = true;
+      ts.enable = true;
+      rust.enable = true;
+    };
+  };
+
+}