diff --git a/flake.nix b/flake.nix
index 6b4b265..dfc506b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,6 +16,10 @@
       url = "github:NotAShelf/nvf";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
@@ -25,6 +29,7 @@
     nix-flatpak,
     spicetify-nix,
     nvf,
+    nixvim,
     ...
   } @ inputs: let
     lib = nixpkgs.lib;
@@ -82,6 +87,7 @@
         };
         modules = [
           nvf.homeManagerModules.default
+          nixvim.homeManagerModules.nixvim
           spicetify-nix.homeManagerModules.default
           ./user/home.nix
         ];
diff --git a/user/nixvim.nix b/user/nixvim.nix
new file mode 100644
index 0000000..787b819
--- /dev/null
+++ b/user/nixvim.nix
@@ -0,0 +1,58 @@
+{...}: {
+  programs.nixvim = {
+    enable = true;
+
+    globalOpts = {
+      number = true;
+      relativenumber = true;
+      signcolumn = "yes";
+      ignorecase = true;
+      smartcase = true;
+      tabstop = 2;
+      undofile = true;
+    };
+    colorschemes.nord.enable = true;
+    plugins = {
+      lsp = {
+        enable = true;
+        inlayHints = true;
+        servers = {
+          nixd.enable = true;
+          gopls.enable = true;
+          gleam.enable = true;
+          cssls.enable = true;
+          html = {
+            enable = true;
+            filetypes = ["html" "templ"];
+          };
+          htmx = {
+            enable = true;
+            filetypes = ["html" "templ"];
+          };
+          tailwindcss = {
+            enable = true;
+            filetypes = ["html" "templ"];
+            settings.tailwindCSS.includeLanguages = {
+              templ = "html";
+            };
+          };
+          templ.enable = true;
+          zls.enable = true;
+        };
+      };
+
+      lsp-format.enable = true; #formatting
+      lsp-lines.enable = true; #multiple lines for errors
+      lsp-signature.enable = true; #show function signature
+      lsp-status.enable = true; #more things at the lualine
+      lspkind.enable = true; #pictograms
+      neocord.enable = true; #discord
+      lualine.enable = true; #bottom status line
+      web-devicons.enable = true; #icons
+      treesitter.enable = true;
+      bufferline.enable = true;
+      telescope.enable = true;
+      cmp.enable = true;
+    };
+  };
+}
diff --git a/user/nvf.nix b/user/nvf.nix
index ca6dfda..e22652e 100644
--- a/user/nvf.nix
+++ b/user/nvf.nix
@@ -65,6 +65,8 @@
         enable = true;
         transparent = true;
       };
+
+
     };
   };
 }
diff --git a/user/zsh.nix b/user/zsh.nix
index 7e5ec8d..cd1d43b 100644
--- a/user/zsh.nix
+++ b/user/zsh.nix
@@ -1,21 +1,21 @@
 {pkgs, ...}: {
-        programs.zsh = {
-                enable = true;
-                enableCompletion = true;
-                autosuggestion.enable = true;
-                syntaxHighlighting.enable = true;
-                plugins = [
-                        {
-                                name = "powerlevel10k";
-                                src = pkgs.zsh-powerlevel10k;
-                                file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
-                        }
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    plugins = [
+      {
+        name = "powerlevel10k";
+        src = pkgs.zsh-powerlevel10k;
+        file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
+      }
 
-                        {
-                                name = "powerlevel10k-config";
-                                src = ./.;
-                                file = ".p10k.zsh";
-                        }
-                ];
-        };
-} 
+      {
+        name = "powerlevel10k-config";
+        src = ./.;
+        file = ".p10k.zsh";
+      }
+    ];
+  };
+}