5 files changed, 40 insertions, 40 deletions
diff --git a/nvim/default.nix b/nvim/default.nix
index bf5b050..73dc359 100644
--- a/nvim/default.nix
+++ b/nvim/default.nix
@@ -5,39 +5,33 @@
 	programs.neovim.viAlias = true;
 	programs.neovim.vimAlias = true;
 	programs.neovim.vimdiffAlias = true;
+	programs.neovim.defaultEditor = true;
+
+	programs.neovim.extraPackages = with pkgs; [
+		gcc # Required for treesitter
+	];
 
 	programs.neovim.extraLuaConfig =
 ''
 ${builtins.readFile ./options.lua}
 ${builtins.readFile ./keybindings.lua}
-'';
-
-	programs.neovim.plugins =
-	with pkgs.vimPlugins;
-	let
-		toLua = str: "lua << EOF\n${str}\nEOF\n";
-		toLuaFile = file: "lua << EOF\n${builtins.readFile file}\nEOF\n";
-	in [
-		{
-			plugin = comment-nvim;
-			config = toLuaFile ./plugins/comment.lua;
-		}
 
-		{
-			plugin = lualine-nvim;
-			config = toLuaFile ./plugins/lualine.lua;
-		}
-
-		{
-			plugin = base16-nvim;
-			config = toLua (import ./plugins/base16.nix config);
-		}
+-- Plugins configuration
+${builtins.readFile ./plugins/comment.lua}
+${builtins.readFile ./plugins/lualine.lua}
+${import ./plugins/treesitter.nix config}
+${builtins.readFile ./plugins/base16.lua}
+${builtins.readFile ./plugins/nvim-tree.lua}
+'';
 
+	programs.neovim.plugins = with pkgs.vimPlugins; [
+		comment-nvim
+		lualine-nvim
+		nvim-treesitter
 		nvim-web-devicons
-
-		{
-			plugin = nvim-tree-lua;
-			config = toLuaFile ./plugins/nvim-tree.lua;
-		}
+		nvim-tree-lua
+		(base16-vim.overrideAttrs (old: {
+			patchPhase = "ln -s ${config.scheme base16-vim} colors/base16-scheme.vim";
+		}))
 	];
 }
diff --git a/nvim/options.lua b/nvim/options.lua
index 5efd8d5..b1fe9cb 100644
--- a/nvim/options.lua
+++ b/nvim/options.lua
@@ -8,9 +8,9 @@ vim.o.list = true;
 vim.o.listchars = "tab:| ,trail:_,lead:_";
 
 vim.o.laststatus = 3;
-vim.opt.fillchars = { eob = " " };
 
 vim.o.signcolumn = "auto";
+vim.opt.fillchars = { eob = " " };
 
 vim.o.tabstop = 2;
 vim.o.shiftwidth = 2;
@@ -18,6 +18,4 @@ vim.o.expandtab = false;
 
 vim.o.updatetime = 300;
 
-vim.o.termguicolors = true;
-
 vim.o.mouse = "a";
diff --git a/nvim/plugins/base16.lua b/nvim/plugins/base16.lua
new file mode 100644
index 0000000..9843b76
--- /dev/null
+++ b/nvim/plugins/base16.lua
@@ -0,0 +1,6 @@
+vim.o.termguicolors = true;
+vim.opt.termguicolors = true;
+vim.o.background = "dark";
+vim.g.base16colorspace = 256
+vim.cmd.colorscheme("base16-scheme");
+vim.api.nvim_set_hl(0, "LineNr", { link = "Normal" }); -- disable the background of line numbers
diff --git a/nvim/plugins/base16.nix b/nvim/plugins/base16.nix
deleted file mode 100644
index 170b68b..0000000
--- a/nvim/plugins/base16.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-config:
-
-with config.lib.stylix.colors.withHashtag;
-''
-require("base16-colorscheme").setup {
-	base00 = "${base00}", base01 = "${base01}", base02 = "${base02}", base03 = "${base03}",
-	base04 = "${base04}", base05 = "${base05}", base06 = "${base06}", base07 = "${base07}",
-	base08 = "${base08}", base09 = "${base09}", base0A = "${base0A}", base0B = "${base0B}",
-	base0C = "${base0C}", base0D = "${base0D}", base0E = "${base0E}", base0F = "${base0F}",
-};
-''
diff --git a/nvim/plugins/treesitter.nix b/nvim/plugins/treesitter.nix
new file mode 100644
index 0000000..05f1f2a
--- /dev/null
+++ b/nvim/plugins/treesitter.nix
@@ -0,0 +1,13 @@
+config:
+
+''
+require("nvim-treesitter.configs").setup {
+	auto_install = true,
+	highlight = {
+		enable = true,
+	},
+	parser_install_dir = "${config.xdg.dataHome}/nvim",
+};
+
+vim.opt.runtimepath:append("${config.xdg.dataHome}/nvim");
+''