diff --git a/home/default.nix b/home/default.nix
index e9c1f39..49fea0c 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -21,6 +21,23 @@
     EDITOR = "vim";
   };
 
+programs.neovim = {
+  enable = true;
+  extraConfig = ''
+    set number relativenumber
+  '';
+};
+
+
+programs.neovim.plugins = [
+  pkgs.vimPlugins.nvim-tree-lua
+  {
+    plugin = pkgs.vimPlugins.vim-startify;
+    config = "let g:startify_change_to_vcs_root = 0";
+  }
+];
+
+
   colorScheme = inputs.nix-colors.colorSchemes.gruvbox-dark-medium;
 
 } 
diff --git a/modules/default.nix b/modules/default.nix
index 790cd62..ca86977 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,5 +7,6 @@
     ./misc
     ./gdm
     ./ssh
+    ./nvchad
   ];
 }
diff --git a/modules/nvchad/default.nix b/modules/nvchad/default.nix
new file mode 100644
index 0000000..ea2f3c5
--- /dev/null
+++ b/modules/nvchad/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, pkgs, fetchFromGithub }:
+
+{
+nvchad = stdenv.mkDerivation rec {
+  pname = "nvchad";
+  version = "";
+  dontBuild = true;
+
+  src = pkgs.fetchFromGitHub {
+    owner = "NvChad";
+    repo = "NvChad";
+    rev = "c8777040fbda6a656f149877b796d120085cd918";
+    sha256 = "sha256-J4SGwo/XkKFXvq+Va1EEBm8YOQwIPPGWH3JqCGpFnxY=";
+  };
+
+  installPhase = ''
+    # Fetch the whole repo and put it in $out
+    mkdir $out
+    cp -aR $src/* $out/
+  '';
+  };
+}
diff --git a/modules/packages/default.nix b/modules/packages/default.nix
index a649d0e..000f658 100644
--- a/modules/packages/default.nix
+++ b/modules/packages/default.nix
@@ -11,8 +11,6 @@
   lutris
   mangohud
   #hackerman
-  neovim
-  vim
   fastfetch
   freshfetch
   cmatrix