diff --git a/.config/home-manager/common.nix b/.config/home-manager/common.nix
index 449e2a5..0222ef8 100644
--- a/.config/home-manager/common.nix
+++ b/.config/home-manager/common.nix
@@ -18,7 +18,6 @@
     jq # tool for JSON
     moar # moar is less
     nix-direnv # allow better nix and direnv integration
-    neovim # alternative to vim
     libnotify # allows sending notifications
     lsof # who uses that drive/directory
     openssh # ssh client and server
diff --git a/.config/home-manager/nvim.nix b/.config/home-manager/nvim.nix
index bc530ac..022bbe8 100644
--- a/.config/home-manager/nvim.nix
+++ b/.config/home-manager/nvim.nix
@@ -5,6 +5,20 @@
   home.packages = with pkgs; [
 	nodejs # needed for lsp
     fzf # fuzzy finder
-    neovim # alternative to vim
+    #neovim # alternative to vim
   ];
+
+  programs.neovim = {
+	enable = true;
+    extraLuaConfig = ''
+require("set")
+require("remap")
+require("plugins")
+
+local status, ts_install = pcall(require, "nvim-treesitter.install")
+if(status) then
+	ts_install.compilers = { "${pkgs.gcc}/bin/gcc" }
+end
+    '';
+  };
 }
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
deleted file mode 100644
index 8376742..0000000
--- a/.config/nvim/init.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-require("set")
-require("remap")
-
-require("plugins")