From ac4759406c9bee5a3c6ec4a9da7232c3705e2b93 Mon Sep 17 00:00:00 2001
From: voidarc <admin@voidarc.co.uk>
Date: Fri, 13 Feb 2026 20:13:08 +0000
Subject: [PATCH] omg neorg works nowww

---
 init.lua                              | 14 +------------
 lua/plugins/completion/treesitter.lua | 30 ++++++++++++++++++---------
 lua/plugins/functional/neorg.lua      | 23 ++++++++++++++++++++
 lua/plugins/functional/telescope.lua  |  8 +------
 4 files changed, 45 insertions(+), 30 deletions(-)
 create mode 100644 lua/plugins/functional/neorg.lua

diff --git a/init.lua b/init.lua
index d9d2c13..9c6c390 100644
--- a/init.lua
+++ b/init.lua
@@ -59,7 +59,7 @@ vim.keymap.set("n", "<down>", '<cmd>echo "Use j to move!!"<CR>')
 vim.keymap.set("i", "<C-BS>", "<C-W>", { noremap = true })
 
 -- Keybinds for MiniSessions
-vim.keymap.set("n", "<leader>qs", function() -- quit and save session local
+vim.keymap.set("n", "<leader>qj", function() -- quit and save session local
 	MiniSessions.write(".session")
 	vim.cmd("wqa")
 end, { noremap = true })
@@ -73,15 +73,3 @@ vim.keymap.set("n", "<leader>qd", function() -- quit and delete session
 	MiniSessions.delete(".session")
 	vim.cmd("wqa")
 end, { noremap = true })
-
-vim.api.nvim_create_autocmd("User", {
-	pattern = "TSUpdate",
-	callback = function()
-		require("nvim-treesitter.parsers").norg = {
-			install_info = {
-				url = "https://github.com/nvim-neorg/tree-sitter-norg",
-				revision = "HEAD",
-			},
-		}
-	end,
-})
diff --git a/lua/plugins/completion/treesitter.lua b/lua/plugins/completion/treesitter.lua
index 4210600..0c969b0 100644
--- a/lua/plugins/completion/treesitter.lua
+++ b/lua/plugins/completion/treesitter.lua
@@ -1,18 +1,28 @@
 return {
 	"nvim-treesitter/nvim-treesitter",
 	lazy = false,
+	branch = "master",
 	build = ":TSUpdate",
 	config = function()
-		vim.api.nvim_create_autocmd("User", {
-			pattern = "TSUpdate",
-			callback = function()
-				require("nvim-treesitter.parsers").norg = {
-					install_info = {
-						url = "https://github.com/nvim-neorg/tree-sitter-norg",
-						revision = "HEAD",
-					},
-				}
-			end,
+		require("nvim-treesitter.configs").setup({
+			highlight = { enable = true },
+			ensure_installed = {
+				"bash",
+				"html",
+				"javascript",
+				"json",
+				"lua",
+				"norg",
+				"markdown",
+				"markdown_inline",
+				"python",
+				"query",
+				"regex",
+				"tsx",
+				"typescript",
+				"vim",
+				"yaml",
+			},
 		})
 	end,
 }
diff --git a/lua/plugins/functional/neorg.lua b/lua/plugins/functional/neorg.lua
new file mode 100644
index 0000000..f60b303
--- /dev/null
+++ b/lua/plugins/functional/neorg.lua
@@ -0,0 +1,23 @@
+return {
+	"nvim-neorg/neorg",
+	lazy = false,
+	version = "*",
+	config = function()
+		require("neorg").setup({
+			load = {
+				["core.defaults"] = {},
+				["core.concealer"] = {},
+				["core.dirman"] = {
+					config = {
+						workspaces = {
+							notes = "~/notes",
+						},
+						default_workspace = "notes",
+					},
+				},
+			},
+		})
+		vim.wo.foldlevel = 99
+		vim.wo.conceallevel = 2
+	end,
+}
diff --git a/lua/plugins/functional/telescope.lua b/lua/plugins/functional/telescope.lua
index 337fb58..1093bb0 100644
--- a/lua/plugins/functional/telescope.lua
+++ b/lua/plugins/functional/telescope.lua
@@ -1,18 +1,12 @@
 return {
 	"nvim-telescope/telescope.nvim",
 	tag = "0.1.8",
-	dependencies = { "nvim-lua/plenary.nvim" },
+	dependencies = { "nvim-lua/plenary.nvim", { "nvim-telescope/telescope-fzf-native.nvim", build = "make" } },
 	config = function()
 		require("telescope").setup({
 			defaults = {
 				file_ignore_patterns = { ".git", ".node_modules" },
 			},
-			pickers = {
-				find_files = {
-					-- `hidden = true` will still show the inside of `.git/` as it's not `.gitignore`d.
-					find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*", "-L" },
-				},
-			},
 			extensions = {
 				file_browser = {
 					theme = "ivy",