diff --git a/modules/home/default.nix b/modules/home/default.nix
index 90c2fb3..caa1ae1 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -4,5 +4,6 @@
     ./zsh
     ./git.nix
     ./packages.nix
+    ./nvim
   ];
 }
diff --git a/modules/home/nvim/default.nix b/modules/home/nvim/default.nix
new file mode 100644
index 0000000..d9cef08
--- /dev/null
+++ b/modules/home/nvim/default.nix
@@ -0,0 +1 @@
+{ imports = [ ./nvim.nix ]; }
diff --git a/modules/home/nvim/nvchad/starter b/modules/home/nvim/nvchad/starter
new file mode 160000
index 0000000..e3572e1
--- /dev/null
+++ b/modules/home/nvim/nvchad/starter
@@ -0,0 +1 @@
+Subproject commit e3572e1f5e1c297212c3deeb17b7863139ce663e
diff --git a/modules/home/nvim/nvim.nix b/modules/home/nvim/nvim.nix
new file mode 100644
index 0000000..4c62e96
--- /dev/null
+++ b/modules/home/nvim/nvim.nix
@@ -0,0 +1,7 @@
+{
+  hj = {
+    files = {
+      ".config/nvim".source = ./nvchad/starter;
+    };
+  };
+}
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index cf9bb6a..9de4ef8 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -6,7 +6,7 @@
 
 {
   hjem.users.${username}.packages = with pkgs; [
-    lunarvim
+    neovim
     statix
     git
     zsh
diff --git a/modules/home/zsh/.zshrc b/modules/home/zsh/.zshrc
new file mode 100644
index 0000000..17f236d
--- /dev/null
+++ b/modules/home/zsh/.zshrc
@@ -0,0 +1,12 @@
+
+HISTFILE=~/.histfile
+HISTSIZE=1000
+SAVEHIST=10000
+setopt autocd extendedglob nomatch notify
+unsetopt beep
+bindkey -v
+
+zstyle :compinstall filename '/home/poslop/.zshrc'
+
+autoload -Uz compinit
+compinit
diff --git a/modules/home/zsh/zsh.nix b/modules/home/zsh/zsh.nix
index 0afa572..3c56f2d 100644
--- a/modules/home/zsh/zsh.nix
+++ b/modules/home/zsh/zsh.nix
@@ -1,6 +1,11 @@
-{ username, ... }:
 {
-  config.hjem.users.${username}.rum.programs.zsh = {
-    enable = true;
+  # hj.rum.programs.zsh = {
+  #   enable = true;
+  # };
+  
+  hj = {
+    files = {
+      ".zshrc".source = ./.zshrc;
+    };
   };
 }