From 76f498255db421b1c8c78eb461b279bb6bc2a29f Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Fri, 19 Sep 2025 00:29:05 +1200
Subject: [PATCH 01/20] feat

---
 nvim/lua/plugins/obsidian.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nvim/lua/plugins/obsidian.lua b/nvim/lua/plugins/obsidian.lua
index 1aea41f..d39c99f 100644
--- a/nvim/lua/plugins/obsidian.lua
+++ b/nvim/lua/plugins/obsidian.lua
@@ -31,7 +31,6 @@ return {
 				id = note.id,
 				created = os.date("%Y-%m-%d %H:%M:%S"),
 				link = "",
-				parent = "",
 				tags = { "note" }, -- Add your default tags here
 			}
 

From 31737332ff3e0f878e9919d8876a835a91d4dedd Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sat, 18 Oct 2025 19:21:02 +1300
Subject: [PATCH 02/20] feat

---
 nvim/lua/config/keymap.lua      |  3 +++
 nvim/lua/plugins/cmp.lua        |  2 +-
 nvim/lua/plugins/copilot.lua    |  6 ++++++
 nvim/lua/plugins/formatting.lua | 17 +++++++++++------
 nvim/lua/plugins/telescope.lua  |  2 +-
 starship/starship.toml          |  6 +++---
 6 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/nvim/lua/config/keymap.lua b/nvim/lua/config/keymap.lua
index 04d3823..9f251c9 100644
--- a/nvim/lua/config/keymap.lua
+++ b/nvim/lua/config/keymap.lua
@@ -127,6 +127,9 @@ vim.keymap.set("n", "<leader>o", "<CMD>split | Oil<CR>")
 
 -- CopilotChat
 vim.keymap.set("n", "<leader>c", ":CopilotChat<CR>")
+vim.keymap.set("n", "<leader>sc", function()
+	require("CopilotChat").toggle({ window = { layout = "horizontal" } })
+end, { desc = "Toggle Copilot Chat (horizontal)" })
 
 -- ZenMode
 vim.keymap.set("n", "<leader>z", ":ZenMode<CR>")
diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua
index c75152a..c18e5ce 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/nvim/lua/plugins/cmp.lua
@@ -27,7 +27,7 @@ return {
 			keymap = {
 				["<Tab>"] = {
 					"select_next",
-					-- "fallback"
+					"fallback",
 				},
 				["<S-Tab>"] = {
 					"select_prev",
diff --git a/nvim/lua/plugins/copilot.lua b/nvim/lua/plugins/copilot.lua
index b1e5c86..68a7b36 100644
--- a/nvim/lua/plugins/copilot.lua
+++ b/nvim/lua/plugins/copilot.lua
@@ -38,10 +38,16 @@ return {
 			{ "nvim-lua/plenary.nvim" },
 		},
 		opts = {
+			system_prompt = [[You are an expert software engineer.
+- Provide clear, concise explanations
+- Do not include comments unless necessary
+- Include docstrings
+- Any Python code should pass strict type checking]],
 			debug = true,
 			context = "buffers",
 			history_path = vim.fn.stdpath("data") .. "/copilotchat_history",
 			auto_follow_cursor = false,
+			auto_insert_mode = true,
 			model = "gpt-4o",
 		},
 	},
diff --git a/nvim/lua/plugins/formatting.lua b/nvim/lua/plugins/formatting.lua
index 599658f..5e2159f 100644
--- a/nvim/lua/plugins/formatting.lua
+++ b/nvim/lua/plugins/formatting.lua
@@ -11,15 +11,22 @@ return {
 				},
 
 				formatters_by_ft = {
-					bash = { "beautysh", "shellharden" },
+					bash = {
+						"beautysh",
+						"shellharden",
+					},
 					sh = { "beautysh", "shellharden" },
 					html = { "djlintJinja", "prettier" },
 					jinja = { "djlintJinja" },
 					json = { "jq" },
 					lua = { "stylua" },
 					go = { "gofmt" },
-					python = { "isort", "ruff_format" },
-					markdown = { "injected" },
+					python = {
+						"isort",
+						"ruff_format",
+						"trim_whitespace",
+					},
+					-- markdown = { "injected" },
 					javascript = { "prettier" },
 					css = { "stylelint" },
 					yaml = { "yamlfix" },
@@ -27,8 +34,6 @@ return {
 					["*"] = {
 						"codespell",
 						"trim_newlines",
-						"injected",
-						"trim_whitespace",
 					},
 				},
 			})
@@ -78,7 +83,7 @@ return {
 						javascript = "js",
 						julia = "jl",
 						latex = "tex",
-						markdown = "md",
+						-- markdown = "md",
 						python = "py",
 						ruby = "rb",
 						rust = "rs",
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index 8c95703..b193def 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -32,7 +32,7 @@ return {
 					layout_config = { width = 0.9 },
 					prompt_prefix = " ",
 					selection_caret = " ",
-					path_display = { "smart" },
+					path_display = { "filename_first" },
 					mappings = {
 						i = {
 							["<C-n>"] = actions.move_selection_next,
diff --git a/starship/starship.toml b/starship/starship.toml
index 66e77dc..1971391 100644
--- a/starship/starship.toml
+++ b/starship/starship.toml
@@ -5,9 +5,9 @@ format = """$shell$hostname$directory$line_break$character"""
 right_format = """$cmd_duration$git_branch$python$nix_shell"""
 
 [shell]
-fish_indicator = "[  ](bold purple)"
-zsh_indicator = " 󰬇"
-bash_indicator = " $"
+fish_indicator = " fish"
+zsh_indicator = " zsh"
+bash_indicator = " bash"
 disabled = false
 
 [localip]

From f873f3901c21dbc39289a475c0c3ff709d9a37b4 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sat, 18 Oct 2025 19:21:36 +1300
Subject: [PATCH 03/20] feat

---
 nvim/lazy-lock.json           | 276 +++++++++++++++++++++++++++-------
 nvim/lua/plugins/mini.lua     |  20 +--
 nvim/lua/plugins/obsidian.lua |  17 +--
 3 files changed, 237 insertions(+), 76 deletions(-)

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index d5b2f63..2a23fa8 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -1,58 +1,222 @@
 {
-  "CopilotChat.nvim": { "branch": "main", "commit": "1d8aa27e2317950b0b7ddc023487c6f2b7b074ca" },
-  "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
-  "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
-  "barbar.nvim": { "branch": "master", "commit": "549ee11d97057eae207bafa2c23c315942cca097" },
-  "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
-  "blink-cmp-dictionary": { "branch": "master", "commit": "43b701fe9728a704bc63e4667c5d8b398bf129b2" },
-  "blink-emoji.nvim": { "branch": "master", "commit": "f22ce8cac02a6ece05368220f1e38bd34fe376f9" },
-  "blink-ripgrep.nvim": { "branch": "main", "commit": "b71592e916d748492c54b8bc9bc17dc2a0dcdfb5" },
-  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
-  "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
-  "bullets.vim": { "branch": "master", "commit": "1c13e510e11d08b0259e8e627f128359c5521962" },
-  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
-  "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
-  "copilot.lua": { "branch": "master", "commit": "407fbd5cd3397e1e46b7dedbd928eefcaf621e76" },
-  "dbtpal": { "branch": "main", "commit": "981eab51609362712c64e3cf3fb773fe11f859b9" },
-  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "emmet-vim": { "branch": "master", "commit": "e98397144982d1e75b20d94d55a82de3ec8f648d" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" },
-  "mini.nvim": { "branch": "main", "commit": "e7538b549361c9ac8416a07b0223ce03c508bfe7" },
-  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
-  "nvim-bqf": { "branch": "main", "commit": "17680cda3538913e88dd4c6456c837db9ace40ae" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lint": { "branch": "master", "commit": "f126af5345c7472e9a0cdbe1d1a29209be72c4c4" },
-  "nvim-lspconfig": { "branch": "master", "commit": "c8b90ae5cbe21d547b342b05c9266dcb8ca0de8f" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
-  "obsidian.nvim": { "branch": "main", "commit": "705cc9b4f66eca1e54040ac819102e80a32896d3" },
-  "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" },
-  "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
-  "telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
-  "telescope-makefile": { "branch": "master", "commit": "6e5b5767751dbf73ad4f126840dcf1abfc38e891" },
-  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" },
-  "vim": { "branch": "master", "commit": "d4b0823100c702af127cba8dd5595a8f599041ec" },
-  "vim-argwrap": { "branch": "master", "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1" },
-  "vim-bufkill": { "branch": "master", "commit": "3113181d0c1bfb8719f3ddcd2e2f35a8d763d1e5" },
-  "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
-  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
-  "vim-grepper": { "branch": "master", "commit": "acaaf32edaa11d82fb972d2af36b949ec3042928" },
-  "vim-markdown-toc": { "branch": "master", "commit": "aa9cc3b07791db5cbe5f29d661763bc0eb4fb7c1" },
-  "vim-one": { "branch": "master", "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24" },
-  "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
-  "vim-table-mode": { "branch": "master", "commit": "e156dbbedce0bbf61c0919db7678fa246fabd616" },
-  "winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" },
-  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
+  "CopilotChat.nvim": {
+    "branch": "main",
+    "commit": "181a523f5bf6b8f277e6a994907c23f9e84d2445"
+  },
+  "LuaSnip": {
+    "branch": "master",
+    "commit": "b3104910bb5ebf40492aadffae18f2528fa757d9"
+  },
+  "Vim-Jinja2-Syntax": {
+    "branch": "master",
+    "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1"
+  },
+  "barbar.nvim": {
+    "branch": "master",
+    "commit": "549ee11d97057eae207bafa2c23c315942cca097"
+  },
+  "blink-cmp-copilot": {
+    "branch": "main",
+    "commit": "439cff78780c033aa23cf061d7315314b347e3c1"
+  },
+  "blink-cmp-dictionary": {
+    "branch": "master",
+    "commit": "43b701fe9728a704bc63e4667c5d8b398bf129b2"
+  },
+  "blink-emoji.nvim": {
+    "branch": "master",
+    "commit": "f22ce8cac02a6ece05368220f1e38bd34fe376f9"
+  },
+  "blink-ripgrep.nvim": {
+    "branch": "main",
+    "commit": "1292647c369437e97dc4b6328de76c203fb17d5d"
+  },
+  "blink.cmp": {
+    "branch": "main",
+    "commit": "327fff91fe6af358e990be7be1ec8b78037d2138"
+  },
+  "blink.compat": {
+    "branch": "main",
+    "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c"
+  },
+  "bullets.vim": {
+    "branch": "master",
+    "commit": "1c13e510e11d08b0259e8e627f128359c5521962"
+  },
+  "conform.nvim": {
+    "branch": "master",
+    "commit": "b4aab989db276993ea5dcb78872be494ce546521"
+  },
+  "copilot-cmp": {
+    "branch": "master",
+    "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1"
+  },
+  "copilot.lua": {
+    "branch": "master",
+    "commit": "af3114aeb915beb14fcbc46849c7b08a5e3e2c1a"
+  },
+  "dbtpal": {
+    "branch": "main",
+    "commit": "981eab51609362712c64e3cf3fb773fe11f859b9"
+  },
+  "diffview.nvim": {
+    "branch": "main",
+    "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a"
+  },
+  "emmet-vim": {
+    "branch": "master",
+    "commit": "e98397144982d1e75b20d94d55a82de3ec8f648d"
+  },
+  "friendly-snippets": {
+    "branch": "main",
+    "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175"
+  },
+  "git-conflict.nvim": {
+    "branch": "main",
+    "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4"
+  },
+  "gitsigns.nvim": {
+    "branch": "main",
+    "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5"
+  },
+  "indent-blankline.nvim": {
+    "branch": "master",
+    "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba"
+  },
+  "lazy.nvim": {
+    "branch": "main",
+    "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a"
+  },
+  "lualine.nvim": {
+    "branch": "master",
+    "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955"
+  },
+  "mini.icons": {
+    "branch": "main",
+    "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d"
+  },
+  "mini.nvim": {
+    "branch": "main",
+    "commit": "80a11490e44a7fe8c911a3b4a827c56df3894058"
+  },
+  "nvim-bqf": {
+    "branch": "main",
+    "commit": "17680cda3538913e88dd4c6456c837db9ace40ae"
+  },
+  "nvim-colorizer.lua": {
+    "branch": "master",
+    "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e"
+  },
+  "nvim-lint": {
+    "branch": "master",
+    "commit": "0864f81c681e15d9bdc1156fe3a17bd07db5a3ed"
+  },
+  "nvim-lspconfig": {
+    "branch": "master",
+    "commit": "107c2458cdc780c4ed2c2b5e1b7800cd019010bd"
+  },
+  "nvim-treesitter": {
+    "branch": "master",
+    "commit": "42fc28ba918343ebfd5565147a42a26580579482"
+  },
+  "nvim-treesitter-context": {
+    "branch": "master",
+    "commit": "41847d3dafb5004464708a3db06b14f12bde548a"
+  },
+  "nvim-ts-autotag": {
+    "branch": "main",
+    "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc"
+  },
+  "nvim-web-devicons": {
+    "branch": "master",
+    "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687"
+  },
+  "obsidian.nvim": {
+    "branch": "main",
+    "commit": "705cc9b4f66eca1e54040ac819102e80a32896d3"
+  },
+  "oil.nvim": {
+    "branch": "master",
+    "commit": "07f80ad645895af849a597d1cac897059d89b686"
+  },
+  "peek.nvim": {
+    "branch": "master",
+    "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b"
+  },
+  "plenary.nvim": {
+    "branch": "master",
+    "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509"
+  },
+  "telescope-fzf-native.nvim": {
+    "branch": "main",
+    "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55"
+  },
+  "telescope-git-file-history.nvim": {
+    "branch": "master",
+    "commit": "e7d495319f2a04df96402057a6992ea970f8914d"
+  },
+  "telescope-makefile": {
+    "branch": "master",
+    "commit": "6e5b5767751dbf73ad4f126840dcf1abfc38e891"
+  },
+  "telescope.nvim": {
+    "branch": "master",
+    "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7"
+  },
+  "trouble.nvim": {
+    "branch": "main",
+    "commit": "f176232e7759c4f8abd923c21e3e5a5c76cd6837"
+  },
+  "undotree": {
+    "branch": "master",
+    "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869"
+  },
+  "vim": {
+    "branch": "master",
+    "commit": "d4b0823100c702af127cba8dd5595a8f599041ec"
+  },
+  "vim-argwrap": {
+    "branch": "master",
+    "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1"
+  },
+  "vim-bufkill": {
+    "branch": "master",
+    "commit": "3113181d0c1bfb8719f3ddcd2e2f35a8d763d1e5"
+  },
+  "vim-closetag": {
+    "branch": "master",
+    "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822"
+  },
+  "vim-fugitive": {
+    "branch": "master",
+    "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4"
+  },
+  "vim-grepper": {
+    "branch": "master",
+    "commit": "acaaf32edaa11d82fb972d2af36b949ec3042928"
+  },
+  "vim-markdown-toc": {
+    "branch": "master",
+    "commit": "aa9cc3b07791db5cbe5f29d661763bc0eb4fb7c1"
+  },
+  "vim-one": {
+    "branch": "master",
+    "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24"
+  },
+  "vim-python-pep8-indent": {
+    "branch": "master",
+    "commit": "60ba5e11a61618c0344e2db190210145083c91f8"
+  },
+  "vim-table-mode": {
+    "branch": "master",
+    "commit": "e156dbbedce0bbf61c0919db7678fa246fabd616"
+  },
+  "winresizer": {
+    "branch": "master",
+    "commit": "9bd559a03ccec98a458e60c705547119eb5350f3"
+  },
+  "zen-mode.nvim": {
+    "branch": "main",
+    "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f"
+  }
 }
diff --git a/nvim/lua/plugins/mini.lua b/nvim/lua/plugins/mini.lua
index 1bcc796..b72ca08 100644
--- a/nvim/lua/plugins/mini.lua
+++ b/nvim/lua/plugins/mini.lua
@@ -8,28 +8,28 @@ return {
 			require("mini.surround").setup()
 			require("mini.pairs").setup()
 			require("mini.trailspace").setup()
-			
+
 			-- utilities
 			require("mini.misc").setup()
 			require("mini.misc").setup_restore_cursor()
 			require("mini.operators").setup()
-			
+
 			-- keymap for zoom
-			vim.keymap.set('n', '<leader>z', require('mini.misc').zoom, { desc = 'Zoom current buffer' })
-			
+			vim.keymap.set("n", "<leader>z", require("mini.misc").zoom, { desc = "Zoom current buffer" })
+
 			-- enhanced text objects
 			require("mini.ai").setup({
 				custom_textobjects = {
 					-- Python text objects
-					f = require('mini.ai').gen_spec.treesitter({ a = '@function.outer', i = '@function.inner' }),
-					c = require('mini.ai').gen_spec.treesitter({ a = '@class.outer', i = '@class.inner' }),
+					f = require("mini.ai").gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }),
+					c = require("mini.ai").gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }),
 					-- Markdown text objects
-					h = require('mini.ai').gen_spec.treesitter({ a = '@markup.heading', i = '@markup.heading' }),
+					h = require("mini.ai").gen_spec.treesitter({ a = "@markup.heading", i = "@markup.heading" }),
 					-- Code blocks in markdown
 					C = function(ai_type)
-						local pattern = '```.-```'
-						return require('mini.ai').gen_spec.pair(pattern, pattern, {
-							type = 'non-balanced'
+						local pattern = "```.-```"
+						return require("mini.ai").gen_spec.pair(pattern, pattern, {
+							type = "non-balanced",
 						})(ai_type)
 					end,
 				},
diff --git a/nvim/lua/plugins/obsidian.lua b/nvim/lua/plugins/obsidian.lua
index d39c99f..f61f6a7 100644
--- a/nvim/lua/plugins/obsidian.lua
+++ b/nvim/lua/plugins/obsidian.lua
@@ -26,21 +26,18 @@ return {
 			-- The options are passed directly to `vim.api.nvim_set_hl()`. See `:help nvim_set_hl`.
 			ObsidianTodo = { fg = "NONE", bg = "NONE" },
 		},
+		-- Optional, alternatively you can customize the frontmatter data.
+		---@return table
 		note_frontmatter_func = function(note)
-			local out = {
-				id = note.id,
-				created = os.date("%Y-%m-%d %H:%M:%S"),
-				link = "",
-				tags = { "note" }, -- Add your default tags here
-			}
-
-			-- Add title as alias if it exists
+			-- Add the title of the note as an alias.
 			if note.title then
 				note:add_alias(note.title)
-				out.aliases = note.aliases
 			end
 
-			-- Preserve any existing metadata
+			local out = { id = note.id, aliases = note.aliases, tags = note.tags }
+
+			-- `note.metadata` contains any manually added fields in the frontmatter.
+			-- So here we just make sure those fields are kept in the frontmatter.
 			if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
 				for k, v in pairs(note.metadata) do
 					out[k] = v

From 1fa4f3023edadfe7e5b9d3590342e1b85a7a901c Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sun, 19 Oct 2025 18:13:22 +1300
Subject: [PATCH 04/20] feat

---
 python/setup-uv.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/python/setup-uv.sh b/python/setup-uv.sh
index db44842..1c4204e 100644
--- a/python/setup-uv.sh
+++ b/python/setup-uv.sh
@@ -5,3 +5,4 @@ uv tool install ruff --python 3.11.9
 uv tool install yamllint --python 3.11.9
 uv tool install pydocstyle --python 3.11.9
 uv tool install sqlfluff --python 3.11.9
+uv tool install pynvim --python 3.11.9

From 3866b42377c02564caeee908d5564b270c82cd50 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Thu, 23 Oct 2025 03:18:37 +1300
Subject: [PATCH 05/20] feat

---
 nix/flake.lock    | 6 +++---
 nix/flake.nix     | 4 ++--
 scripts/search.sh | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/nix/flake.lock b/nix/flake.lock
index 0de4ed5..0d6154b 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1753429684,
-        "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
+        "lastModified": 1760878510,
+        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
+        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
         "type": "github"
       },
       "original": {
diff --git a/nix/flake.nix b/nix/flake.nix
index f0fe5bd..4d0022f 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -15,7 +15,7 @@
         defaultPackage = with pkgs; buildEnv {
           name = "shell";
           paths = [
-            actionlint
+            # actionlint # Installed via Homebrew to avoid nokogiri build issues
             go-tools
             bash
             bat
@@ -60,7 +60,7 @@
             nodePackages_latest.prettier
             nodePackages_latest.sql-formatter
             nodePackages_latest.stylelint
-            nodejs_20
+            nodejs_22
             ov
             pandoc
             ripgrep
diff --git a/scripts/search.sh b/scripts/search.sh
index d789e46..bf16655 100755
--- a/scripts/search.sh
+++ b/scripts/search.sh
@@ -16,7 +16,9 @@ open_files_with_editor() {
   fi
 }
 
-cd "$1" || exit
+# Use provided directory or default to current directory
+target_dir="${1:-.}"
+cd "$target_dir" || exit
 
 if [ "$TERM_HEIGHT" -ge "$MIN_HEIGHT" ]; then
   files=$(fzf --preview 'bat --style=numbers --color=always {}' --height 60% -m)

From 93836d5e78e2577715849325ee8f937e05eb7d45 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Tue, 11 Nov 2025 00:09:27 +1300
Subject: [PATCH 06/20] feat

---
 README.md                         |  2 --
 dotfiles/.envrc                   |  1 +
 nvim/lua/plugins/cmp.lua          |  2 +-
 nvim/lua/plugins/formatting.lua   | 35 +++++++++++++++++++++++++++++++
 nvim/lua/plugins/lsp.lua          |  3 +++
 nvim/lua/plugins/obsidian.lua     | 33 ++++++++++++++---------------
 nvim/lua/plugins/text-editing.lua |  9 ++++++++
 scripts/aliases.sh                |  4 +++-
 8 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 35b245f..f194c2b 100644
--- a/README.md
+++ b/README.md
@@ -112,5 +112,3 @@ Had weird issue with the first execution of Kitty not loading the `kitty.conf` c
 
 $ launchctl load ~/Library/LaunchAgents/setenv.XDG_CONFIG_HOME.plist
 ```
-
-
diff --git a/dotfiles/.envrc b/dotfiles/.envrc
index 74c0550..41bc4ed 100644
--- a/dotfiles/.envrc
+++ b/dotfiles/.envrc
@@ -1,2 +1,3 @@
 source_env_if_exists ~/.env.secret
 export TRACE=0
+source .venv/bin/activate
diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua
index c75152a..2602326 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/nvim/lua/plugins/cmp.lua
@@ -48,7 +48,7 @@ return {
 				},
 				keymap = {
 					["<Tab>"] = {
-						"select_next",
+						"accept",
 						-- "fallback"
 					},
 					["<S-Tab>"] = {
diff --git a/nvim/lua/plugins/formatting.lua b/nvim/lua/plugins/formatting.lua
index 599658f..5f9fe2d 100644
--- a/nvim/lua/plugins/formatting.lua
+++ b/nvim/lua/plugins/formatting.lua
@@ -64,6 +64,41 @@ return {
 					"-",
 				},
 			}
+
+			require("conform").formatters.ruff_format = {
+				command = "ruff",
+				args = {
+					"format",
+					"--force-exclude",
+					"--stdin-filename",
+					"$FILENAME",
+					"-",
+				},
+				range_args = function(_, ctx)
+					return {
+						"format",
+						"--force-exclude",
+						"--range",
+						string.format(
+							"%d:%d-%d:%d",
+							ctx.range.start[1],
+							ctx.range.start[2] + 1,
+							ctx.range["end"][1],
+							ctx.range["end"][2] + 1
+						),
+						"--stdin-filename",
+						"$FILENAME",
+						"-",
+					}
+				end,
+				stdin = true,
+				cwd = require("conform.util").root_file({
+					"pyproject.toml",
+					"ruff.toml",
+					".ruff.toml",
+				}),
+			}
+
 			require("conform").formatters.injected = {
 				options = {
 					ignore_errors = false,
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index e832e22..b7eca73 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -118,6 +118,9 @@ return {
 					vim.keymap.set("n", "<space>ca", vim.lsp.buf.code_action, bufopts)
 					vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts)
 					vim.keymap.set("n", "grr", vim.lsp.buf.rename, bufopts)
+					vim.keymap.set("n", "gdx", ":belowright split | lua vim.lsp.buf.definition()<CR>", opts)
+					vim.keymap.set("n", "gdv", ":vsplit | lua vim.lsp.buf.definition()<CR>", opts)
+					vim.keymap.set("n", "gdt", ":tab split | lua vim.lsp.buf.definition()<CR>", opts)
 				end,
 			})
 		end,
diff --git a/nvim/lua/plugins/obsidian.lua b/nvim/lua/plugins/obsidian.lua
index f61f6a7..aa38b0e 100644
--- a/nvim/lua/plugins/obsidian.lua
+++ b/nvim/lua/plugins/obsidian.lua
@@ -26,25 +26,24 @@ return {
 			-- The options are passed directly to `vim.api.nvim_set_hl()`. See `:help nvim_set_hl`.
 			ObsidianTodo = { fg = "NONE", bg = "NONE" },
 		},
-		-- Optional, alternatively you can customize the frontmatter data.
-		---@return table
-		note_frontmatter_func = function(note)
-			-- Add the title of the note as an alias.
-			if note.title then
-				note:add_alias(note.title)
-			end
-
-			local out = { id = note.id, aliases = note.aliases, tags = note.tags }
+		frontmatter = {
+			func = function(note)
+				-- Add the title of the note as an alias.
+				if note.title then
+					note:add_alias(note.title)
+				end
+				local out = { id = note.id, aliases = note.aliases, tags = note.tags }
 
-			-- `note.metadata` contains any manually added fields in the frontmatter.
-			-- So here we just make sure those fields are kept in the frontmatter.
-			if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
-				for k, v in pairs(note.metadata) do
-					out[k] = v
+				-- `note.metadata` contains any manually added fields in the frontmatter.
+				-- So here we just make sure those fields are kept in the frontmatter.
+				if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
+					for k, v in pairs(note.metadata) do
+						out[k] = v
+					end
 				end
-			end
 
-			return out
-		end,
+				return out
+			end,
+		},
 	},
 }
diff --git a/nvim/lua/plugins/text-editing.lua b/nvim/lua/plugins/text-editing.lua
index 774361c..474ca4a 100644
--- a/nvim/lua/plugins/text-editing.lua
+++ b/nvim/lua/plugins/text-editing.lua
@@ -1,4 +1,13 @@
 return {
+	{
+		"ggandor/leap.nvim",
+		dependencies = { "tpope/vim-repeat" },
+		config = function()
+			-- Set up recommended keymaps for leap.nvim
+			vim.keymap.set({ "n", "x", "o" }, "s", "<Plug>(leap)")
+			vim.keymap.set("n", "S", "<Plug>(leap-from-window)")
+		end,
+	},
 	{ "akinsho/git-conflict.nvim", version = "*", config = true },
 	{
 		"toppair/peek.nvim",
diff --git a/scripts/aliases.sh b/scripts/aliases.sh
index b442a8c..a97f160 100755
--- a/scripts/aliases.sh
+++ b/scripts/aliases.sh
@@ -51,7 +51,7 @@ alias pipr='pip install -r requirements.txt'
 alias cheat='$EDITOR $PERSONAL_PATH/resource/cheat_sheet.md'
 alias ideas='$EDITOR $HOME/dss/notes/content/ideas/README.md'
 alias inb='inbox'
-alias inbox='$EDITOR $PERSONAL_PATH/inbox/inbox.md'
+alias inbox='$EDITOR $PERSONAL_PATH/area/inbox/inbox.md'
 alias quotes='$EDITOR $PERSONAL_PATH/lists/quotes.md'
 alias someday='$EDITOR $PERSONAL_PATH/someday.md'
 
@@ -155,3 +155,5 @@ alias air='ssh adamgreen@air.local'
 alias macbook='ssh adam@macbook.local'
 
 alias f='fish'
+
+alias ai='claude'

From 8722d642ed5b25e22411d669817f36b0ed3d4750 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sun, 16 Nov 2025 23:39:44 +1300
Subject: [PATCH 07/20] feat

---
 nvim/lua/config/keymap.lua     | 14 +++++++-------
 nvim/lua/plugins/telescope.lua | 24 +++++++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/nvim/lua/config/keymap.lua b/nvim/lua/config/keymap.lua
index 04d3823..14efa09 100644
--- a/nvim/lua/config/keymap.lua
+++ b/nvim/lua/config/keymap.lua
@@ -92,33 +92,33 @@ km("n", "<leader>g", ":Grepper -tool rg -noprompt -cword <CR>", opts)
 km(
 	"n",
 	"<leader>rd",
-	":lua require'telescope.builtin'.diagnostics(require('telescope.themes').get_ivy({}))<cr><cr>",
+	":lua require'telescope.builtin'.diagnostics(require('telescope.themes').get_ivy({}))<cr>",
 	opts
 )
 -- Search open buffers
 km(
 	"n",
 	"<leader><leader>",
-	":lua require'telescope.builtin'.buffers(require('telescope.themes').get_ivy({}))<cr><cr>",
+	":lua require'telescope.builtin'.buffers(require('telescope.themes').get_ivy({}))<cr>",
 	opts
 )
 -- Search for files in cwd
-km("n", "<leader>j", ":lua require'telescope.builtin'.find_files(require('telescope.themes').get_ivy({}))<CR>", opts)
+km("n", "<leader>j", ":lua require'telescope.builtin'.find_files(require('telescope.themes').get_ivy({}))<cr>", opts)
 --- Search through recent files
-km("n", "<leader>ro", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))<cr><cr>", opts)
-km("n", "<leader>rr", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))<cr><cr>", opts)
+km("n", "<leader>ro", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))<cr>", opts)
+km("n", "<leader>rr", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))<cr>", opts)
 -- Search for a string
 km(
 	"n",
 	"<leader>rg",
-	":lua require'telescope.builtin'.live_grep(require('telescope.themes').get_ivy({}))<cr><cr>",
+	":lua require'telescope.builtin'.live_grep(require('telescope.themes').get_ivy({}))<cr>",
 	opts
 )
 -- Search for a string under cursor
 km(
 	"n",
 	"<leader>rc",
-	":lua require'telescope.builtin'.grep_string(require('telescope.themes').get_ivy({}))<cr><cr>",
+	":lua require'telescope.builtin'.grep_string(require('telescope.themes').get_ivy({}))<cr>",
 	opts
 )
 
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index 8c95703..a00613d 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -30,9 +30,17 @@ return {
 				defaults = {
 					layout_strategy = "flex",
 					layout_config = { width = 0.9 },
-					prompt_prefix = " ",
-					selection_caret = " ",
+					prompt_prefix = " ",
+					selection_caret = " ",
 					path_display = { "smart" },
+					file_ignore_patterns = {
+						"node_modules",
+						".git/",
+						"__pycache__",
+						"%.pyc",
+						"venv/",
+						"%.cache",
+					},
 					mappings = {
 						i = {
 							["<C-n>"] = actions.move_selection_next,
@@ -86,15 +94,17 @@ return {
 					fzf = {
 						fuzzy = true, -- false will only do exact matching
 						case_mode = "smart_case", -- or "ignore_case" or "respect_case"
-						["ui-select"] = {
-							require("telescope.themes").get_dropdown(),
-						},
+					},
+					["ui-select"] = {
+						require("telescope.themes").get_dropdown(),
 					},
 				},
 			})
-			require("telescope").load_extension("fzf")
+			-- Load extensions with error handling
+			pcall(require("telescope").load_extension, "fzf")
 			pcall(require("telescope").load_extension, "ui-select")
-			require("telescope").load_extension("git_file_history")
+			pcall(require("telescope").load_extension, "git_file_history")
+			pcall(require("telescope").load_extension, "make")
 		end,
 	},
 }

From c84a9efe0f5b7d9c63fec63b24aece57589a6974 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sun, 7 Dec 2025 00:43:38 +1300
Subject: [PATCH 08/20] feat

---
 nvim/lua/plugins/cmp.lua | 22 ----------------------
 scripts/aliases.sh       |  1 +
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua
index 2602326..e201796 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/nvim/lua/plugins/cmp.lua
@@ -24,39 +24,17 @@ return {
 			snippets = { preset = "luasnip" },
 			fuzzy = { implementation = "prefer_rust_with_warning" },
 
-			keymap = {
-				["<Tab>"] = {
-					"select_next",
-					-- "fallback"
-				},
-				["<S-Tab>"] = {
-					"select_prev",
-					-- "fallback"
-				},
-				["<CR>"] = {
-					-- "accept",
-					"fallback",
-				},
-			},
-
 			cmdline = {
 				enabled = true,
 				completion = {
-					-- keyword = { range = "full" },
 					menu = { auto_show = true },
 					ghost_text = { enabled = true },
 				},
 				keymap = {
 					["<Tab>"] = {
 						"accept",
-						-- "fallback"
-					},
-					["<S-Tab>"] = {
-						"select_prev",
-						-- "fallback"
 					},
 					["<CR>"] = {
-						-- "select_accept_and_enter",
 						"fallback",
 					},
 				},
diff --git a/scripts/aliases.sh b/scripts/aliases.sh
index a97f160..35a1304 100755
--- a/scripts/aliases.sh
+++ b/scripts/aliases.sh
@@ -157,3 +157,4 @@ alias macbook='ssh adam@macbook.local'
 alias f='fish'
 
 alias ai='claude'
+alias ai-talk='claude converse'

From 9182daa230d89176ff0e940544c6af90a6a93e57 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sun, 7 Dec 2025 00:43:49 +1300
Subject: [PATCH 09/20] feat

---
 nvim/lazy-lock.json | 61 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 nvim/lazy-lock.json

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
new file mode 100644
index 0000000..a79d55b
--- /dev/null
+++ b/nvim/lazy-lock.json
@@ -0,0 +1,61 @@
+{
+  "CopilotChat.nvim": { "branch": "main", "commit": "98435447243eb80a7c228b1447f14f3294d39739" },
+  "LuaSnip": { "branch": "master", "commit": "b3104910bb5ebf40492aadffae18f2528fa757d9" },
+  "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
+  "barbar.nvim": { "branch": "master", "commit": "549ee11d97057eae207bafa2c23c315942cca097" },
+  "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
+  "blink-cmp-dictionary": { "branch": "master", "commit": "43b701fe9728a704bc63e4667c5d8b398bf129b2" },
+  "blink-emoji.nvim": { "branch": "master", "commit": "f22ce8cac02a6ece05368220f1e38bd34fe376f9" },
+  "blink-ripgrep.nvim": { "branch": "main", "commit": "15ee464cd007f845eea9c1b392baf7443c05b4c9" },
+  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
+  "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
+  "bullets.vim": { "branch": "master", "commit": "1c13e510e11d08b0259e8e627f128359c5521962" },
+  "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" },
+  "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
+  "copilot.lua": { "branch": "master", "commit": "3123983d00ae6859f8bc987d14ebb524bb41b618" },
+  "dbtpal": { "branch": "main", "commit": "981eab51609362712c64e3cf3fb773fe11f859b9" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "emmet-vim": { "branch": "master", "commit": "e98397144982d1e75b20d94d55a82de3ec8f648d" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
+  "leap.nvim": { "branch": "main", "commit": "673517c316a0808a2f6948ed863e18c6cc03da21" },
+  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
+  "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" },
+  "mini.nvim": { "branch": "main", "commit": "8a7cf7eee8d89bd1b83f6d72f7f3b5598e7ae2cb" },
+  "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
+  "nvim-bqf": { "branch": "main", "commit": "a77b17e39b1b707b6feee86a36c83703c1534c08" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
+  "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
+  "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
+  "obsidian.nvim": { "branch": "main", "commit": "6b2a22a74d1c883e797764c28f75aa6b532a1ae4" },
+  "oil.nvim": { "branch": "master", "commit": "71948729cda5fc1b761d6ae60ff774b5525f1d50" },
+  "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "semshi": { "branch": "master", "commit": "fa32fbc5faf0b46f2e7a981a90b87ee54bcca42a" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
+  "telescope-makefile": { "branch": "master", "commit": "6e5b5767751dbf73ad4f126840dcf1abfc38e891" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
+  "trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
+  "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
+  "vim": { "branch": "master", "commit": "d4b0823100c702af127cba8dd5595a8f599041ec" },
+  "vim-argwrap": { "branch": "master", "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1" },
+  "vim-bufkill": { "branch": "master", "commit": "3113181d0c1bfb8719f3ddcd2e2f35a8d763d1e5" },
+  "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
+  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
+  "vim-grepper": { "branch": "master", "commit": "acaaf32edaa11d82fb972d2af36b949ec3042928" },
+  "vim-markdown-toc": { "branch": "master", "commit": "66026b323379c9a712c6169cd43153216acef090" },
+  "vim-one": { "branch": "master", "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24" },
+  "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
+  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
+  "vim-table-mode": { "branch": "master", "commit": "e156dbbedce0bbf61c0919db7678fa246fabd616" },
+  "winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" },
+  "zen-mode.nvim": { "branch": "main", "commit": "438a59c33763d79e34ceb394e012c3bfd6aa1084" }
+}

From 47d40248089c2f8e3cfedfd3840db4297947208d Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Wed, 10 Dec 2025 17:09:20 +1300
Subject: [PATCH 10/20] feat

---
 dotfiles/.gitignore          | 1 +
 nvim/lua/plugins/copilot.lua | 2 +-
 scripts/aliases.sh           | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dotfiles/.gitignore b/dotfiles/.gitignore
index 3980959..cdaa328 100644
--- a/dotfiles/.gitignore
+++ b/dotfiles/.gitignore
@@ -37,3 +37,4 @@ pre
 temp
 temp.*
 temp
+.databricks
diff --git a/nvim/lua/plugins/copilot.lua b/nvim/lua/plugins/copilot.lua
index 68a7b36..4381806 100644
--- a/nvim/lua/plugins/copilot.lua
+++ b/nvim/lua/plugins/copilot.lua
@@ -48,7 +48,7 @@ return {
 			history_path = vim.fn.stdpath("data") .. "/copilotchat_history",
 			auto_follow_cursor = false,
 			auto_insert_mode = true,
-			model = "gpt-4o",
+			model = "gpt-4o-mini",
 		},
 	},
 }
diff --git a/scripts/aliases.sh b/scripts/aliases.sh
index b442a8c..4b534ea 100755
--- a/scripts/aliases.sh
+++ b/scripts/aliases.sh
@@ -155,3 +155,5 @@ alias air='ssh adamgreen@air.local'
 alias macbook='ssh adam@macbook.local'
 
 alias f='fish'
+
+alias secret='nvim /home/adam/src/.env.secret'

From 2eceb8962395b2e36b5cef0cf5528902ee78bc9f Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sun, 21 Dec 2025 03:08:02 +1300
Subject: [PATCH 11/20] feat

---
 dotfiles/.luarc.json          |  2 +-
 nvim/.luarc.json              | 20 +++++++++++
 nvim/lazy-lock.json           | 62 +++++++++++++++++------------------
 nvim/lua/plugins/lsp.lua      | 23 +++++++++++--
 nvim/lua/plugins/obsidian.lua |  3 +-
 scripts/funcs.sh              | 12 +------
 6 files changed, 75 insertions(+), 47 deletions(-)
 create mode 100644 nvim/.luarc.json

diff --git a/dotfiles/.luarc.json b/dotfiles/.luarc.json
index 353eec1..8e6219c 100644
--- a/dotfiles/.luarc.json
+++ b/dotfiles/.luarc.json
@@ -1,6 +1,6 @@
 {
   "workspace.library": [
-    "/Users/adam/dotfiles/nvim",
+    "/Users/adamgreen/dotfiles/nvim",
     "${3rd}/luassert/library",
     "${3rd}/luv/library"
   ]
diff --git a/nvim/.luarc.json b/nvim/.luarc.json
new file mode 100644
index 0000000..48c86c6
--- /dev/null
+++ b/nvim/.luarc.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
+  "runtime": {
+    "version": "LuaJIT"
+  },
+  "diagnostics": {
+    "globals": ["vim"]
+  },
+  "workspace": {
+    "library": [
+      "$VIMRUNTIME",
+      "${3rd}/luv/library",
+      "${3rd}/luassert/library"
+    ],
+    "checkThirdParty": false
+  },
+  "telemetry": {
+    "enable": false
+  }
+}
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index a79d55b..8fef13b 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -1,52 +1,52 @@
 {
-  "CopilotChat.nvim": { "branch": "main", "commit": "98435447243eb80a7c228b1447f14f3294d39739" },
-  "LuaSnip": { "branch": "master", "commit": "b3104910bb5ebf40492aadffae18f2528fa757d9" },
+  "CopilotChat.nvim": { "branch": "main", "commit": "df5376c132382dd47e3e552612940cbf25b3580c" },
+  "LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" },
   "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
-  "barbar.nvim": { "branch": "master", "commit": "549ee11d97057eae207bafa2c23c315942cca097" },
+  "barbar.nvim": { "branch": "master", "commit": "539d73def39c9172b4d4d769f14090e08f37b29d" },
   "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
-  "blink-cmp-dictionary": { "branch": "master", "commit": "43b701fe9728a704bc63e4667c5d8b398bf129b2" },
-  "blink-emoji.nvim": { "branch": "master", "commit": "f22ce8cac02a6ece05368220f1e38bd34fe376f9" },
-  "blink-ripgrep.nvim": { "branch": "main", "commit": "15ee464cd007f845eea9c1b392baf7443c05b4c9" },
-  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
+  "blink-cmp-dictionary": { "branch": "master", "commit": "944b3b215b01303672d4213758db7c5c5a1e3c92" },
+  "blink-emoji.nvim": { "branch": "master", "commit": "066013e4c98a9318408ee3f1ca2dbcb6fa3e4c06" },
+  "blink-ripgrep.nvim": { "branch": "main", "commit": "b181a42925e5bec11030516124b0123c2a297abb" },
+  "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
   "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
-  "bullets.vim": { "branch": "master", "commit": "1c13e510e11d08b0259e8e627f128359c5521962" },
-  "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" },
+  "bullets.vim": { "branch": "master", "commit": "89294b8930e660936374fb763ac48a1ac51dd29c" },
+  "conform.nvim": { "branch": "master", "commit": "328c2f1dda56f933d3337a1316e1020ba30ba6aa" },
   "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
-  "copilot.lua": { "branch": "master", "commit": "3123983d00ae6859f8bc987d14ebb524bb41b618" },
+  "copilot.lua": { "branch": "master", "commit": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64" },
   "dbtpal": { "branch": "main", "commit": "981eab51609362712c64e3cf3fb773fe11f859b9" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "emmet-vim": { "branch": "master", "commit": "e98397144982d1e75b20d94d55a82de3ec8f648d" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
-  "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
-  "leap.nvim": { "branch": "main", "commit": "673517c316a0808a2f6948ed863e18c6cc03da21" },
-  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
-  "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" },
-  "mini.nvim": { "branch": "main", "commit": "8a7cf7eee8d89bd1b83f6d72f7f3b5598e7ae2cb" },
-  "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
-  "nvim-bqf": { "branch": "main", "commit": "a77b17e39b1b707b6feee86a36c83703c1534c08" },
+  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "leap.nvim": { "branch": "main", "commit": "f19d43590c4b6d31188ee1ea2954d2b7558a9e11" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
+  "mini.nvim": { "branch": "main", "commit": "b7231b65d15611a99168bc5a94a84cb8e4c85c21" },
+  "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
+  "nvim-bqf": { "branch": "main", "commit": "ba2b365969d7c2c6301d48e13aeee59568765529" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
+  "nvim-lint": { "branch": "master", "commit": "7a64f4067065c16a355d40d0d599b8ca6b25de6d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "c4f67bf85b01a57e3c130352c0a0e453ab8cd5b9" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" },
   "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
   "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
-  "obsidian.nvim": { "branch": "main", "commit": "6b2a22a74d1c883e797764c28f75aa6b532a1ae4" },
-  "oil.nvim": { "branch": "master", "commit": "71948729cda5fc1b761d6ae60ff774b5525f1d50" },
+  "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
+  "oil.nvim": { "branch": "master", "commit": "cbcb3f997f6f261c577b943ec94e4ef55108dd95" },
   "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "semshi": { "branch": "master", "commit": "fa32fbc5faf0b46f2e7a981a90b87ee54bcca42a" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "semshi": { "branch": "master", "commit": "7f18bedc70cbb7aa68dcc6df5e730d88e4527622" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
   "telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
-  "telescope-makefile": { "branch": "master", "commit": "6e5b5767751dbf73ad4f126840dcf1abfc38e891" },
-  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
+  "telescope-makefile": { "branch": "master", "commit": "f35425d7d53d92a04215c3714a5819811d2842c3" },
+  "telescope.nvim": { "branch": "master", "commit": "3d757e586ff0bfc85bdb7b46c9d3d932147a0cde" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
   "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
   "vim": { "branch": "master", "commit": "d4b0823100c702af127cba8dd5595a8f599041ec" },
-  "vim-argwrap": { "branch": "master", "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1" },
+  "vim-argwrap": { "branch": "master", "commit": "03615d1eed248408567bc8fa6a5a8c94ef3cd170" },
   "vim-bufkill": { "branch": "master", "commit": "3113181d0c1bfb8719f3ddcd2e2f35a8d763d1e5" },
   "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
   "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
@@ -55,7 +55,7 @@
   "vim-one": { "branch": "master", "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24" },
   "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
-  "vim-table-mode": { "branch": "master", "commit": "e156dbbedce0bbf61c0919db7678fa246fabd616" },
+  "vim-table-mode": { "branch": "master", "commit": "bb025308a45c67c7c8f0763ba37bc2ee3f534df0" },
   "winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" },
-  "zen-mode.nvim": { "branch": "main", "commit": "438a59c33763d79e34ceb394e012c3bfd6aa1084" }
+  "zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" }
 }
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index b7eca73..9f6587b 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -53,15 +53,32 @@ return {
 
 			-- lua
 			vim.lsp.config["luals"] = {
-				cmd = { "lua-language-server" },
+				cmd = { "lua-language-server", "--force-accept-workspace" },
 				filetypes = { "lua" },
-				root_markers = { ".luarc.json", ".luarc.jsonc", ".git" },
+				root_markers = {
+					".luarc.json",
+					".luarc.jsonc",
+					".git",
+				},
 				settings = {
 					Lua = {
 						runtime = {
 							version = "LuaJIT",
 						},
-						diagnostics = { globals = { "vim" } },
+						diagnostics = {
+							globals = { "vim" },
+						},
+						workspace = {
+							library = {
+								vim.env.VIMRUNTIME,
+								"${3rd}/luv/library",
+								"${3rd}/luassert/library",
+							},
+							checkThirdParty = false,
+						},
+						telemetry = {
+							enable = false,
+						},
 					},
 				},
 			}
diff --git a/nvim/lua/plugins/obsidian.lua b/nvim/lua/plugins/obsidian.lua
index aa38b0e..d8312fd 100644
--- a/nvim/lua/plugins/obsidian.lua
+++ b/nvim/lua/plugins/obsidian.lua
@@ -1,5 +1,6 @@
 return {
-	"obsidian-nvim/obsidian.nvim",
+	-- "obsidian-nvim/obsidian.nvim",
+	"epwalsh/obsidian.nvim",
 	version = "*",
 	lazy = true,
 	ft = "markdown",
diff --git a/scripts/funcs.sh b/scripts/funcs.sh
index 79e60f9..615c85d 100644
--- a/scripts/funcs.sh
+++ b/scripts/funcs.sh
@@ -102,22 +102,12 @@ gac() {
   git add -u && git commit -m "$1" && git push origin
 }
 
-# Show a random quote/snippet from two files
-# Combines quotes.md and random_snippets.md from personal repo
 quote() {
   QUOTES="$PERSONAL_PATH/resource/quotes.md"
   SNIPPETS="$PERSONAL_PATH/resource/random_snippets.md"
-
-  # Get all non-empty lines from both files, skipping YAML headers
-  ALL_LINES=$(tail -n +6 "$QUOTES" "$SNIPPETS" | grep -v "^$")
-
-  # Count total lines
+  ALL_LINES=$(tail -n +6 "$QUOTES" "$SNIPPETS" | grep -v "^$" | grep -v "^#")
   NUM_LINES=$(echo "$ALL_LINES" | wc -l)
-
-  # Select a random line number
   LINE=$((1 + RANDOM % NUM_LINES))
-
-  # Print the selected line
   echo -n "$ALL_LINES" | sed -n "${LINE}p"
 }
 

From 1feb272e4e72889d9f51b147e4bbd22dfe76834f Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sun, 21 Dec 2025 03:14:19 +1300
Subject: [PATCH 12/20] feat

---
 nix/flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nix/flake.lock b/nix/flake.lock
index 0d6154b..8ea3304 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760878510,
-        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
+        "lastModified": 1766070988,
+        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
+        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
         "type": "github"
       },
       "original": {

From 5e27d240cba44ce1999be717fef279aba50d78f9 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sat, 3 Jan 2026 00:45:19 +1300
Subject: [PATCH 13/20] feat

---
 Makefile                        | 16 ++++++++--------
 nvim/lazy-lock.json             |  1 +
 nvim/lua/config/keymap.lua      | 21 +++------------------
 nvim/lua/plugins/treesitter.lua | 12 ++++++++++++
 scripts/aliases.sh              |  2 +-
 5 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index f9341c5..ce21425 100644
--- a/Makefile
+++ b/Makefile
@@ -26,13 +26,13 @@ setup-stow:
 
 STOW_ARGS=-vv
 dotfiles: setup-stow
-	stow $(STOW_ARGS) -d dotfiles -t $(HOME) $(OS)
-	stow $(STOW_ARGS) dotfiles
-	stow $(STOW_ARGS) yabai
+	stow "$(STOW_ARGS)" -d dotfiles -t "$(HOME)"$(OS)
+	stow "$(STOW_ARGS)" dotfiles
+	stow "$(STOW_ARGS)" yabai
 	ln -sf ~/dotfiles/fish ~/.config/fish\
 
 test: setup-nix
-	bash ./nix/load-$(OS).sh && bash ./tests/*.sh
+	bash ./nix/load-"$(OS)".sh && bash ./tests/*.sh
 
 .PHONY: setup-uv python js
 
@@ -64,12 +64,12 @@ setup-vim:
 
 setup-nix:
 	curl -L https://nixos.org/nix/install | sh
-	. ./nix/load-$(OS).sh && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable
-	. ./nix/load-$(OS).sh && nix-channel --update
+	. ./nix/load-"$(OS)".sh && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable
+	. ./nix/load-"$(OS)".sh && nix-channel --update
 
 NIX_ARGS=--extra-experimental-features nix-command --extra-experimental-features flakes
 nix-pkgs: setup-nix
-	. ./nix/load-$(OS).sh && cd nix && nix flake update $(NIX_ARGS) && nix profile install $(NIX_ARGS)
+	. ./nix/load-"$(OS)".sh && cd nix && nix flake update "$(NIX_ARGS)" && nix profile install$(NIX_ARGS)
 
 .PHONY: setup-brew brew-pkgs
 
@@ -78,6 +78,6 @@ setup-brew:
 	brew update; brew upgrade
 
 brew-pkgs: setup-brew
-	brew install hadolint vale actionlint mactex pandoc fzf keychain wordnet
+	brew install hadolint vale actionlint mactex pandoc fzf keychain wordnet entr
 	brew install koekeishiya/formulae/yabai
 	brew install koekeishiya/formulae/skhd
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 8fef13b..d4b77bf 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -32,6 +32,7 @@
   "nvim-lspconfig": { "branch": "master", "commit": "c4f67bf85b01a57e3c130352c0a0e453ab8cd5b9" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
   "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
   "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
   "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
diff --git a/nvim/lua/config/keymap.lua b/nvim/lua/config/keymap.lua
index 14efa09..a33921e 100644
--- a/nvim/lua/config/keymap.lua
+++ b/nvim/lua/config/keymap.lua
@@ -89,12 +89,7 @@ km("n", "<leader>g", ":Grepper -tool rg -noprompt -cword <CR>", opts)
 
 -- Telescope
 -- Search diagnostics
-km(
-	"n",
-	"<leader>rd",
-	":lua require'telescope.builtin'.diagnostics(require('telescope.themes').get_ivy({}))<cr>",
-	opts
-)
+km("n", "<leader>rd", ":lua require'telescope.builtin'.diagnostics(require('telescope.themes').get_ivy({}))<cr>", opts)
 -- Search open buffers
 km(
 	"n",
@@ -108,19 +103,9 @@ km("n", "<leader>j", ":lua require'telescope.builtin'.find_files(require('telesc
 km("n", "<leader>ro", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))<cr>", opts)
 km("n", "<leader>rr", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))<cr>", opts)
 -- Search for a string
-km(
-	"n",
-	"<leader>rg",
-	":lua require'telescope.builtin'.live_grep(require('telescope.themes').get_ivy({}))<cr>",
-	opts
-)
+km("n", "<leader>rg", ":lua require'telescope.builtin'.live_grep(require('telescope.themes').get_ivy({}))<cr>", opts)
 -- Search for a string under cursor
-km(
-	"n",
-	"<leader>rc",
-	":lua require'telescope.builtin'.grep_string(require('telescope.themes').get_ivy({}))<cr>",
-	opts
-)
+km("n", "<leader>rc", ":lua require'telescope.builtin'.grep_string(require('telescope.themes').get_ivy({}))<cr>", opts)
 
 -- Oil
 vim.keymap.set("n", "<leader>o", "<CMD>split | Oil<CR>")
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
index 03dfb55..6958a3f 100644
--- a/nvim/lua/plugins/treesitter.lua
+++ b/nvim/lua/plugins/treesitter.lua
@@ -5,6 +5,9 @@ return {
 			{
 				"windwp/nvim-ts-autotag",
 			},
+			{
+				"nvim-treesitter/nvim-treesitter-textobjects",
+			},
 		},
 		config = function()
 			local status_ok, configs = pcall(require, "nvim-treesitter.configs")
@@ -35,6 +38,15 @@ return {
 					-- disable = { "markdown" },
 					additional_vim_regex_highlighting = true,
 				},
+				textobjects = {
+					select = {
+						enable = true,
+						keymaps = {
+							["ib"] = "@block.inner",
+							["ab"] = "@block.outer",
+						},
+					},
+				},
 			})
 		end,
 	},
diff --git a/scripts/aliases.sh b/scripts/aliases.sh
index 35a1304..41c21c1 100755
--- a/scripts/aliases.sh
+++ b/scripts/aliases.sh
@@ -50,8 +50,8 @@ alias pipr='pip install -r requirements.txt'
 # files
 alias cheat='$EDITOR $PERSONAL_PATH/resource/cheat_sheet.md'
 alias ideas='$EDITOR $HOME/dss/notes/content/ideas/README.md'
-alias inb='inbox'
 alias inbox='$EDITOR $PERSONAL_PATH/area/inbox/inbox.md'
+alias ibx='inbox'
 alias quotes='$EDITOR $PERSONAL_PATH/lists/quotes.md'
 alias someday='$EDITOR $PERSONAL_PATH/someday.md'
 

From 2d734dc6fa1d67fcd32e8046d611dc14f36d9e0c Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sat, 3 Jan 2026 01:05:07 +1300
Subject: [PATCH 14/20] feat

---
 nvim/lua/plugins/telescope.lua | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index a00613d..786c00c 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -21,6 +21,20 @@ return {
 				return
 			end
 			local actions = require("telescope.actions")
+			local action_state = require("telescope.actions.state")
+
+			-- Custom action to open all selected files
+			local function multi_open(prompt_bufnr)
+				local picker = action_state.get_current_picker(prompt_bufnr)
+				local multi = picker:get_multi_selection()
+				actions.select_default(prompt_bufnr)
+				for _, entry in pairs(multi) do
+					if entry.path ~= nil then
+						vim.cmd(string.format("edit %s", entry.path))
+					end
+				end
+			end
+
 			telescope.setup({
 				pickers = {
 					find_files = {
@@ -48,7 +62,7 @@ return {
 							["<C-c>"] = actions.close,
 							["<Down>"] = actions.move_selection_next,
 							["<Up>"] = actions.move_selection_previous,
-							["<CR>"] = actions.select_default,
+							["<CR>"] = multi_open,
 							["<C-x>"] = actions.select_horizontal,
 							["<C-v>"] = actions.select_vertical,
 							["<C-t>"] = actions.select_tab,
@@ -64,7 +78,7 @@ return {
 						},
 						n = {
 							["<esc>"] = actions.close,
-							["<CR>"] = actions.select_default,
+							["<CR>"] = multi_open,
 							["<C-x>"] = actions.select_horizontal,
 							["<C-v>"] = actions.select_vertical,
 							["<C-t>"] = actions.select_tab,

From a8ebd50ead54a2c803efe5344e327bb23edd8577 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sun, 18 Jan 2026 20:01:52 +1300
Subject: [PATCH 15/20] feat

---
 Makefile                          |  2 +-
 nix/flake.lock                    |  6 +++---
 nix/flake.nix                     |  2 ++
 nvim/lazy-lock.json               |  2 ++
 nvim/lua/config/command.lua       |  4 ++--
 nvim/lua/plugins/cmp.lua          |  5 +++++
 nvim/lua/plugins/telescope.lua    |  3 +++
 nvim/lua/plugins/text-editing.lua | 11 +++++++++++
 8 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ce21425..fc5d34c 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ setup-nix:
 
 NIX_ARGS=--extra-experimental-features nix-command --extra-experimental-features flakes
 nix-pkgs: setup-nix
-	. ./nix/load-"$(OS)".sh && cd nix && nix flake update "$(NIX_ARGS)" && nix profile install$(NIX_ARGS)
+	. ./nix/load-"$(OS)".sh && cd nix && nix flake update $(NIX_ARGS) && (nix profile upgrade $(NIX_ARGS) nix || nix profile install $(NIX_ARGS) .)
 
 .PHONY: setup-brew brew-pkgs
 
diff --git a/nix/flake.lock b/nix/flake.lock
index 8ea3304..28ab3b0 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766070988,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "lastModified": 1768127708,
+        "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
         "type": "github"
       },
       "original": {
diff --git a/nix/flake.nix b/nix/flake.nix
index 4d0022f..5788021 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -32,6 +32,8 @@
             entr
             findutils
             # fish
+            fd
+            csvlens
             flyctl
             gh
             git
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index d4b77bf..0895625 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -23,6 +23,7 @@
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "leap.nvim": { "branch": "main", "commit": "f19d43590c4b6d31188ee1ea2954d2b7558a9e11" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
   "mini.nvim": { "branch": "main", "commit": "b7231b65d15611a99168bc5a94a84cb8e4c85c21" },
   "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
@@ -43,6 +44,7 @@
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
   "telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
   "telescope-makefile": { "branch": "master", "commit": "f35425d7d53d92a04215c3714a5819811d2842c3" },
+  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "3d757e586ff0bfc85bdb7b46c9d3d932147a0cde" },
   "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
   "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
diff --git a/nvim/lua/config/command.lua b/nvim/lua/config/command.lua
index a7476d1..ecb7256 100644
--- a/nvim/lua/config/command.lua
+++ b/nvim/lua/config/command.lua
@@ -25,11 +25,11 @@ vim.cmd([[
 
 -- Search in personal notes
 local function searchPersonalNotes()
-	require("telescope.builtin").find_files({
+	require("telescope.builtin").find_files(require("telescope.themes").get_ivy({
 		prompt_title = "<Personal Notes>",
 		search_dirs = { "~/personal", "~/programming-resources" },
 		path_display = { "absolute" },
-	})
+	}))
 end
 _G.searchPersonalNotes = searchPersonalNotes
 -- :S
diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua
index e201796..8d600fc 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/nvim/lua/plugins/cmp.lua
@@ -198,6 +198,7 @@ return {
 				},
 				per_filetype = {
 					markdown = {
+						"obsidian",
 						"copilot",
 						"snippets",
 						"path",
@@ -282,6 +283,10 @@ return {
 						name = "Emoji",
 						score_offset = 1,
 					},
+					obsidian = {
+						name = "obsidian",
+						module = "blink.compat.source",
+					},
 				},
 			},
 		},
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index 786c00c..01c96c1 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -14,6 +14,7 @@ return {
 				"isak102/telescope-git-file-history.nvim",
 				dependencies = { "tpope/vim-fugitive" },
 			},
+			"nvim-telescope/telescope-ui-select.nvim",
 		},
 		config = function()
 			local status_ok, telescope = pcall(require, "telescope")
@@ -107,6 +108,8 @@ return {
 				extensions = {
 					fzf = {
 						fuzzy = true, -- false will only do exact matching
+						override_generic_sorter = true,
+						override_file_sorter = true,
 						case_mode = "smart_case", -- or "ignore_case" or "respect_case"
 					},
 					["ui-select"] = {
diff --git a/nvim/lua/plugins/text-editing.lua b/nvim/lua/plugins/text-editing.lua
index 474ca4a..37a3b8f 100644
--- a/nvim/lua/plugins/text-editing.lua
+++ b/nvim/lua/plugins/text-editing.lua
@@ -85,6 +85,17 @@ return {
 	{ "dhruvasagar/vim-table-mode" },
 	{ "dkarter/bullets.vim" },
 	{ "mzlogin/vim-markdown-toc" },
+	-- install with yarn or npm
+	{
+		"iamcco/markdown-preview.nvim",
+		cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
+		build = "cd app && yarn install",
+		init = function()
+			vim.g.mkdp_filetypes = { "markdown" }
+		end,
+		ft = { "markdown" },
+	},
+
 	--- Text editing - HTML
 	{ "alvan/vim-closetag" },
 	{ "Glench/Vim-Jinja2-Syntax" },

From 84f3cd09e8a1d3fe1870917b1bd10d20a35f6a4b Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Fri, 23 Jan 2026 14:04:26 +1300
Subject: [PATCH 16/20] feat

---
 nvim/lua/plugins/copilot.lua      | 7 ++++---
 nvim/lua/plugins/text-editing.lua | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nvim/lua/plugins/copilot.lua b/nvim/lua/plugins/copilot.lua
index 4381806..89e89ab 100644
--- a/nvim/lua/plugins/copilot.lua
+++ b/nvim/lua/plugins/copilot.lua
@@ -40,15 +40,16 @@ return {
 		opts = {
 			system_prompt = [[You are an expert software engineer.
 - Provide clear, concise explanations
-- Do not include comments unless necessary
+- Include comments only if necessary
+- Include functions only if necessary
 - Include docstrings
-- Any Python code should pass strict type checking]],
+- All Python code should pass strict type checking]],
 			debug = true,
 			context = "buffers",
 			history_path = vim.fn.stdpath("data") .. "/copilotchat_history",
 			auto_follow_cursor = false,
 			auto_insert_mode = true,
-			model = "gpt-4o-mini",
+			model = "gpt-4",
 		},
 	},
 }
diff --git a/nvim/lua/plugins/text-editing.lua b/nvim/lua/plugins/text-editing.lua
index 774361c..9816a21 100644
--- a/nvim/lua/plugins/text-editing.lua
+++ b/nvim/lua/plugins/text-editing.lua
@@ -1,5 +1,4 @@
 return {
-	{ "akinsho/git-conflict.nvim", version = "*", config = true },
 	{
 		"toppair/peek.nvim",
 		event = { "VeryLazy" },

From 3a955df99a7699bc3095a6c60f5ac204b79abd8f Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Fri, 23 Jan 2026 14:04:45 +1300
Subject: [PATCH 17/20] feat

---
 README.md         |  6 ++++++
 scripts/search.sh | 22 ++--------------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index f194c2b..0c8bb85 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,12 @@ Neovim config is in `./nvim`. To use the Neovim setup, put this folder into `$XD
 
 I use Lazy for package management in Neovim - it will install packages when you first open the editor.
 
+### Shell Customization
+
+The `s` command opens a fuzzy file finder (fzf) to search and open files in `$EDITOR`. Run `s` in any directory, or pass a path like `s ~/projects`. Supports multi-select with Tab.
+
+Lot's of aliases - see `scripts/aliases.sh`.
+
 ### Getting Kitty to Play Nice on macOS
 
 Had weird issue with the first execution of Kitty not loading the `kitty.conf` correctly - fixed with:
diff --git a/scripts/search.sh b/scripts/search.sh
index bf16655..e4997e7 100755
--- a/scripts/search.sh
+++ b/scripts/search.sh
@@ -3,30 +3,12 @@
 TERM_HEIGHT=$(tput lines)
 MIN_HEIGHT=20
 
-open_files_with_editor() {
-  if [ "$BASH_VERSION" != "" ]; then
-    # Bash-specific way to handle files
-    eval "$EDITOR" "$@"
-  elif [ "$ZSH_VERSION" != "" ]; then
-    # Zsh-specific way to handle array arguments
-    eval "$EDITOR" "@"
-  else
-    # Fallback for other POSIX-compliant shells
-    eval "$EDITOR" "$@"
-  fi
-}
-
 # Use provided directory or default to current directory
 target_dir="${1:-.}"
 cd "$target_dir" || exit
 
 if [ "$TERM_HEIGHT" -ge "$MIN_HEIGHT" ]; then
-  files=$(fzf --preview 'bat --style=numbers --color=always {}' --height 60% -m)
+  fzf --preview 'bat --style=numbers --color=always {}' --height 60% -m --print0 | xargs -0 $EDITOR
 else
-  files=$(fzf --no-preview --height 40% -m)
-fi
-
-if [ $? -eq 0 ]; then
-  # Open selected files with the preferred editor
-  open_files_with_editor "$(echo "$files" | tr '\n' ' ')"
+  fzf --no-preview --height 40% -m --print0 | xargs -0 $EDITOR
 fi

From 10fbada42971bdaf3c792230b0760030934d0703 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sun, 25 Jan 2026 22:51:02 +1300
Subject: [PATCH 18/20] feat

---
 dotfiles/.gitignore      | 1 +
 nvim/lua/plugins/cmp.lua | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dotfiles/.gitignore b/dotfiles/.gitignore
index cdaa328..a9ae31a 100644
--- a/dotfiles/.gitignore
+++ b/dotfiles/.gitignore
@@ -38,3 +38,4 @@ temp
 temp.*
 temp
 .databricks
+.venv
diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua
index 28cbf2a..6917534 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/nvim/lua/plugins/cmp.lua
@@ -23,7 +23,6 @@ return {
 		opts = {
 			snippets = { preset = "luasnip" },
 			fuzzy = { implementation = "prefer_rust_with_warning" },
-
 			keymap = {
 				["<Tab>"] = {
 					"select_next",
@@ -298,10 +297,10 @@ return {
 						name = "Emoji",
 						score_offset = 1,
 					},
-					obsidian = {
-						name = "obsidian",
-						module = "blink.compat.source",
-					},
+					-- obsidian = {
+					-- 	name = "obsidian",
+					-- 	module = "blink.compat.source",
+					-- },
 				},
 			},
 		},

From 94f6bd3a67476661127f1a2b6b5fb9a9d5575fd7 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Sat, 31 Jan 2026 00:38:23 +1300
Subject: [PATCH 19/20] feat

---
 nvim/lazy-lock.json               | 105 ++++++------------------------
 nvim/lua/plugins/cmp.lua          |   8 +--
 nvim/lua/plugins/text-editing.lua |   2 +-
 3 files changed, 24 insertions(+), 91 deletions(-)

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index deacea9..2705bb0 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -1,26 +1,24 @@
 {
-  "CopilotChat.nvim": { "branch": "main", "commit": "df5376c132382dd47e3e552612940cbf25b3580c" },
-  "LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" },
+  "CopilotChat.nvim": { "branch": "main", "commit": "a89f5f1162b04a0962e5f4c3cdf248a81e7e53cb" },
+  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
   "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
-  "barbar.nvim": { "branch": "master", "commit": "539d73def39c9172b4d4d769f14090e08f37b29d" },
+  "barbar.nvim": { "branch": "master", "commit": "807bede7ef1d8e2ac5f108e9ac8123b1e2d321e3" },
   "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
-  "blink-cmp-dictionary": { "branch": "master", "commit": "944b3b215b01303672d4213758db7c5c5a1e3c92" },
-  "blink-emoji.nvim": { "branch": "master", "commit": "066013e4c98a9318408ee3f1ca2dbcb6fa3e4c06" },
-  "blink-ripgrep.nvim": { "branch": "main", "commit": "b181a42925e5bec11030516124b0123c2a297abb" },
-  "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
+  "blink-cmp-dictionary": { "branch": "master", "commit": "5f1a703416e5090b9633c43873dba8ba03b0fb23" },
+  "blink-emoji.nvim": { "branch": "master", "commit": "a77aebc092ebece1eed108f301452ae774d6b67a" },
+  "blink-ripgrep.nvim": { "branch": "main", "commit": "56084d1f45c8621d23d4bac724c2dc50b1eb75db" },
+  "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
   "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
-  "bullets.vim": { "branch": "master", "commit": "89294b8930e660936374fb763ac48a1ac51dd29c" },
-  "conform.nvim": { "branch": "master", "commit": "328c2f1dda56f933d3337a1316e1020ba30ba6aa" },
+  "bullets.vim": { "branch": "master", "commit": "8f3259e807c40b91d247f612823295ab99777a65" },
+  "conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
   "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
-  "copilot.lua": { "branch": "master", "commit": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64" },
-  "dbtpal": { "branch": "main", "commit": "981eab51609362712c64e3cf3fb773fe11f859b9" },
+  "copilot.lua": { "branch": "master", "commit": "0a7502946845fb14b860a6384c709a791bbab96a" },
+  "dbtpal": { "branch": "main", "commit": "706134b879eb2f48b2abf56f29e95a30a52cf398" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "emmet-vim": { "branch": "master", "commit": "e98397144982d1e75b20d94d55a82de3ec8f648d" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
-  "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
+  "emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" },
+  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
+  "gitsigns.nvim": { "branch": "main", "commit": "17ab794b6fce6fce768430ebc925347e349e1d60" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-<<<<<<< HEAD
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "leap.nvim": { "branch": "main", "commit": "f19d43590c4b6d31188ee1ea2954d2b7558a9e11" },
   "lualine.nvim": { "branch": "master", "commit": "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3" },
@@ -29,25 +27,7 @@
   "mini.nvim": { "branch": "main", "commit": "e7538b549361c9ac8416a07b0223ce03c508bfe7" },
   "nvim-autopairs": { "branch": "master", "commit": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8" },
   "nvim-bqf": { "branch": "main", "commit": "e20417d5e589e03eaaaadc4687904528500608be" },
-||||||| 99ba32c
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lualine.nvim": { "branch": "master", "commit": "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3" },
-  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
-  "mini.nvim": { "branch": "main", "commit": "e7538b549361c9ac8416a07b0223ce03c508bfe7" },
-  "nvim-autopairs": { "branch": "master", "commit": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8" },
-  "nvim-bqf": { "branch": "main", "commit": "e20417d5e589e03eaaaadc4687904528500608be" },
-=======
-  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "leap.nvim": { "branch": "main", "commit": "f19d43590c4b6d31188ee1ea2954d2b7558a9e11" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
-  "mini.nvim": { "branch": "main", "commit": "b7231b65d15611a99168bc5a94a84cb8e4c85c21" },
-  "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
-  "nvim-bqf": { "branch": "main", "commit": "ba2b365969d7c2c6301d48e13aeee59568765529" },
->>>>>>> 204fef1e307c84bddae0b0e0618cd3fd5c973deb
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-<<<<<<< HEAD
   "nvim-lint": { "branch": "master", "commit": "5b1bdf306bd3e565908145279e8bbfc594dac3b3" },
   "nvim-lspconfig": { "branch": "master", "commit": "4ea9083b6d3dff4ddc6da17c51334c3255b7eba5" },
   "nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" },
@@ -55,30 +35,9 @@
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
   "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
-  "obsidian.nvim": { "branch": "main", "commit": "e0eb92c5afcacf5bf11e4735079a538fd1486ea9" },
-  "oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
-||||||| 99ba32c
-  "nvim-lint": { "branch": "master", "commit": "5b1bdf306bd3e565908145279e8bbfc594dac3b3" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4ea9083b6d3dff4ddc6da17c51334c3255b7eba5" },
-  "nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "439789a9a8df9639ecd749bb3286b77117024a6f" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
-  "obsidian.nvim": { "branch": "main", "commit": "e0eb92c5afcacf5bf11e4735079a538fd1486ea9" },
-  "oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
-=======
-  "nvim-lint": { "branch": "master", "commit": "7a64f4067065c16a355d40d0d599b8ca6b25de6d" },
-  "nvim-lspconfig": { "branch": "master", "commit": "c4f67bf85b01a57e3c130352c0a0e453ab8cd5b9" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
-  "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
   "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
-  "oil.nvim": { "branch": "master", "commit": "cbcb3f997f6f261c577b943ec94e4ef55108dd95" },
->>>>>>> 204fef1e307c84bddae0b0e0618cd3fd5c973deb
+  "oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
   "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
-<<<<<<< HEAD
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope-git-file-history.nvim": { "branch": "master", "commit": "c27d99ba88ec5f0b6d2b9f9bc67dd3d14c610b25" },
@@ -87,43 +46,17 @@
   "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
-||||||| 99ba32c
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
-  "telescope-git-file-history.nvim": { "branch": "master", "commit": "c27d99ba88ec5f0b6d2b9f9bc67dd3d14c610b25" },
-  "telescope-makefile": { "branch": "master", "commit": "6e5b5767751dbf73ad4f126840dcf1abfc38e891" },
-  "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
-  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
-=======
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "semshi": { "branch": "master", "commit": "7f18bedc70cbb7aa68dcc6df5e730d88e4527622" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
-  "telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
-  "telescope-makefile": { "branch": "master", "commit": "f35425d7d53d92a04215c3714a5819811d2842c3" },
-  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
-  "telescope.nvim": { "branch": "master", "commit": "3d757e586ff0bfc85bdb7b46c9d3d932147a0cde" },
-  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
-  "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
->>>>>>> 204fef1e307c84bddae0b0e0618cd3fd5c973deb
   "vim": { "branch": "master", "commit": "d4b0823100c702af127cba8dd5595a8f599041ec" },
-  "vim-argwrap": { "branch": "master", "commit": "03615d1eed248408567bc8fa6a5a8c94ef3cd170" },
+  "vim-argwrap": { "branch": "master", "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1" },
   "vim-bufkill": { "branch": "master", "commit": "3113181d0c1bfb8719f3ddcd2e2f35a8d763d1e5" },
   "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
-  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
+  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
   "vim-grepper": { "branch": "master", "commit": "acaaf32edaa11d82fb972d2af36b949ec3042928" },
-  "vim-markdown-toc": { "branch": "master", "commit": "66026b323379c9a712c6169cd43153216acef090" },
+  "vim-markdown-toc": { "branch": "master", "commit": "aa9cc3b07791db5cbe5f29d661763bc0eb4fb7c1" },
   "vim-one": { "branch": "master", "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24" },
   "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
-<<<<<<< HEAD
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
   "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
-||||||| 99ba32c
-  "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
-=======
-  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
-  "vim-table-mode": { "branch": "master", "commit": "bb025308a45c67c7c8f0763ba37bc2ee3f534df0" },
->>>>>>> 204fef1e307c84bddae0b0e0618cd3fd5c973deb
   "winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" },
-  "zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" }
+  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
 }
diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua
index 565f80a..817bea2 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/nvim/lua/plugins/cmp.lua
@@ -279,10 +279,10 @@ return {
 						name = "Emoji",
 						score_offset = 1,
 					},
-					-- obsidian = {
-					-- 	name = "obsidian",
-					-- 	module = "blink.compat.source",
-					-- },
+					obsidian = {
+						name = "obsidian",
+						module = "blink.compat.source",
+					},
 				},
 			},
 		},
diff --git a/nvim/lua/plugins/text-editing.lua b/nvim/lua/plugins/text-editing.lua
index 37a3b8f..6ecb5ad 100644
--- a/nvim/lua/plugins/text-editing.lua
+++ b/nvim/lua/plugins/text-editing.lua
@@ -8,7 +8,7 @@ return {
 			vim.keymap.set("n", "S", "<Plug>(leap-from-window)")
 		end,
 	},
-	{ "akinsho/git-conflict.nvim", version = "*", config = true },
+	-- { "akinsho/git-conflict.nvim", version = "*", config = true },
 	{
 		"toppair/peek.nvim",
 		event = { "VeryLazy" },

From 4ff66dc173805dac457059ff219d598cfaa29028 Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Wed, 4 Feb 2026 01:08:07 +1300
Subject: [PATCH 20/20] feat

---
 nvim/lua/plugins/cmp.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua
index 817bea2..7b555c7 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/nvim/lua/plugins/cmp.lua
@@ -34,6 +34,7 @@ return {
 						"accept",
 					},
 					["<CR>"] = {
+						"accept_and_enter",
 						"fallback",
 					},
 				},