From e69acc9844d8a29305f079bfebfd1152d5306212 Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Thu, 18 Apr 2024 09:12:43 +0700
Subject: [PATCH] chore(nvim): More lua migration - Migrated from NerdTree ->
 Neotree - Lazify neotree - Migrated from lightline -> lualine (TODO:
 colourscheme) - Add nvim-treesitter - Enable tree-sitter-gsp

---
 .config/nvim/lazy-lock.json    |  7 ++++
 .config/nvim/lua/null/plug.lua | 64 ++++++++++++++++++++++++++++++++++
 .config/vim/vim_uni            |  1 +
 3 files changed, 72 insertions(+)

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index a7016b5..531c713 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,7 +1,14 @@
 {
   "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
+  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
+  "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
+  "nvim-treesitter": { "branch": "master", "commit": "3e10cffbb2a022cd8e2aaea9f4fffb514065e77c" },
   "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" },
   "oil.nvim": { "branch": "master", "commit": "e462a3446505185adf063566f5007771b69027a1" },
+  "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
+  "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" },
+  "tree-sitter-gsp": { "branch": "master", "commit": "1f10ff9a6039a50e2f7be394fc22b1400832cf17" },
   "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" },
   "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" }
 }
\ No newline at end of file
diff --git a/.config/nvim/lua/null/plug.lua b/.config/nvim/lua/null/plug.lua
index eae793d..2465d13 100644
--- a/.config/nvim/lua/null/plug.lua
+++ b/.config/nvim/lua/null/plug.lua
@@ -1,6 +1,44 @@
 local util = require("null.util")
 
 util.getch_lazy_nvim().setup({
+	{
+		-- FIXME: Use my own colourscheme
+		"folke/tokyonight.nvim",
+		lazy = false,
+		priority = 1000,
+		config = function()
+			-- load the colorscheme here
+			vim.cmd([[colorscheme tokyonight]])
+		end,
+	},
+	{
+		"nvim-lualine/lualine.nvim",
+		dependencies = { "nvim-tree/nvim-web-devicons" },
+		config = function()
+			require("lualine").setup {
+				options = {
+					theme = "tokyonight" -- FIXME: Use my own colourscheme
+				}
+			}
+		end,
+	},
+	{
+		"nvim-neo-tree/neo-tree.nvim", -- I'll be using oil.nvim, but for better visual I'll keep this
+		keys = {
+			{ "<C-n>", "<cmd>Neotree toggle<cr>", desc = "NeoTree" },
+		},
+		branch = "v3.x",
+		dependencies = {
+			"nvim-lua/plenary.nvim",
+			"nvim-tree/nvim-web-devicons",
+			"MunifTanjim/nui.nvim",
+		},
+		config = function ()
+			require("neo-tree").setup({
+				close_if_last_window = true,
+			})
+		end,
+	},
 	{
   		"stevearc/oil.nvim",
   		opts = {},
@@ -14,6 +52,32 @@ util.getch_lazy_nvim().setup({
 			-- Note to self: init is called during startup. Configuration for vim plugins typically should be set in an init function
 		end,
 	},
+
+	-- Syntax Highlighting stuff
+	{
+		"nvim-treesitter/nvim-treesitter",
+		opts = {
+			ensure_installed = {
+				"gsp",
+			},
+
+			highlight = {
+				enable = true,
+				additional_vim_regex_highlighting = false,
+			},
+		},
+		config = function(_, opts)
+			local config = require("nvim-treesitter.parsers").get_parser_configs()
+			config.gsp = {
+				install_info = {
+					url = "https://git.sr.ht/~mango/tree-sitter-gsp",
+					files = {"src/parser.c"},
+				},
+				filetype = "gsp",
+			}
+			require("nvim-treesitter.configs").setup(opts)
+		end
+	},
 	{
 		url = "https://git.sr.ht/~mango/tree-sitter-gsp",
 		fp = "gsp",
diff --git a/.config/vim/vim_uni b/.config/vim/vim_uni
index 94244b0..06846cd 100644
--- a/.config/vim/vim_uni
+++ b/.config/vim/vim_uni
@@ -23,6 +23,7 @@ hi Folded ctermbg=Black
 set fillchars=eob:\ 
 syntax on
 filetype indent plugin on
+" -- converted
 map <C-n> :NERDTreeToggle<CR>
 let mapleader=" " " -- converted
 set guifont=Iosevka:h15 " -- converted