From 9d6b6364208544bd5ab8c5572efc334a23931df6 Mon Sep 17 00:00:00 2001
From: sudacode <suda@sudacode.com>
Date: Sat, 3 May 2025 22:27:42 -0700
Subject: [PATCH] replace nvim submodule with real files

---
 .config/nvim                                  |   1 -
 .config/nvim/.gitignore                       |   6 +
 .config/nvim/init.lua                         |  16 +
 .config/nvim/lazy-lock.json                   |  65 ++
 .config/nvim/lua/core/autocmds.lua            |  76 +++
 .config/nvim/lua/core/highlights.lua          |  59 ++
 .config/nvim/lua/core/keymaps.lua             | 565 ++++++++++++++++++
 .config/nvim/lua/core/lazy.lua                |  62 ++
 .config/nvim/lua/core/lsp-notifications.lua   | 104 ++++
 .config/nvim/lua/core/options.lua             |  85 +++
 .config/nvim/lua/plugins/anyjump.lua          |   1 +
 .config/nvim/lua/plugins/bufferline.lua       | 100 ++++
 .config/nvim/lua/plugins/catppuccin.lua       |  56 ++
 .config/nvim/lua/plugins/codecompanion.lua    | 211 +++++++
 .../codecompanion/fidget-spinner-notify.lua   | 126 ++++
 .../plugins/codecompanion/fidget-spinner.lua  |  73 +++
 .config/nvim/lua/plugins/conform.lua          |   4 +
 .config/nvim/lua/plugins/copilot-cmp.lua      |   7 +
 .config/nvim/lua/plugins/copilot-lualine.lua  |   3 +
 .config/nvim/lua/plugins/copilot.lua          |  55 ++
 .config/nvim/lua/plugins/dashboard.lua        |  36 ++
 .config/nvim/lua/plugins/diffview.lua         |  27 +
 .config/nvim/lua/plugins/fidget.lua           | 101 ++++
 .config/nvim/lua/plugins/gitsigns.lua         |  50 ++
 .config/nvim/lua/plugins/goto-preview.lua     |   1 +
 .config/nvim/lua/plugins/image.lua            |  41 ++
 .../nvim/lua/plugins/indent-blanklines.lua    |  35 ++
 .config/nvim/lua/plugins/lazydev.lua          |  14 +
 .config/nvim/lua/plugins/lspconfig.lua        | 107 ++++
 .config/nvim/lua/plugins/lspkind.lua          |   1 +
 .config/nvim/lua/plugins/lualine.lua          |  90 +++
 .config/nvim/lua/plugins/luasnip.lua          |   7 +
 .config/nvim/lua/plugins/mcphub.lua           |  51 ++
 .config/nvim/lua/plugins/mini.lua             |  63 ++
 .config/nvim/lua/plugins/nio.lua              |   1 +
 .config/nvim/lua/plugins/noice.lua            |  93 +++
 .config/nvim/lua/plugins/none-ls.lua          |  73 +++
 .config/nvim/lua/plugins/notify.lua           |  20 +
 .config/nvim/lua/plugins/nui.lua              |   1 +
 .config/nvim/lua/plugins/nvim-autopairs.lua   |  26 +
 .config/nvim/lua/plugins/nvim-cmp.lua         | 263 ++++++++
 .config/nvim/lua/plugins/nvim-colorizer.lua   |   6 +
 .config/nvim/lua/plugins/nvim-lint.lua        |  34 ++
 .config/nvim/lua/plugins/nvim-tree.lua        |  11 +
 .../lua/plugins/nvim-treesitter-context.lua   |   1 +
 .config/nvim/lua/plugins/obsidian.lua         | 102 ++++
 .config/nvim/lua/plugins/odis.lua             |  52 ++
 .config/nvim/lua/plugins/plenary.lua          |   3 +
 .config/nvim/lua/plugins/presence.lua         |  25 +
 .../nvim/lua/plugins/rainbow-delimeters.lua   |  24 +
 .config/nvim/lua/plugins/render-markdown.lua  | 197 ++++++
 .config/nvim/lua/plugins/telescope-glyph.lua  |   5 +
 .config/nvim/lua/plugins/telescope.lua        | 123 ++++
 .config/nvim/lua/plugins/toggleterm.lua       |  85 +++
 .config/nvim/lua/plugins/treesitter.lua       |  48 ++
 .config/nvim/lua/plugins/vim-commentary.lua   |   1 +
 .config/nvim/lua/plugins/vim-wakatime.lua     |   1 +
 .config/nvim/lua/plugins/whichkey.lua         | 144 +++++
 .config/nvim/lua/utils/extensions/init.lua    |   3 +
 .../lua/utils/extensions/telescope/init.lua   |   7 +
 .config/nvim/lua/utils/git_paste/init.lua     |  57 ++
 .config/nvim/lua/utils/hyprland/lsp/init.lua  | 102 ++++
 .../keymaps/converters/from_table/init.lua    |  12 +
 .../keymaps/converters/whichkey/init.lua      |  48 ++
 .config/nvim/lua/utils/keymaps/init.lua       |   4 +
 .../nvim/lua/utils/telescope_extra/init.lua   |  68 +++
 .config/nvim/lua/utils/terminal/init.lua      |   6 +
 .../lua/utils/terminal/term_factory/init.lua  |  12 +
 .../nvim/lua/utils/terminal/toggle/init.lua   |   9 +
 .../treesitter/parsers/hyprlang/init.lua      |  15 +
 .gitmodules                                   |   3 -
 71 files changed, 3980 insertions(+), 4 deletions(-)
 delete mode 160000 .config/nvim
 create mode 100644 .config/nvim/.gitignore
 create mode 100644 .config/nvim/init.lua
 create mode 100644 .config/nvim/lazy-lock.json
 create mode 100644 .config/nvim/lua/core/autocmds.lua
 create mode 100644 .config/nvim/lua/core/highlights.lua
 create mode 100644 .config/nvim/lua/core/keymaps.lua
 create mode 100644 .config/nvim/lua/core/lazy.lua
 create mode 100644 .config/nvim/lua/core/lsp-notifications.lua
 create mode 100644 .config/nvim/lua/core/options.lua
 create mode 100644 .config/nvim/lua/plugins/anyjump.lua
 create mode 100644 .config/nvim/lua/plugins/bufferline.lua
 create mode 100644 .config/nvim/lua/plugins/catppuccin.lua
 create mode 100644 .config/nvim/lua/plugins/codecompanion.lua
 create mode 100644 .config/nvim/lua/plugins/codecompanion/fidget-spinner-notify.lua
 create mode 100644 .config/nvim/lua/plugins/codecompanion/fidget-spinner.lua
 create mode 100644 .config/nvim/lua/plugins/conform.lua
 create mode 100644 .config/nvim/lua/plugins/copilot-cmp.lua
 create mode 100644 .config/nvim/lua/plugins/copilot-lualine.lua
 create mode 100644 .config/nvim/lua/plugins/copilot.lua
 create mode 100644 .config/nvim/lua/plugins/dashboard.lua
 create mode 100644 .config/nvim/lua/plugins/diffview.lua
 create mode 100644 .config/nvim/lua/plugins/fidget.lua
 create mode 100644 .config/nvim/lua/plugins/gitsigns.lua
 create mode 100644 .config/nvim/lua/plugins/goto-preview.lua
 create mode 100644 .config/nvim/lua/plugins/image.lua
 create mode 100644 .config/nvim/lua/plugins/indent-blanklines.lua
 create mode 100644 .config/nvim/lua/plugins/lazydev.lua
 create mode 100644 .config/nvim/lua/plugins/lspconfig.lua
 create mode 100644 .config/nvim/lua/plugins/lspkind.lua
 create mode 100644 .config/nvim/lua/plugins/lualine.lua
 create mode 100644 .config/nvim/lua/plugins/luasnip.lua
 create mode 100644 .config/nvim/lua/plugins/mcphub.lua
 create mode 100644 .config/nvim/lua/plugins/mini.lua
 create mode 100644 .config/nvim/lua/plugins/nio.lua
 create mode 100644 .config/nvim/lua/plugins/noice.lua
 create mode 100644 .config/nvim/lua/plugins/none-ls.lua
 create mode 100644 .config/nvim/lua/plugins/notify.lua
 create mode 100644 .config/nvim/lua/plugins/nui.lua
 create mode 100644 .config/nvim/lua/plugins/nvim-autopairs.lua
 create mode 100644 .config/nvim/lua/plugins/nvim-cmp.lua
 create mode 100644 .config/nvim/lua/plugins/nvim-colorizer.lua
 create mode 100644 .config/nvim/lua/plugins/nvim-lint.lua
 create mode 100644 .config/nvim/lua/plugins/nvim-tree.lua
 create mode 100644 .config/nvim/lua/plugins/nvim-treesitter-context.lua
 create mode 100644 .config/nvim/lua/plugins/obsidian.lua
 create mode 100644 .config/nvim/lua/plugins/odis.lua
 create mode 100644 .config/nvim/lua/plugins/plenary.lua
 create mode 100644 .config/nvim/lua/plugins/presence.lua
 create mode 100644 .config/nvim/lua/plugins/rainbow-delimeters.lua
 create mode 100644 .config/nvim/lua/plugins/render-markdown.lua
 create mode 100644 .config/nvim/lua/plugins/telescope-glyph.lua
 create mode 100644 .config/nvim/lua/plugins/telescope.lua
 create mode 100644 .config/nvim/lua/plugins/toggleterm.lua
 create mode 100644 .config/nvim/lua/plugins/treesitter.lua
 create mode 100644 .config/nvim/lua/plugins/vim-commentary.lua
 create mode 100644 .config/nvim/lua/plugins/vim-wakatime.lua
 create mode 100644 .config/nvim/lua/plugins/whichkey.lua
 create mode 100644 .config/nvim/lua/utils/extensions/init.lua
 create mode 100644 .config/nvim/lua/utils/extensions/telescope/init.lua
 create mode 100644 .config/nvim/lua/utils/git_paste/init.lua
 create mode 100644 .config/nvim/lua/utils/hyprland/lsp/init.lua
 create mode 100644 .config/nvim/lua/utils/keymaps/converters/from_table/init.lua
 create mode 100644 .config/nvim/lua/utils/keymaps/converters/whichkey/init.lua
 create mode 100644 .config/nvim/lua/utils/keymaps/init.lua
 create mode 100644 .config/nvim/lua/utils/telescope_extra/init.lua
 create mode 100644 .config/nvim/lua/utils/terminal/init.lua
 create mode 100644 .config/nvim/lua/utils/terminal/term_factory/init.lua
 create mode 100644 .config/nvim/lua/utils/terminal/toggle/init.lua
 create mode 100644 .config/nvim/lua/utils/treesitter/parsers/hyprlang/init.lua

diff --git a/.config/nvim b/.config/nvim
deleted file mode 160000
index 9fa8ac6..0000000
--- a/.config/nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9fa8ac630cb7d66626f91806f9fd4244a649ed72
diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore
new file mode 100644
index 0000000..bb9f5fa
--- /dev/null
+++ b/.config/nvim/.gitignore
@@ -0,0 +1,6 @@
+plugin
+spell
+.git
+*.old
+.repro
+test
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
new file mode 100644
index 0000000..b5bb0ca
--- /dev/null
+++ b/.config/nvim/init.lua
@@ -0,0 +1,16 @@
+require("core.lazy")
+vim.cmd("colorscheme catppuccin")
+require("core.keymaps")
+-- require("core.lsp-notifications")
+require("utils.extensions")
+require("utils.telescope_extra").setup()
+require("utils.git_paste").setup({
+	telescope_key = "<leader>pg",
+})
+require("utils.treesitter.parsers.hyprlang")
+require("utils.hyprland.lsp")
+-- vim.notify = function(msg, level, opts)
+-- 	print("Notification debug:", msg, level, vim.inspect(opts))
+-- 	-- Call original notify
+-- 	require("notify")(msg, level, opts)
+-- end
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
new file mode 100644
index 0000000..a62ea2b
--- /dev/null
+++ b/.config/nvim/lazy-lock.json
@@ -0,0 +1,65 @@
+{
+  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
+  "any-jump.vim": { "branch": "master", "commit": "f95674d9a4251ac02f452d5f1861e4422f4652c7" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "catppuccin": { "branch": "main", "commit": "b7bbdf93b42866f166af98d39a2563eedb7cabac" },
+  "cmp-async-path": { "branch": "main", "commit": "0ed1492f59e730c366d261a5ad822fa37e44c325" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f94f7ba948e32cd302caba1c2ca3f7c697fb4fcf" },
+  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
+  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+  "codecompanion.nvim": { "branch": "main", "commit": "1235b1f2f64082ad4bc988d02f6b61d55067d379" },
+  "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
+  "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
+  "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" },
+  "copilot.lua": { "branch": "master", "commit": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0" },
+  "dashboard-nvim": { "branch": "master", "commit": "591b5b29e2f17b97496ec3179f6ecd08bb8502cc" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1796c7cedfe7e5dd20096c5d7b8b753d8f8d22eb" },
+  "goto-preview": { "branch": "main", "commit": "d1faf6ea992b5bcaaaf2c682e1aba3131a01143e" },
+  "image.nvim": { "branch": "master", "commit": "4c51d6202628b3b51e368152c053c3fb5c5f76f2" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
+  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
+  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
+  "mcphub.nvim": { "branch": "main", "commit": "32e48e411e42f4c70de1cdfdebda6e267619a2aa" },
+  "mini.diff": { "branch": "main", "commit": "7e268d0241255abaa07b8aa0ddff028f7315fe21" },
+  "mini.nvim": { "branch": "main", "commit": "ee23e1abc206efc6d6cce19ec8c0a3da7a897035" },
+  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
+  "none-ls.nvim": { "branch": "main", "commit": "7c493a266a6b1ed419f8a2e431651bc15b10df27" },
+  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
+  "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
+  "nvim-html-css": { "branch": "main", "commit": "23f53cbb8cf4ae7c302ba483ea8a28e5b03713a7" },
+  "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
+  "nvim-lspconfig": { "branch": "master", "commit": "1b801f68d09e70e59e6dd967b663b6d84ee3e87d" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
+  "nvim-tree.lua": { "branch": "master", "commit": "be5b788f2dc1522c73fb7afad9092331c8aebe80" },
+  "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "6daca3ad780f045550b820f262002f35175a6c04" },
+  "nvim-web-devicons": { "branch": "master", "commit": "2c2b4eafce6cdd0cb165036faa17396eff18f847" },
+  "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
+  "odis": { "branch": "master", "commit": "5176a07a729860d0c0cdefe96252fc7ff9e16d43" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "55ad4fb76ab68460f700599b7449385f0c4e858e" },
+  "render-markdown.nvim": { "branch": "main", "commit": "3484e3ec3831deacc28a5d1e3307693b8c997c6c" },
+  "telescope-color-names.nvim": { "branch": "main", "commit": "95b372b9a8ba0fc7cf6a67be637ee37453f322da" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "telescope-glyph.nvim": { "branch": "master", "commit": "f63f01e129e71cc25b79637610674bbf0be5ce9d" },
+  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
+  "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
+  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
+  "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
+  "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "vim-wakatime": { "branch": "master", "commit": "7b53ba7882ba28b91b571fa4ffb2755378086837" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+}
diff --git a/.config/nvim/lua/core/autocmds.lua b/.config/nvim/lua/core/autocmds.lua
new file mode 100644
index 0000000..fd6a600
--- /dev/null
+++ b/.config/nvim/lua/core/autocmds.lua
@@ -0,0 +1,76 @@
+local augroup = vim.api.nvim_create_augroup
+local autocmd = vim.api.nvim_create_autocmd
+
+-- {{{ Restore cursor position
+local restore_cursor = augroup("RestoreCursor", { clear = true })
+autocmd("BufReadPost", {
+	group = restore_cursor,
+	callback = function()
+		local mark = vim.api.nvim_buf_get_mark(0, '"')
+		local lcount = vim.api.nvim_buf_line_count(0)
+		if mark[1] > 0 and mark[1] <= lcount then
+			pcall(vim.api.nvim_win_set_cursor, 0, mark)
+		end
+	end,
+})
+-- }}}
+
+-- {{{ Open help and man in vertical split
+local help_config = augroup("HelpConfig", { clear = true })
+autocmd("FileType", {
+	group = help_config,
+	pattern = { "help", "man" },
+	command = "wincmd L",
+})
+-- }}}
+
+-- {{{ set term options
+local term_config = augroup("TermConfig", { clear = true })
+autocmd("TermOpen", {
+	group = term_config,
+	pattern = "*",
+	command = "setlocal nonumber norelativenumber",
+})
+-- }}}
+
+-- {{{ Highlight yanked text
+local highlight_yank = augroup("HighlightYank", { clear = true })
+autocmd("TextYankPost", {
+	group = highlight_yank,
+	pattern = "*",
+	callback = function()
+		vim.highlight.on_yank({ higroup = "IncSearch", timeout = 420 })
+	end,
+})
+-- }}}
+
+-- {{{ Disable indent-blankline for dashboard
+function disable_for_dashboard()
+	local buftype = vim.api.nvim_buf_get_option(0, "buftype")
+	local filetype = vim.api.nvim_buf_get_option(0, "filetype")
+	if buftype == "nofile" and filetype == "dashboard" then
+		vim.b.indent_blankline_enabled = false
+	end
+end
+vim.cmd([[
+    augroup IndentBlankline
+        autocmd!
+        autocmd FileType dashboard lua disable_for_dashboard()
+    augroup END
+]])
+-- }}}
+
+-- {{{ Code companion hook
+local group = augroup("CodeCompanionHooks", {})
+
+autocmd({ "User" }, {
+	pattern = "CodeCompanionInline*",
+	group = group,
+	callback = function(request)
+		if request.match == "CodeCompanionInlineFinished" then
+			-- Format the buffer after the inline request has completed
+			require("conform").format({ bufnr = request.buf })
+		end
+	end,
+})
+-- }}}
diff --git a/.config/nvim/lua/core/highlights.lua b/.config/nvim/lua/core/highlights.lua
new file mode 100644
index 0000000..2ec38e4
--- /dev/null
+++ b/.config/nvim/lua/core/highlights.lua
@@ -0,0 +1,59 @@
+-- gray
+vim.api.nvim_set_hl(0, "CmpItemAbbrDeprecated", { bg = "NONE", strikethrough = true, fg = "#808080" })
+-- blue
+vim.api.nvim_set_hl(0, "CmpItemAbbrMatch", { bg = "NONE", fg = "#569CD6" })
+vim.api.nvim_set_hl(0, "CmpItemAbbrMatchFuzzy", { link = "CmpIntemAbbrMatch" })
+-- light blue
+vim.api.nvim_set_hl(0, "CmpItemKindVariable", { bg = "NONE", fg = "#9CDCFE" })
+vim.api.nvim_set_hl(0, "CmpItemKindInterface", { link = "CmpItemKindVariable" })
+vim.api.nvim_set_hl(0, "CmpItemKindText", { link = "CmpItemKindVariable" })
+-- pink
+vim.api.nvim_set_hl(0, "CmpItemKindFunction", { bg = "NONE", fg = "#C586C0" })
+vim.api.nvim_set_hl(0, "CmpItemKindMethod", { link = "CmpItemKindFunction" })
+-- front
+vim.api.nvim_set_hl(0, "CmpItemKindKeyword", { bg = "NONE", fg = "#D4D4D4" })
+vim.api.nvim_set_hl(0, "CmpItemKindProperty", { link = "CmpItemKindKeyword" })
+vim.api.nvim_set_hl(0, "CmpItemKindUnit", { link = "CmpItemKindKeyword" })
+
+-- Customization for Pmenu
+vim.api.nvim_set_hl(0, "PmenuSel", { bg = "#282C34", fg = "NONE" })
+vim.api.nvim_set_hl(0, "Pmenu", { fg = "#C5CDD9", bg = "#22252A" })
+
+vim.api.nvim_set_hl(0, "CmpItemAbbrDeprecated", { fg = "#7E8294", bg = "NONE", strikethrough = true })
+vim.api.nvim_set_hl(0, "CmpItemAbbrMatch", { fg = "#82AAFF", bg = "NONE", bold = true })
+vim.api.nvim_set_hl(0, "CmpItemAbbrMatchFuzzy", { fg = "#82AAFF", bg = "NONE", bold = true })
+vim.api.nvim_set_hl(0, "CmpItemMenu", { fg = "#C792EA", bg = "NONE", italic = true })
+
+vim.api.nvim_set_hl(0, "CmpItemKindField", { fg = "#EED8DA", bg = "#B5585F" })
+vim.api.nvim_set_hl(0, "CmpItemKindProperty", { fg = "#EED8DA", bg = "#B5585F" })
+vim.api.nvim_set_hl(0, "CmpItemKindEvent", { fg = "#EED8DA", bg = "#B5585F" })
+
+vim.api.nvim_set_hl(0, "CmpItemKindText", { fg = "#C3E88D", bg = "#9FBD73" })
+vim.api.nvim_set_hl(0, "CmpItemKindEnum", { fg = "#C3E88D", bg = "#9FBD73" })
+vim.api.nvim_set_hl(0, "CmpItemKindKeyword", { fg = "#C3E88D", bg = "#9FBD73" })
+
+vim.api.nvim_set_hl(0, "CmpItemKindConstant", { fg = "#FFE082", bg = "#D4BB6C" })
+vim.api.nvim_set_hl(0, "CmpItemKindConstructor", { fg = "#FFE082", bg = "#D4BB6C" })
+vim.api.nvim_set_hl(0, "CmpItemKindReference", { fg = "#FFE082", bg = "#D4BB6C" })
+
+vim.api.nvim_set_hl(0, "CmpItemKindFunction", { fg = "#EADFF0", bg = "#A377BF" })
+vim.api.nvim_set_hl(0, "CmpItemKindStruct", { fg = "#EADFF0", bg = "#A377BF" })
+vim.api.nvim_set_hl(0, "CmpItemKindClass", { fg = "#EADFF0", bg = "#A377BF" })
+vim.api.nvim_set_hl(0, "CmpItemKindModule", { fg = "#EADFF0", bg = "#A377BF" })
+vim.api.nvim_set_hl(0, "CmpItemKindOperator", { fg = "#EADFF0", bg = "#A377BF" })
+
+vim.api.nvim_set_hl(0, "CmpItemKindVariable", { fg = "#C5CDD9", bg = "#7E8294" })
+vim.api.nvim_set_hl(0, "CmpItemKindFile", { fg = "#C5CDD9", bg = "#7E8294" })
+
+vim.api.nvim_set_hl(0, "CmpItemKindUnit", { fg = "#F5EBD9", bg = "#D4A959" })
+vim.api.nvim_set_hl(0, "CmpItemKindSnippet", { fg = "#F5EBD9", bg = "#D4A959" })
+vim.api.nvim_set_hl(0, "CmpItemKindFolder", { fg = "#F5EBD9", bg = "#D4A959" })
+
+vim.api.nvim_set_hl(0, "CmpItemKindMethod", { fg = "#DDE5F5", bg = "#6C8ED4" })
+vim.api.nvim_set_hl(0, "CmpItemKindValue", { fg = "#DDE5F5", bg = "#6C8ED4" })
+vim.api.nvim_set_hl(0, "CmpItemKindEnumMember", { fg = "#DDE5F5", bg = "#6C8ED4" })
+
+vim.api.nvim_set_hl(0, "CmpItemKindInterface", { fg = "#D8EEEB", bg = "#58B5A8" })
+vim.api.nvim_set_hl(0, "CmpItemKindColor", { fg = "#D8EEEB", bg = "#58B5A8" })
+vim.api.nvim_set_hl(0, "CmpItemKindTypeParameter", { fg = "#D8EEEB", bg = "#58B5A8" })
+vim.api.nvim_set_hl(0, "CmpItemKindCopilot", { fg = "#6CC644", bg = "#181926" })
diff --git a/.config/nvim/lua/core/keymaps.lua b/.config/nvim/lua/core/keymaps.lua
new file mode 100644
index 0000000..0089494
--- /dev/null
+++ b/.config/nvim/lua/core/keymaps.lua
@@ -0,0 +1,565 @@
+local map = vim.keymap.set
+local term = require("utils.terminal")
+local map_from_table = require("utils.keymaps.converters.from_table").set_keybindings
+local add_to_whichkey = require("utils.keymaps.converters.whichkey").addToWhichKey
+local term_factory = term.term_factory
+local term_toggle = term.term_toggle
+
+local opts = { silent = true, noremap = true }
+local nosilent = { noremap = true }
+
+-- Leader key
+vim.g.mapleader = " "
+vim.g.maplocalleader = ","
+
+-- Custom commands
+vim.api.nvim_create_user_command("Config", "edit ~/.config/nvim", {})
+vim.api.nvim_create_user_command("Keymaps", "edit ~/.config/nvim/lua/core/keymaps.lua", {})
+vim.api.nvim_create_user_command("Hypr", "edit ~/.config/hypr/hyprland.conf", {})
+
+-- {{{ Basic Mappings
+local basic_mappings = {
+	{ key = "<C-u>", cmd = "<C-u>zz", desc = "Scroll up and center", mode = "n" },
+	{ key = "n", cmd = "nzzzv", desc = "Next search result and center", mode = "n" },
+	{ key = "N", cmd = "Nzzzv", desc = "Previous search result and center", mode = "n" },
+	{ key = "<leader>p", cmd = '"_dP', desc = "Paste without yanking", mode = "x", group = "Paste in place" },
+	{ key = "<", cmd = "<gv", desc = "Reselect after indent", mode = "v" },
+	{ key = ">", cmd = ">gv", desc = "Reselect after indent", mode = "v" },
+	{ key = "J", cmd = ":m '>+1<CR>gv=gv", desc = "Move line down", mode = "v" },
+	{ key = "K", cmd = ":m '<-2<CR>gv=gv", desc = "Move line up", mode = "v" },
+}
+--}}}
+
+--{{{ Buffer Navigation Mappings
+local buffer_navigation_mappings = {
+	{ key = "<C-J>", cmd = ":bnext<CR>", desc = "Next buffer", mode = "n" },
+	{ key = "<C-K>", cmd = ":bprev<CR>", desc = "Previous buffer", mode = "n" },
+	{ key = "<leader>bb", cmd = ":Telescope buffers<CR>", desc = "List buffers", mode = "n", group = "Buffers" },
+	{ key = "<leader>bk", cmd = ":bdelete<CR>", desc = "Delete buffer", mode = "n", group = "Buffers" },
+	{ key = "<leader>bn", cmd = ":bnext<CR>", desc = "Next buffer", mode = "n", group = "Buffers" },
+	{ key = "<leader>bp", cmd = ":bprev<CR>", desc = "Previous buffer", mode = "n", group = "Buffers" },
+}
+--}}}
+
+--{{{ Terminal Mappings
+local terminal_mappings = {
+	-- {
+	-- 	key = "op",
+	-- 	cmd = "<C-\\><C-N>:ToggleTerm name=ipython",
+	-- 	desc = "Open IPython",
+	-- 	mode = "v",
+	-- 	group = "Open",
+	-- },
+	-- {
+	-- 	key = "oP",
+	-- 	cmd = "<C-\\><C-N>:ToggleTerm name=ipython-full",
+	-- 	desc = "Open full IPython",
+	-- 	mode = "v",
+	-- 	group = "Open",
+	-- },
+	{
+		key = "<C-T>",
+		cmd = ":ToggleTerm name=toggleterm<CR>",
+		desc = "Toggle terminal",
+		mode = "n",
+	},
+	{
+		key = "<leader>tt",
+		cmd = ":ToggleTerm name=toggleterm<CR>",
+		desc = "Toggle terminal",
+		mode = "n",
+		group = "Toggle",
+	},
+	{
+		key = "<leader>tT",
+		cmd = ":ToggleTerm name=toggleterm-full direction=tab<CR>",
+		desc = "Toggle full terminal",
+		mode = "n",
+		group = "Toggle",
+	},
+	{
+		key = "<leader>ot",
+		cmd = ":ToggleTerm name=toggleterm<CR>",
+		desc = "Open terminal",
+		mode = "n",
+		group = "Open",
+	},
+	{
+		key = "<leader>oT",
+		cmd = ":ToggleTerm name=toggleterm-full direction=tab<CR>",
+		desc = "Open full terminal",
+		mode = "n",
+		group = "Open",
+	},
+	{
+		key = "<leader>ts",
+		cmd = ":TermSelect<CR>",
+		desc = "Select terminal",
+		mode = "n",
+		group = "Terminal",
+	},
+	{
+		key = "<leader>tv",
+		cmd = ":ToggleTerm direction=vertical name=toggleterm-vert<CR>",
+		desc = "Toggle vertical terminal",
+		mode = "n",
+		group = "Terminal",
+	},
+	{
+		key = "<leader>th",
+		cmd = ":ToggleTerm direction=horizontal name=toggleterm-hori<CR>",
+		desc = "Toggle horizontal terminal",
+		mode = "n",
+		group = "Terminal",
+	},
+	{
+		key = "<leader>ov",
+		cmd = ":ToggleTerm direction=vertical name=toggleterm-vert<CR>",
+		desc = "Open vertical terminal",
+		mode = "n",
+		group = "Open",
+	},
+	{
+		key = "<leader>oh",
+		cmd = ":ToggleTerm direction=horizontal name=toggleterm-hori<CR>",
+		desc = "Open horizontal terminal",
+		mode = "n",
+		group = "Open",
+	},
+	{
+		key = "<leader>tf",
+		cmd = ":ToggleTerm name=toggleterm<CR>",
+		desc = "Toggle terminal",
+		mode = "n",
+		group = "Terminal",
+	},
+	{
+		key = "<leader>-",
+		cmd = ":ToggleTerm direction='horizontal'<CR>",
+		desc = "Toggle horizontal terminal",
+		mode = "n",
+		group = "Horizontal Terminal",
+	},
+	{
+		key = "<leader>|",
+		cmd = ":ToggleTerm direction='vertical'<CR>",
+		desc = "Toggle vertical terminal",
+		mode = "n",
+		group = "Vertical Terminal",
+	},
+}
+--}}}
+
+-- {{{ LSP Mappings
+local lsp_mappings = {
+	{ mode = "n", key = "gA", cmd = vim.lsp.buf.code_action, group = "Code Action" },
+	{ mode = "n", key = "gd", cmd = ":Telescope lsp_definitions<CR>", group = "LSP Definitions" },
+	{ mode = "n", key = "gDc", cmd = ":Telescope lsp_implementations<CR>", group = "LSP Implementations" },
+	{ mode = "n", key = "gDf", cmd = ":Telescope lsp_definitions<CR>", group = "LSP Definitions" },
+	{ mode = "n", key = "gF", cmd = ":edit <cfile><CR>", group = "Edit File" },
+	{ mode = "n", key = "gT", cmd = ":Telescope lsp_type_definitions<CR>", group = "LSP Type Definitions" },
+	{ mode = "n", key = "gb", cmd = ":Gitsigns blame_line<CR>", group = "Git Blame" },
+	{ mode = "n", key = "gi", cmd = ":Telescope lsp_implementations<CR>", group = "Telescope Implementations" },
+	{ mode = "n", key = "gj", cmd = ":Telescope jumplist<CR>", group = "Telescope Jumplist" },
+	{ mode = "n", key = "gr", cmd = ":Telescope lsp_references<CR>", goup = "LSP References" },
+	{ mode = "n", key = "gs", cmd = vim.lsp.buf.signature_help },
+	-- { mode = "n", key = "K", cmd = vim.lsp.buf.hover },
+	{ mode = "n", key = "<leader>ca", cmd = vim.lsp.buf.code_action, group = "Code" },
+	{ mode = "n", key = "<leader>ch", cmd = ":lua vim.lsp.buf.signature_help()<CR>", group = "Signature Help" },
+	{ mode = "n", key = "<leader>cR", cmd = ":lua vim.lsp.buf.rename()<CR>", group = "Rename" },
+	{ mode = "n", key = "<leader>cr", cmd = ":Telescope lsp_references<CR>", group = "LSP References" },
+	{ mode = "n", key = "<leader>cs", cmd = ":Telescope lsp_document_symbols<CR>", group = "LsP Document Symbols" },
+	{ mode = "n", key = "<leader>ct", cmd = ":Telescope lsp_type_definitions<CR>", group = "LSP Definitions" },
+	{
+		mode = "n",
+		key = "<leader>cw",
+		cmd = ":Telescope lsp_dynamic_workspace_symbols<CR>",
+		group = "LSP Workspace Symbols",
+	},
+	{ mode = "n", key = "<leader>ci", cmd = ":Telescope lsp_implementations<CR>", group = "LSP Implementations" },
+	{ mode = "n", key = "<leader>cci", cmd = ":Telescope lsp_incoming_calls<CR>", group = "LSP Incoming Calls" },
+	{ mode = "n", key = "<leader>cco", cmd = ":Telescope lsp_outgoing_calls<CR>", group = "LSP Outgoing Calls" },
+	{
+		mode = "n",
+		key = "<leader>cd",
+		cmd = ":Telescope diagnostics theme=dropdown layout_config={width=0.8}<CR>",
+		group = "Telecope Diagnostics",
+	},
+	{
+		mode = "n",
+		key = "<leader>cDs",
+		cmd = ":Telescope diagnostics theme=dropdown layout_config={width=0.8}<CR>",
+		group = "Telecope Diagnostics",
+	},
+	{ mode = "n", key = "<leader>cDn", cmd = ":lua vim.diagnostic.goto_next()<CR>", group = "Goto Next Preview" },
+	{
+		mode = "n",
+		key = "<leader>cDp",
+		cmd = ":lua vim.diagnostic.goto_prev()<CR<CR>",
+		group = "Goto Previous Preview",
+	},
+	{ mode = "n", key = "<leader>cl", cmd = ":lua vim.diagnostic.setloclist()<CR>", group = "Set Loclist" },
+}
+-- }}}
+
+-- {{{ Code Companion Mappings
+local code_companion_mappings = {
+	{ mode = "n", key = "<leader>cp", cmd = ":vert Copilot panel<CR>", group = "Code" },
+	{ mode = "n", key = "<leader>oc", cmd = ":CodeCompanionChat Toggle<CR>", group = "Open" },
+	{ mode = "n", key = "<leader>Cc", cmd = ":CodeCompanionChat Toggle<CR>", group = "CodeCompanionChat" },
+	{ mode = "n", key = "<leader>Ci", cmd = ":CodeCompanion ", group = "Inline CodeCompanion", opts = nosilent },
+	{ mode = "n", key = "<leader>CT", cmd = ":CodeCompanionChat Toggle<CR>", group = "CodeCompanion Toggle" },
+	{ mode = "n", key = "<leader>Ca", cmd = ":CodeCompanionActions<CR>", group = "CodeCompanion Actions" },
+	{ mode = "v", key = "<leader>Cc", cmd = ":CodeCompanionChat Add<CR>", group = "CodeCompanion Add" },
+	{
+		mode = "v",
+		key = "<leader>Ci",
+		cmd = ":CodeCompanion #buffer ",
+		group = "CodeCompanion #buffer",
+		opts = nosilent,
+	},
+	{ mode = "v", key = "<leader>Ce", cmd = ":CodeCompanion /explain<CR>", group = "CodeCompanion /explain" },
+	{ mode = "v", key = "<leader>Cf", cmd = ":CodeCompanion /fix<CR>", group = "CodeCompanion /fix" },
+	{ mode = "v", key = "<leader>Cl", cmd = ":CodeCompanion /lsp<CR>", group = "CodeCompanion /lsp" },
+	{ mode = "v", key = "<leader>Ct", cmd = ":CodeCompanion /tests<CR>", group = "CodeCompanion /tests" },
+}
+-- }}}
+
+-- {{{ Telescope mappings
+local telescope_mappings = {
+	{
+		mode = "n",
+		key = "//",
+		cmd = ":Telescope current_buffer_fuzzy_find previewer=false<CR>",
+		"Current buffer fuzzy find",
+	},
+	{
+		mode = "n",
+		key = "??",
+		cmd = ":Telescope lsp_document_symbols theme=dropdown layout_config={width=0.5}<CR>",
+		group = "Lsp document symbols",
+	},
+	{
+		mode = "n",
+		key = "<leader>fc",
+		cmd = ':Telescope color_names theme=dropdown layout_config={width=0.45,height=25,prompt_position="bottom"} layout_strategy=vertical<CR>',
+		group = "Telescope color names",
+	},
+	{
+		mode = "n",
+		key = "<leader>Tc",
+		cmd = ":Telescope colorscheme<CR>",
+		group = "Telescope colorscheme",
+	},
+	{
+		mode = "n",
+		key = "<leader>TC",
+		cmd = ':Telescope color_names theme=dropdown layout_config={width=0.45,height=25,prompt_position="bottom"} layout_strategy=vertical<CR>',
+		group = "Telescope color names",
+	},
+	{
+		mode = "n",
+		key = "<leader>Tn",
+		cmd = ":Telescope notify theme=dropdown layout_config={width=0.75}<CR>",
+		group = "Telescope notify",
+	},
+	{
+		mode = "n",
+		key = "<leader>TN",
+		cmd = ":Telescope noice theme=dropdown layout_config={width=0.75}<CR>",
+		group = "Telescope Noice",
+	},
+	{
+		mode = "n",
+		key = "<leader>ff",
+		cmd = ":Telescope find_files find_command=rg,--ignore,--follow,--hidden,--files prompt_prefix=🔍<CR>",
+		group = "Find files",
+	},
+	{ mode = "n", key = "<leader>fg", cmd = ":Telescope live_grep<CR>", group = "Live Grep" },
+	{
+		mode = "n",
+		key = "<leader>Tg",
+		cmd = ':Telescope glyph theme=dropdown layout_config={width=0.45,height=35,prompt_position="bottom"} layout_strategy=vertical<CR>',
+		group = "Telescope Glyph",
+	},
+	{
+		mode = "n",
+		key = "<leader>fG",
+		cmd = ':Telescope glyph theme=dropdown layout_config={width=0.45,height=35,prompt_position="bottom"} layout_strategy=vertical<CR>',
+		group = "Glhph",
+	},
+	{ mode = "n", key = "<leader>fb", cmd = ":Telescope file_browser<CR>", group = "File browser" },
+	{
+		mode = "n",
+		key = "<leader>fr",
+		cmd = ":Telescope oldfiles theme=dropdown layout_config={width=0.5}<CR>",
+		group = "Oldfiles",
+	},
+	{
+		mode = "n",
+		key = "<leader>hc",
+		cmd = ":Telescope commands<CR>",
+		group = "Commands",
+	},
+	{
+		mode = "n",
+		key = "<leader>hv",
+		cmd = ":Telescope vim_options<CR>",
+		group = "Vim options",
+	},
+	{
+		mode = "n",
+		key = "<leader>hk",
+		cmd = ":Telescope keymaps<CR>",
+		group = "Keymaps",
+	},
+	{
+		mode = "n",
+		key = "<leader>hs",
+		cmd = ":Telescope spell_suggest<CR>",
+		group = "Spell suggest",
+	},
+	{
+		mode = "n",
+		key = "<leader>ht",
+		cmd = ":Telescope help_tags<CR>",
+		group = "Help tags",
+	},
+	{
+		mode = "n",
+		key = "<leader>hm",
+		cmd = ":Telescope man_pages theme=dropdown layout_config={width=0.75}<CR>",
+		group = "Man pages",
+	},
+	{
+		mode = "n",
+		key = "<leader>sf",
+		cmd = ":Telescope find_files find_command=rg,--ignore,--follow,--hidden,--files prompt_prefix=🔍<CR>",
+		group = "Search files",
+	},
+	{ mode = "n", key = "<leader>sF", cmd = ":Telescope fidget<CR>", group = "Fidget" },
+	{ mode = "n", key = "<leader>sg", cmd = ":Telescope live_grep<CR>", group = "Live grep" },
+	{ mode = "n", key = "<leader>sh", cmd = ":Telescope command_history<CR>", group = "Command history" },
+	{ mode = "n", key = "<leader>sm", cmd = ":Telescope man_pages<CR>", group = "Man pages" },
+	{ mode = "n", key = "<leader>s/", cmd = ":Telescope search_history<CR>", group = "Search history" },
+	{ mode = "n", key = "<leader>gc", cmd = ":Telescope git_commits<CR>", group = "Git commits" },
+	{ mode = "n", key = "<leader>gf", cmd = ":Telescope git_files<CR>", group = "Git files" },
+	{ mode = "n", key = "<leader>Tr", cmd = ":Telescope reloader<CR>", group = "Telescope reloader" },
+}
+--}}}
+
+-- {{{ File Explorer Mappings (i guess)
+local file_explorer_mappings = {
+	{ mode = "n", key = "<leader>nt", cmd = ":NvimTreeToggle<CR>" },
+	{ mode = "n", key = "<leader>nc", cmd = ":lua require('notify').dismiss()<CR>" },
+	{ mode = "n", key = "<leader>D", cmd = ":Dotenv .env<CR>", group = "Dotenv" },
+}
+-- }}}
+
+-- {{{ Misc Utilities Mappings
+local misc_utilities_mappings = {
+	{ mode = "n", key = "<leader>x", cmd = "<cmd>!chmod +x %<CR>", group = "Make Executable" },
+	{ mode = "n", key = "<leader>y", cmd = '"+', group = "System Yank" },
+	{ mode = "v", key = "<leader>y", cmd = '"+', group = "System Yank" },
+	{ mode = "n", key = "<leader>sc", cmd = ":nohls<CR>", group = "Search" },
+}
+-- }}}
+
+-- {{{ Goto Preview Mappings
+local goto_preview_mappings = {
+	{ mode = "n", key = "gpc", cmd = ':lua require("goto-preview").close_all_win()<CR>', group = "Goto Preview" },
+	{
+		mode = "n",
+		key = "gpd",
+		cmd = ':lua require("goto-preview").goto_preview_definition()<CR>',
+		group = "Goto Preview",
+	},
+	{
+		mode = "n",
+		key = "gpi",
+		cmd = ':lua require("goto-preview").goto_preview_implementation()<CR>',
+		group = "Goto Preview",
+	},
+}
+-- }}}
+
+-- {{{ Workspace Management Mappings
+local workspace_management_mappings = {
+	{ mode = "n", key = "<leader>wa", cmd = vim.lsp.buf.add_workspace_folder },
+	{ mode = "n", key = "<leader>wr", cmd = vim.lsp.buf.remove_workspace_folder },
+	{
+		mode = "n",
+		key = "<leader>wl",
+		cmd = function()
+			print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+		end,
+	},
+}
+-- }}}
+
+-- {{{ Noice Mappings
+local noice_mappings = {
+	{ mode = "n", key = "<leader>Nh", cmd = ":Noice telescope<CR>", group = "Noice" },
+	{ mode = "n", key = "<leader>Nl", cmd = ":Noice last<CR>", group = "Noice" },
+	{ mode = "n", key = "<leader>Nd", cmd = ":Noice dismiss<CR>", group = "Noice" },
+	{ mode = "n", key = "<leader>Ne", cmd = ":Noice errors<CR>", group = "Noice" },
+	{ mode = "n", key = "<leader>Ns", cmd = ":Noice stats<CR>", group = "Noice" },
+}
+-- }}}
+
+-- {{{ ODIS Mappings
+local odis_mappings = {
+	{
+		mode = "n",
+		key = "<leader>dv",
+		cmd = ':lua require("odis").show_documentation("vsplit")<CR>',
+		group = "Vertical split",
+	},
+	{ mode = "n", key = "<leader>dh", cmd = ':lua require("odis").show_documentation("split")<CR>', group = "Split" },
+	{ mode = "n", key = "<leader>db", cmd = ':lua require("odis").show_documentation("buffer")<CR>', group = "Buffer" },
+	{ mode = "n", key = "<leader>dt", cmd = ':lua require("odis").show_documentation("tab")<CR>', group = "Tab" },
+	{ mode = "n", key = "<leader>df", cmd = ':lua require("odis").show_documentation("float")<CR>', group = "Float" },
+}
+-- }}}
+
+-- {{{ Diffview Mappings
+local diffview_mappings = {
+	{
+
+		mode = "n",
+		key = "<leader>gdo",
+		cmd = ":DiffviewOpen<CR>",
+		group = "DiffviewOpen",
+	},
+	{
+
+		mode = "n",
+		key = "<leader>gdf",
+		cmd = ":DiffviewFileHistory %<CR>",
+		group = "Git",
+	},
+	{
+
+		mode = "n",
+		key = "<leader>gdh",
+		cmd = ":DiffviewHistory<CR>",
+		group = "Git",
+	},
+	{
+
+		mode = "n",
+		key = "<leader>gdc",
+		cmd = ":DiffviewClose<CR>",
+		group = "Git",
+	},
+	{
+
+		mode = "n",
+		key = "<leader>gdt",
+		cmd = ":DiffviewToggleFiles<CR>",
+		group = "Git",
+		desc = "Toggle files view",
+	},
+	{
+
+		mode = "n",
+		key = "<leader>gdr",
+		cmd = ":DiffviewRefresh<CR>",
+		desc = "Refresh diffview",
+		group = "Git",
+	},
+}
+-- }}}
+
+--{{{ Custom Terminals
+local programs_map = {
+	gg = { cmd = "lazygit", display_name = "lazygit", direction = "tab", hidden = true, group = "Lazygit" },
+	op = { cmd = "ipython", display_name = "ipython", direction = "vertical", hidden = true, group = "Ipython" },
+	oP = {
+		cmd = "ipython",
+		display_name = "ipython-full",
+		direction = "tab",
+		hidden = true,
+		group = "Ipython Fullscreen",
+	},
+	oi = { cmd = "sudo iotop", display_name = "ncmpcpp", direction = "tab", hidden = true, group = "Ncmpcpp" },
+	on = { cmd = "ncmpcpp", display_name = "ncmpcpp", direction = "tab", hidden = true, group = "Ncmpcpp" },
+	oN = { cmd = "nvtop", display_name = "nvtop", direction = "tab", hidden = true, group = "Nvtop" },
+	ob = { cmd = "/usr/bin/btop", display_name = "btop", direction = "tab", hidden = true, group = "Btop" },
+	od = { cmd = "lazydocker", display_name = "lazydocker", direction = "tab", hidden = true, group = "Lazydocker" },
+}
+
+for key, value in pairs(programs_map) do
+	map("n", "<leader>" .. key, function()
+		term_toggle(term_factory(value))
+	end, opts)
+end
+
+local tbl = {}
+for key, value in pairs(programs_map) do
+	local temp = {
+		cmd = value.cmd,
+		key = "<leader>" .. key,
+		group = value.group,
+		mode = "n",
+		desc = "Open " .. value.display_name,
+	}
+	table.insert(tbl, temp)
+end
+add_to_whichkey(tbl, { key = "<leader>o", group = "Open" })
+
+function _G.set_terminal_keymaps()
+	local opts = { buffer = 0 }
+	map("t", "<esc>", [[<C-\><C-n>]], opts)
+	map("t", "<C-w>", [[<C-\><C-n><C-w>]], opts)
+end
+
+vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()")
+--}}}
+
+--{{{ Groups
+add_to_whichkey(nil, { key = "<leader>a", group = "AnyJump" })
+add_to_whichkey(nil, { key = "<leader>b", group = "Buffers" })
+add_to_whichkey(nil, { key = "<leader>c", group = "Code" })
+add_to_whichkey(nil, { key = "<leader>ca", group = "Code Actions" })
+add_to_whichkey(nil, { key = "<leader>C", group = "CodeCompanion" })
+add_to_whichkey(nil, { key = "<leader>d", group = "ODIS" })
+add_to_whichkey(nil, { key = "<leader>f", group = "Find" })
+add_to_whichkey(nil, { key = "<leader>g", group = "Git" })
+add_to_whichkey(nil, { key = "<leader>gd", group = "DiffView" })
+add_to_whichkey(nil, { key = "<leader>gg", group = "Lazygit" })
+add_to_whichkey(nil, { key = "<leader>h", group = "Help" })
+add_to_whichkey(nil, { key = "<leader>j", group = "AnyJump" })
+add_to_whichkey(nil, { key = "<leader>N", group = "Noice" })
+-- add_to_whichkey(nil, { key = "<leader>o", group = "Open" })
+add_to_whichkey(nil, { key = "<leader>ob", group = "Btop" })
+add_to_whichkey(nil, { key = "<leader>on", group = "Ncmpcpp" })
+add_to_whichkey(nil, { key = "<leader>od", group = "Lazydocker" })
+add_to_whichkey(nil, { key = "<leader>op", group = "Ipython" })
+add_to_whichkey(nil, { key = "<leader>oP", group = "Ipython Full" })
+add_to_whichkey(nil, { key = "<leader>p", group = "Paste in Place" })
+add_to_whichkey(nil, { key = "<leader>s", group = "Search" })
+add_to_whichkey(nil, { key = "<leader>t", group = "Terminal" })
+add_to_whichkey(nil, { key = "<leader>T", group = "Telescope" })
+add_to_whichkey(nil, { key = "<leader>w", group = "Workspace" })
+add_to_whichkey(nil, { key = "<leader>x", group = "Make Executable" })
+add_to_whichkey(nil, { key = "<leader>y", group = "System Yank" })
+add_to_whichkey(nil, { key = "<leader>0", group = "Horizontal Terminal" })
+--}}}
+
+--{{{ Whichkey Mappings
+add_to_whichkey(map_from_table(basic_mappings))
+add_to_whichkey(map_from_table(buffer_navigation_mappings))
+add_to_whichkey(map_from_table(terminal_mappings))
+add_to_whichkey(map_from_table(lsp_mappings))
+add_to_whichkey(map_from_table(code_companion_mappings))
+add_to_whichkey(map_from_table(telescope_mappings))
+add_to_whichkey(map_from_table(file_explorer_mappings))
+add_to_whichkey(map_from_table(misc_utilities_mappings))
+add_to_whichkey(map_from_table(goto_preview_mappings))
+add_to_whichkey(map_from_table(workspace_management_mappings))
+add_to_whichkey(map_from_table(noice_mappings))
+add_to_whichkey(map_from_table(odis_mappings))
+add_to_whichkey(map_from_table(diffview_mappings))
+add_to_whichkey(nil, { key = "<leader>dc", group = "Close" })
+--}}}
diff --git a/.config/nvim/lua/core/lazy.lua b/.config/nvim/lua/core/lazy.lua
new file mode 100644
index 0000000..c0c7643
--- /dev/null
+++ b/.config/nvim/lua/core/lazy.lua
@@ -0,0 +1,62 @@
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+	local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+	if vim.v.shell_error ~= 0 then
+		vim.api.nvim_echo({
+			{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+			{ out, "WarningMsg" },
+			{ "\nPress any key to exit..." },
+		}, true, {})
+		vim.fn.getchar()
+		os.exit(1)
+	end
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("core.options")
+require("core.autocmds")
+require("core.highlights")
+
+-- Setup lazy.nvim
+require("lazy").setup({
+	spec = {
+		-- import your plugins
+		{ import = "plugins" },
+	},
+	-- Configure any other settings here. See the documentation for more details.
+	-- colorscheme that will be used when installing plugins.
+	install = { colorscheme = { "habamax" } },
+	-- automatically check for plugin updates
+	checker = { enabled = true },
+	dev = {
+		-- Directory where you store your local plugin projects. If a function is used,
+		-- the plugin directory (e.g. `~/projects/plugin-name`) must be returned.
+		---@type string | fun(plugin: LazyPlugin): string
+		path = "~/.config/nvim/test",
+		---@type string[] plugins that match these patterns will use your local versions instead of being fetched from GitHub
+		patterns = {}, -- For example {"folke"}
+		fallback = false, -- Fallback to git when local plugin doesn't exist
+	},
+	-- lazy can generate helptags from the headings in markdown readme files,
+	-- so :help works even for plugins that don't have vim docs.
+	-- when the readme opens with :help it will be correctly displayed as markdown
+	readme = {
+		enabled = true,
+		root = vim.fn.stdpath("state") .. "/lazy/readme",
+		files = { "README.md", "lua/**/README.md" },
+		-- only generate markdown helptags for plugins that don't have docs
+		skip_if_doc_exists = true,
+	},
+	state = vim.fn.stdpath("state") .. "/lazy/state.json", -- state info for checker and other things
+	-- Enable profiling of lazy.nvim. This will add some overhead,
+	-- so only enable this when you are debugging lazy.nvim
+	profiling = {
+		-- Enables extra stats on the debug tab related to the loader cache.
+		-- Additionally gathers stats about all package.loaders
+		loader = false,
+		-- Track each new require in the Lazy profiling tab
+		require = false,
+	},
+})
diff --git a/.config/nvim/lua/core/lsp-notifications.lua b/.config/nvim/lua/core/lsp-notifications.lua
new file mode 100644
index 0000000..926fa1c
--- /dev/null
+++ b/.config/nvim/lua/core/lsp-notifications.lua
@@ -0,0 +1,104 @@
+-- Utility functions shared between progress reports for LSP and DAP
+vim.notify = require("notify")
+
+local client_notifs = {}
+
+local function get_notif_data(client_id, token)
+	if not client_notifs[client_id] then
+		client_notifs[client_id] = {}
+	end
+
+	if not client_notifs[client_id][token] then
+		client_notifs[client_id][token] = {}
+	end
+
+	return client_notifs[client_id][token]
+end
+
+local spinner_frames = { "⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷" }
+
+local function update_spinner(client_id, token)
+	local notif_data = get_notif_data(client_id, token)
+
+	if notif_data.spinner then
+		local new_spinner = (notif_data.spinner + 1) % #spinner_frames
+		notif_data.spinner = new_spinner
+
+		notif_data.notification = vim.notify("", nil, {
+			hide_from_history = true,
+			icon = spinner_frames[new_spinner],
+			replace = notif_data.notification,
+		})
+
+		vim.defer_fn(function()
+			update_spinner(client_id, token)
+		end, 100)
+	end
+end
+
+local function format_title(title, client_name)
+	return client_name .. (#title > 0 and ": " .. title or "")
+end
+
+local function format_message(message, percentage)
+	return (percentage and percentage .. "%\t" or "") .. (message or "")
+end
+
+-- LSP integration
+-- Make sure to also have the snippet with the common helper functions in your config!
+
+vim.lsp.handlers["$/progress"] = function(_, result, ctx)
+	local client_id = ctx.client_id
+
+	local val = result.value
+
+	if not val.kind then
+		return
+	end
+
+	local notif_data = get_notif_data(client_id, result.token)
+
+	if val.kind == "begin" then
+		local message = format_message(val.message, val.percentage)
+
+		notif_data.notification = vim.notify(message, "info", {
+			title = format_title(val.title, vim.lsp.get_client_by_id(client_id).name),
+			icon = spinner_frames[1],
+			timeout = false,
+			hide_from_history = false,
+		})
+
+		notif_data.spinner = 1
+		update_spinner(client_id, result.token)
+	elseif val.kind == "report" and notif_data then
+		notif_data.notification = vim.notify(format_message(val.message, val.percentage), "info", {
+			replace = notif_data.notification,
+			hide_from_history = false,
+		})
+	elseif val.kind == "end" and notif_data then
+		notif_data.notification = vim.notify(val.message and format_message(val.message) or "Complete", "info", {
+			icon = "",
+			replace = notif_data.notification,
+			timeout = 3000,
+		})
+
+		notif_data.spinner = nil
+	end
+end
+
+vim.lsp.handlers["window/showMessage"] = function(err, result, ctx)
+	local client = vim.lsp.get_client_by_id(ctx.client_id)
+	local lvl = ({
+		"ERROR",
+		"WARN",
+		"INFO",
+		"DEBUG",
+	})[result.type]
+	vim.notify("LSP Message: " .. result.message, lvl, {
+		title = "LSP | " .. client.name,
+		timeout = 5000,
+		keep = function()
+			return lvl == "ERROR" or lvl == "WARN"
+		end,
+	})
+end
diff --git a/.config/nvim/lua/core/options.lua b/.config/nvim/lua/core/options.lua
new file mode 100644
index 0000000..029b44c
--- /dev/null
+++ b/.config/nvim/lua/core/options.lua
@@ -0,0 +1,85 @@
+local g = vim.g
+local o = vim.o
+local A = vim.api
+local l = vim.lsp
+
+g.mapleader = " "
+g.maplocalleader = ","
+g.fzf_command = 'fzf --height 90% --width=85% --layout=reverse --preview "bat --color=always {}"'
+o.completeopt = "menu,menuone,noselect"
+o.showmode = false
+o.termguicolors = true
+o.background = "dark"
+o.mouse = "a"
+o.syntax = "on"
+o.laststatus = 3
+o.number = true
+o.relativenumber = true
+o.colorcolumn = "88"
+o.textwidth = 80
+o.shiftwidth = 4
+o.expandtab = true
+o.tabstop = 4
+o.autoindent = true
+o.ignorecase = true
+o.smartcase = true
+o.incsearch = true
+o.hlsearch = true
+o.title = true
+o.splitright = true
+o.cursorline = true
+o.scrolloff = 8
+o.sidescrolloff = 8
+o.wildmenu = false --cmp
+o.wildmode = "" --cmp
+o.wildoptions = ""
+o.wildignore = ".git,.hg,.svn,CVS,.DS_Store,.idea,.vscode,.vscode-test,node_modules"
+o.showmatch = true
+o.list = true
+o.listchars = "tab:»·,trail:·,nbsp:·,extends:>,precedes:<"
+o.encoding = "utf-8"
+o.guifont = "JetBrainsMono Nerd Font 14"
+o.expandtab = true
+o.hidden = true
+o.cmdheight = 1
+o.updatetime = 300
+o.timeoutlen = 500
+o.pumwidth = 35
+o.foldmethod = "marker"
+o.conceallevel = 1
+g.db_ui_use_nerd_fonts = 1
+
+-- vim.cmd.colorscheme = 'catppuccin-macchiato'
+vim.cmd.colorscheme = "catppuccin"
+
+-- Define the highlight color for float border
+vim.api.nvim_set_hl(0, "FloatBorder", { fg = "#89b4fa", bold = true })
+
+local border = {
+	{ "╭", "FloatBorder" },
+	{ "─", "FloatBorder" },
+	{ "╮", "FloatBorder" },
+	{ "│", "FloatBorder" },
+	{ "╯", "FloatBorder" },
+	{ "─", "FloatBorder" },
+	{ "╰", "FloatBorder" },
+	{ "│", "FloatBorder" },
+}
+
+-- set border for floating windows and signature help
+-- UNSUPPPORTED: https://github.com/neovim/neovim/issues/32242#issuecomment-2777120640
+-- l.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border })
+-- l.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border })
+o.winborder = "rounded"
+
+vim.diagnostic.config({
+	virtual_text = true,
+	signs = true,
+	underline = true,
+	float = { border = "rounded", source = true },
+	severity_sort = true,
+})
+vim.keymap.set("", "<Leader>tl", function()
+	local current = vim.diagnostic.config().virtual_text
+	vim.diagnostic.config({ virtual_text = not current })
+end, { desc = "Toggle diagnostics virtual text" })
diff --git a/.config/nvim/lua/plugins/anyjump.lua b/.config/nvim/lua/plugins/anyjump.lua
new file mode 100644
index 0000000..b83ed32
--- /dev/null
+++ b/.config/nvim/lua/plugins/anyjump.lua
@@ -0,0 +1 @@
+return { "pechorin/any-jump.vim" }
diff --git a/.config/nvim/lua/plugins/bufferline.lua b/.config/nvim/lua/plugins/bufferline.lua
new file mode 100644
index 0000000..c739ab0
--- /dev/null
+++ b/.config/nvim/lua/plugins/bufferline.lua
@@ -0,0 +1,100 @@
+return {
+	"akinsho/bufferline.nvim",
+	version = "*",
+	dependencies = { "nvim-tree/nvim-web-devicons", "catppuccin/nvim" },
+	opts = {
+		options = {
+			-- numbers = function(opts)
+			--   return string.format("%s", opts.id)
+			-- end,
+			numbers = function(opts)
+				return ""
+			end,
+			-- number_style = "superscript" | "subscript" | "" | { "none", "subscript" }, -- buffer_id at index 1, ordinal at index 2
+			-- number_style = "none",
+			close_command = "bdelete! %d", -- can be a string | function, see "Mouse actions"
+			right_mouse_command = "bdelete! %d", -- can be a string | function, see "Mouse actions"
+			left_mouse_command = "buffer %d", -- can be a string | function, see "Mouse actions"
+			middle_mouse_command = nil, -- can be a string | function, see "Mouse actions"
+			-- NOTE: this plugin is designed with this icon in mind,
+			-- and so changing this is NOT recommended, this is intended
+			-- as an escape hatch for people who cannot bear it for whatever reason
+			indicator = {
+				-- icon = "▎",
+				style = "underline",
+			},
+			-- indicator_style = "▎",
+			buffer_close_icon = "",
+			modified_icon = "●",
+			close_icon = "",
+			left_trunc_marker = "",
+			right_trunc_marker = "",
+			--- name_formatter can be used to change the buffer's label in the bufferline.
+			--- Please note some names can/will break the
+			--- bufferline so use this at your discretion knowing that it has
+			--- some limitations that will *NOT* be fixed.
+			name_formatter = function(buf) -- buf contains a "name", "path" and "bufnr"
+				-- remove extension from markdown files for example
+				if buf.name:match("%.md") then
+					return vim.fn.fnamemodify(buf.name, ":t:r")
+				end
+			end,
+			max_name_length = 18,
+			max_prefix_length = 15, -- prefix used when a buffer is de-duplicated
+			tab_size = 18,
+			-- diagnostics = false | "nvim_lsp" | "coc",
+			diagnostics = "nvim_lsp",
+			diagnostics_update_in_insert = false,
+			diagnostics_indicator = function(count, level, diagnostics_dict, context)
+				local s = " "
+				for e, n in pairs(diagnostics_dict) do
+					local sym = e == "error" and " "
+					    or e == "hint" and " "
+					    or (e == "warning" and " " or "")
+					s = s .. n .. sym
+				end
+				return s
+			end,
+			custom_filter = function(buf_number, buf_numbers)
+				-- filter out filetypes you don't want to see
+				if vim.bo[buf_number].filetype ~= "<i-dont-want-to-see-this>" then
+					return true
+				end
+				-- filter out by buffer name
+				if vim.fn.bufname(buf_number) ~= "<buffer-name-I-dont-want>" then
+					return true
+				end
+				-- filter out based on arbitrary rules
+				-- e.g. filter out vim wiki buffer from tabline in your work repo
+				if vim.fn.getcwd() == "<work-repo>" and vim.bo[buf_number].filetype ~= "wiki" then
+					return true
+				end
+				-- filter out by it's index number in list (don't show first buffer)
+				if buf_numbers[1] ~= buf_number then
+					return true
+				end
+			end,
+			-- offsets = {{filetype = "NvimTree", text = "File Explorer" | function , text_align = "left" | "center" | "right"}},
+			-- offsets = text_align = "left" | "center" | "right"}},
+			show_buffer_icons = true,
+			show_buffer_close_icons = true,
+			show_close_icon = false,
+			show_tab_indicators = true,
+			persist_buffer_sort = false, -- whether or not custom sorted buffers should persist
+			-- can also be a table containing 2 custom separators
+			-- [focused and unfocused]. eg: { '|', '|' }
+			-- separator_style = "slant" | "thick" | "thin" | { 'any', 'any' },
+			separator_style = "slant",
+			enforce_regular_tabs = false,
+			always_show_bufferline = true,
+			-- sort_by = 'id' | 'extension' | 'relative_directory' | 'directory' | 'tabs' | function(buffer_a, buffer_b)
+			sort_by = "id",
+			-- highlights = require("catppuccin.groups.integrations.bufferline").get(),
+			hover = {
+				enabled = true,
+				delay = 200,
+				reveal = { "close" },
+			},
+		},
+	},
+}
diff --git a/.config/nvim/lua/plugins/catppuccin.lua b/.config/nvim/lua/plugins/catppuccin.lua
new file mode 100644
index 0000000..7e29c9f
--- /dev/null
+++ b/.config/nvim/lua/plugins/catppuccin.lua
@@ -0,0 +1,56 @@
+return {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    priority = 1000,
+    opts = {
+        flavour = "macchiato", -- latte, frappe, macchiato, mocha
+        term_colors = true,    -- sets terminal colors (e.g. `g:terminal_color_0`)
+        integrations = {
+            cmp = true,
+            gitsigns = true,
+            nvimtree = true,
+            mini = {
+                enabled = true,
+                indentscope_color = "",
+            },
+            bufferline = true,
+            dashboard = true,
+            fidget = true,
+            indent_blankline = {
+                enabled = true,
+                scope_color = "lavendar", -- catppuccin color (eg. `lavender`) Default: text
+                colored_indent_levels = true,
+            },
+            copilot_vim = true,
+            native_lsp = {
+                enabled = true,
+                virtual_text = {
+                    errors = { "italic" },
+                    hints = { "italic" },
+                    warnings = { "italic" },
+                    information = { "italic" },
+                    ok = { "italic" },
+                },
+                underlines = {
+                    errors = { "underline" },
+                    hints = { "underline" },
+                    warnings = { "underline" },
+                    information = { "underline" },
+                    ok = { "underline" },
+                },
+                inlay_hints = {
+                    background = true,
+                },
+            },
+            notify = true,
+            treesitter = true,
+            rainbow_delimiters = true,
+            telescope = {
+                enabled = true,
+                -- style = "nvchad"
+            },
+            which_key = true
+            -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations)
+        }
+    }
+}
diff --git a/.config/nvim/lua/plugins/codecompanion.lua b/.config/nvim/lua/plugins/codecompanion.lua
new file mode 100644
index 0000000..eb8f1dd
--- /dev/null
+++ b/.config/nvim/lua/plugins/codecompanion.lua
@@ -0,0 +1,211 @@
+return {
+	"olimorris/codecompanion.nvim",
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+		"nvim-treesitter/nvim-treesitter",
+		"j-hui/fidget.nvim",
+		"ravitemer/mcphub.nvim",
+	},
+	opts = {
+		adapters = {
+			copilot = function()
+				return require("codecompanion.adapters").extend("copilot", {
+					schema = {
+						name = "copilot",
+						opts = {
+							stream = true,
+						},
+						model = {
+							-- default = "claude-3.7-sonnet-thought",
+							-- default = "o3-mini",
+							-- default = "gemini-2.0-flash-001",
+							default = "gpt-4.1",
+							-- default = "gpt-4o",
+							-- default = "o3-mini-2025-01-31",
+							-- choices = {
+							-- 	["o3-mini-2025-01-31"] = { opts = { can_reason = true } },
+							-- 	["o1-2024-12-17"] = { opts = { can_reason = true } },
+							-- 	["o1-mini-2024-09-12"] = { opts = { can_reason = true } },
+							-- 	"gpt-4o-2024-08-06",
+							-- 	"claude-3.7-sonnet-thought",
+							-- 	"claude-3.7-sonnet",
+							-- "claude-3.5-sonnet",
+							-- 	"gemini-2.0-flash-001",
+							-- },
+						},
+						-- max_tokens = {
+						-- 	default = 65536,
+						-- },
+					},
+				})
+			end,
+			llama_cpp = function()
+				return require("codecompanion.adapters").extend("openai_compatible", {
+					name = "llama.cpp",
+					formatted_name = "llama.cpp",
+					opts = {
+						stream = false,
+					},
+					schema = {
+						-- model = {
+						-- 	default = "qwen2.5-coder-14b-instruct",
+						-- 	choices = {
+						-- 		["qwen2.5-coder-14b-instruct"] = { opts = { can_reason = true } },
+						-- 		["/models/lmstudio-community/DeepSeek-R1-Distill-Qwen-7B-GGUF/DeepSeek-R1-Distill-Qwen-7B-Q4_K_M.gguf"] = {
+						-- 			opts = { can_reason = true },
+						-- 		},
+						-- 		["/models/lmstudio-community/Qwen2.5-7B-Instruct-1M-GGUF/Qwen2.5-7B-Instruct-1M-Q4_K_M.gguf"] = {
+						-- 			opts = { can_reason = true },
+						-- 		},
+						-- 	},
+						-- },
+						temperature = {
+							order = 2,
+							mapping = "parameters",
+							type = "number",
+							optional = true,
+							default = 0.2,
+							validate = function(n)
+								return n >= 0 and n <= 2, "Must be between 0 and 2"
+							end,
+						},
+					},
+					env = {
+						url = "http://localhost:8080",
+						chat_url = "/v1/chat/completions",
+					},
+				})
+			end,
+			openrouter = function()
+				return require("codecompanion.adapters").extend("openai_compatible", {
+					env = {
+						url = "https://openrouter.ai/api",
+						api_key = "cmd:cat $HOME/.openrouterapikey",
+						chat_url = "/v1/chat/completions",
+					},
+					schema = {
+						model = {
+							default = "google/gemini-2.5-pro-exp-03-25:free",
+							-- default = "deepseek/deepseek-chat-v3-0324:free",
+							-- default = "google/gemini-2.0-flash-thinking-exp:free",
+							-- default = "deepseek/deepseek-r1-distill-qwen-32b:free",
+							-- default = "qwen/qwen-2.5-coder-32b-instruct:free",
+						},
+					},
+				})
+			end,
+		},
+		strategies = {
+			chat = {
+				adapter = "copilot",
+				-- adapter = "openrouter",
+				roles = {
+					llm = function(adapter)
+						if adapter.model == nil then
+							return " Assistant"
+						else
+							return " Assistant ("
+								.. adapter.formatted_name
+								.. " - "
+								.. adapter.parameters.model
+								.. ")"
+						end
+					end,
+					user = " User",
+				},
+				slash_commands = {
+					["file"] = {
+						opts = {
+							provider = "telescope",
+						},
+					},
+					["symbols"] = {
+						opts = {
+							provider = "telescope",
+						},
+					},
+					["buffer"] = {
+						opts = {
+							provider = "telescope",
+						},
+					},
+					["terminal"] = {
+						opts = {
+							provider = "telescope",
+						},
+					},
+				},
+			},
+			inline = {
+				adapter = "copilot",
+				-- adapter = "openrouter",
+			},
+		},
+		display = {
+			action_palette = {
+				provider = "telescope",
+				width = 75,
+				heigth = 45,
+			},
+			chat = {
+				layout = "vertical",
+				border = "single",
+				intro_message = "Welcome to CodeCompanion ✨! Press ? for options",
+				show_header_separator = false, -- Show header separators in the chat buffer? Set this to false if you're using an external markdown formatting plugin
+				separator = "─", -- The separator between the different messages in the chat buffer
+				show_references = true, -- Show references (from slash commands and variables) in the chat buffer?
+				show_settings = false, -- Show LLM settings at the top of the chat buffer?
+				show_token_count = true, -- Show the token count for each response?
+				start_in_insert_mode = false, -- Open the chat buffer in insert mode?
+			},
+			window = {
+				layout = "vertical",
+				position = nil,
+				border = "rounded",
+				height = 0.45,
+				width = 0.45,
+				relative = "editor",
+				opts = {
+					breakindent = true,
+					cursorcolumn = false,
+					cursorline = false,
+					foldcolumn = "0",
+					linebreak = true,
+					list = false,
+					numberwidth = 1,
+					signcolumn = "no",
+					spell = false,
+					wrap = true,
+				},
+			},
+			diff = {
+				enabled = true,
+				provider = "mini_diff",
+			},
+			---Customize how tokens are displayed
+			---@param tokens number
+			---@param adapter CodeCompanion.Adapter
+			---@return string
+			token_count = function(tokens, adapter)
+				return " (" .. tokens .. " tokens)"
+			end,
+		},
+		opts = {
+			log_level = "DEBUG",
+			-- log_level = "TRACE",
+		},
+		extensions = {
+			mcphub = {
+				callback = "mcphub.extensions.codecompanion",
+				opts = {
+					show_result_in_chat = true, -- Show the mcp tool result in the chat buffer
+					make_vars = true, -- make chat #variables from MCP server resources
+					make_slash_commands = true, -- make /slash_commands from MCP server prompts
+				},
+			},
+		},
+	},
+	init = function()
+		require("plugins.codecompanion.fidget-spinner"):init()
+	end,
+}
diff --git a/.config/nvim/lua/plugins/codecompanion/fidget-spinner-notify.lua b/.config/nvim/lua/plugins/codecompanion/fidget-spinner-notify.lua
new file mode 100644
index 0000000..d6aaa50
--- /dev/null
+++ b/.config/nvim/lua/plugins/codecompanion/fidget-spinner-notify.lua
@@ -0,0 +1,126 @@
+local notify = require("notify")
+local spinner_frames = { "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" }
+local spinner_len = #spinner_frames -- cache spinner length
+local M = {}
+local timeout = 2999
+
+-- Helper function to safely call notify
+local function safe_notify(msg, level, opts)
+	local ok, res = pcall(notify, msg, level, opts)
+	return ok, res
+end
+
+function M:init()
+	local group = vim.api.nvim_create_augroup("CodeCompanionFidgetHooks", {})
+
+	vim.api.nvim_create_autocmd({ "User" }, {
+		pattern = "CodeCompanionRequestStarted",
+		group = group,
+		callback = function(request)
+			local handle = M:create_progress_handle(request)
+			M:store_progress_handle(request.data.id, handle)
+		end,
+	})
+
+	vim.api.nvim_create_autocmd({ "User" }, {
+		pattern = "CodeCompanionRequestFinished",
+		group = group,
+		callback = function(request)
+			local handle = M:pop_progress_handle(request.data.id)
+			if handle then
+				M:report_exit_status(handle, request)
+				handle:finish()
+			end
+		end,
+	})
+end
+
+M.handles = {}
+
+function M:store_progress_handle(id, handle)
+	M.handles[id] = handle
+end
+
+function M:pop_progress_handle(id)
+	local handle = M.handles[id]
+	M.handles[id] = nil
+	return handle
+end
+
+function M:create_progress_handle(request)
+	local title = " Requesting assistance"
+		.. " ("
+		.. request.data.strategy
+		.. ") from "
+		.. request.data.adapter.formatted_name
+		.. " using "
+		.. request.data.adapter.model
+	local idx = 1
+	local start_time = os.time()
+	local notification_id =
+		notify(spinner_frames[idx] .. " In progress (" .. "0s" .. ")...", "info", { title = title, timeout = false })
+	local handle = { notification_id = notification_id, title = title, finished = false }
+	local timer = vim.loop.new_timer()
+	timer:start(
+		0,
+		100,
+		vim.schedule_wrap(function()
+			if handle.finished then
+				return
+			end -- stop updating if finished
+			idx = idx % spinner_len + 1
+			local elapsed = os.difftime(os.time(), start_time)
+			local opts = { replace = handle.notification_id, title = title, timeout = false }
+			local ok, new_id = safe_notify(spinner_frames[idx] .. " In progress (" .. elapsed .. "s)...", "info", opts)
+			if ok then
+				handle.notification_id = new_id
+			else
+				handle.notification_id = notify(
+					spinner_frames[idx] .. " In progress (" .. elapsed .. "s)...",
+					"info",
+					{ title = title, timeout = false }
+				)
+			end
+		end)
+	)
+	handle.timer = timer
+	handle.finish = function()
+		handle.finished = true -- mark as finished to abort future updates
+		if handle.timer then
+			handle.timer:stop()
+			handle.timer:close()
+			handle.timer = nil
+		end
+	end
+	return handle
+end
+
+function M:report_exit_status(handle, request)
+	local title = handle.title
+		or (
+			" Requesting assistance"
+			.. " ("
+			.. request.data.strategy
+			.. ") from "
+			.. request.data.adapter.formatted_name
+			.. " using "
+			.. request.data.adapter.model
+		)
+	local function report(msg, level)
+		local opts = { replace = handle.notification_id, title = title, timeout = timeout }
+		local ok = safe_notify(msg, level, opts)
+		if not ok then
+			notify(msg, level, { title = title, timeout = timeout })
+		end
+	end
+
+	if request.data.status == "success" then
+		report("Completed", "info")
+	elseif request.data.status == "error" then
+		report(" Error", "error")
+	else
+		report("󰜺 Cancelled", "warn")
+	end
+end
+
+return M
diff --git a/.config/nvim/lua/plugins/codecompanion/fidget-spinner.lua b/.config/nvim/lua/plugins/codecompanion/fidget-spinner.lua
new file mode 100644
index 0000000..59c3c5f
--- /dev/null
+++ b/.config/nvim/lua/plugins/codecompanion/fidget-spinner.lua
@@ -0,0 +1,73 @@
+-- lua/plugins/codecompanion/fidget-spinner.lua
+
+local progress = require("fidget.progress")
+
+local M = {}
+
+function M:init()
+	local group = vim.api.nvim_create_augroup("CodeCompanionFidgetHooks", {})
+
+	vim.api.nvim_create_autocmd({ "User" }, {
+		pattern = "CodeCompanionRequestStarted",
+		group = group,
+		callback = function(request)
+			local handle = M:create_progress_handle(request)
+			M:store_progress_handle(request.data.id, handle)
+		end,
+	})
+
+	vim.api.nvim_create_autocmd({ "User" }, {
+		pattern = "CodeCompanionRequestFinished",
+		group = group,
+		callback = function(request)
+			local handle = M:pop_progress_handle(request.data.id)
+			if handle then
+				M:report_exit_status(handle, request)
+				handle:finish()
+			end
+		end,
+	})
+end
+
+M.handles = {}
+
+function M:store_progress_handle(id, handle)
+	M.handles[id] = handle
+end
+
+function M:pop_progress_handle(id)
+	local handle = M.handles[id]
+	M.handles[id] = nil
+	return handle
+end
+
+function M:create_progress_handle(request)
+	return progress.handle.create({
+		title = " Requesting assistance (" .. request.data.strategy .. ")",
+		message = "In progress...",
+		lsp_client = {
+			name = M:llm_role_title(request.data.adapter),
+		},
+	})
+end
+
+function M:llm_role_title(adapter)
+	local parts = {}
+	table.insert(parts, adapter.formatted_name)
+	if adapter.model and adapter.model ~= "" then
+		table.insert(parts, "(" .. adapter.model .. ")")
+	end
+	return table.concat(parts, " ")
+end
+
+function M:report_exit_status(handle, request)
+	if request.data.status == "success" then
+		handle.message = "Completed"
+	elseif request.data.status == "error" then
+		handle.message = " Error"
+	else
+		handle.message = "󰜺 Cancelled"
+	end
+end
+
+return M
diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua
new file mode 100644
index 0000000..fcba9f8
--- /dev/null
+++ b/.config/nvim/lua/plugins/conform.lua
@@ -0,0 +1,4 @@
+return {
+	"stevearc/conform.nvim",
+	opts = {},
+}
diff --git a/.config/nvim/lua/plugins/copilot-cmp.lua b/.config/nvim/lua/plugins/copilot-cmp.lua
new file mode 100644
index 0000000..7fd24ba
--- /dev/null
+++ b/.config/nvim/lua/plugins/copilot-cmp.lua
@@ -0,0 +1,7 @@
+return {
+	"zbirenbaum/copilot-cmp",
+	opts = {
+		suggestion = { enabled = false },
+		panel = { enabled = false },
+	},
+}
diff --git a/.config/nvim/lua/plugins/copilot-lualine.lua b/.config/nvim/lua/plugins/copilot-lualine.lua
new file mode 100644
index 0000000..44de183
--- /dev/null
+++ b/.config/nvim/lua/plugins/copilot-lualine.lua
@@ -0,0 +1,3 @@
+return {
+	'AndreM222/copilot-lualine'
+}
diff --git a/.config/nvim/lua/plugins/copilot.lua b/.config/nvim/lua/plugins/copilot.lua
new file mode 100644
index 0000000..13b41aa
--- /dev/null
+++ b/.config/nvim/lua/plugins/copilot.lua
@@ -0,0 +1,55 @@
+return {
+	"zbirenbaum/copilot.lua",
+	opts = {
+		panel = {
+			enabled = true,
+			auto_refresh = false,
+			keymap = {
+				jump_prev = "[[",
+				jump_next = "]]",
+				accept = "<CR>",
+				refresh = "gr",
+				open = "<M-CR>",
+			},
+			layout = {
+				position = "bottom", -- | top | left | right | horizontal | vertical
+				ratio = 0.4,
+			},
+		},
+		suggestion = {
+			enabled = false,
+			auto_trigger = false,
+			hide_during_completion = true,
+			debounce = 75,
+			keymap = {
+				accept = "<M-l>",
+				accept_word = false,
+				accept_line = false,
+				next = "<M-]>",
+				prev = "<M-[>",
+				dismiss = "<C-]>",
+			},
+		},
+		-- filetypes = {
+		--     yaml = false,
+		--     markdown = false,
+		--     help = false,
+		--     gitcommit = false,
+		--     gitrebase = false,
+		--     hgcommit = false,
+		--     svn = false,
+		--     cvs = false,
+		--     ["."] = false,
+		-- },
+		-- copilot_node_command = "node", -- Node.js version must be > 18.x
+		server_opts_overrides = {
+			trace = "verbose",
+			settings = {
+				advanced = {
+					listCount = 10, -- #completions for panel
+					inlineSuggestCount = 5, -- #completions for getCompletions
+				},
+			},
+		},
+	},
+}
diff --git a/.config/nvim/lua/plugins/dashboard.lua b/.config/nvim/lua/plugins/dashboard.lua
new file mode 100644
index 0000000..029b550
--- /dev/null
+++ b/.config/nvim/lua/plugins/dashboard.lua
@@ -0,0 +1,36 @@
+return {
+	"nvimdev/dashboard-nvim",
+	event = "VimEnter",
+	opts = {
+		theme = "hyper",
+		config = {
+			week_header = {
+				enable = true,
+			},
+			shortcut = {
+				{ desc = "󰊳 Update", group = "@property", action = "Lazy update", key = "u" },
+				{
+					icon = " ",
+					icon_hl = "@variable",
+					desc = "Files",
+					group = "Label",
+					action = "Telescope find_files",
+					key = "f",
+				},
+				{
+					desc = " Apps",
+					group = "DiagnosticHint",
+					action = "Telescope app",
+					key = "a",
+				},
+				{
+					desc = " dotfiles",
+					group = "Number",
+					action = "Telescope ~/.config",
+					key = "d",
+				},
+			},
+		},
+	},
+	depends = { "nvim-tree/nvim-web-devicons" },
+}
diff --git a/.config/nvim/lua/plugins/diffview.lua b/.config/nvim/lua/plugins/diffview.lua
new file mode 100644
index 0000000..8046cc3
--- /dev/null
+++ b/.config/nvim/lua/plugins/diffview.lua
@@ -0,0 +1,27 @@
+return {
+	"sindrets/diffview.nvim",
+	dependencies = "nvim-tree/nvim-web-devicons",
+	opts = {
+		view = {
+			-- Disable the default normal mode mapping for `<tab>`:
+			-- ["<tab>"] = false,
+			-- Disable the default visual mode mapping for `gf`:
+			-- { "x", "gf", false },
+		},
+	},
+	hooks = {
+		diff_buf_read = function(bufnr)
+			-- Change local options in diff buffers
+			vim.opt_local.wrap = false
+			vim.opt_local.list = false
+			vim.opt_local.colorcolumn = { 80 }
+		end,
+		view_opened = function(view)
+			require("notify").notify(
+				("A new %s was opened on tab page %d!"):format(view.class:name(), view.tabpage),
+				"info",
+				{ timeout = 5000, title = "Diffview" }
+			)
+		end,
+	},
+}
diff --git a/.config/nvim/lua/plugins/fidget.lua b/.config/nvim/lua/plugins/fidget.lua
new file mode 100644
index 0000000..91a7bec
--- /dev/null
+++ b/.config/nvim/lua/plugins/fidget.lua
@@ -0,0 +1,101 @@
+return {
+    "j-hui/fidget.nvim",
+    opts = {
+        -- text = {
+        -- 	spinner = "pipe", -- animation shown when tasks are ongoing
+        -- 	done = "✔", -- character shown when all tasks are complete
+        -- 	commenced = "Started", -- message shown when task starts
+        -- 	completed = "Completed", -- message shown when task completes
+        -- },
+        -- align = {
+        -- 	bottom = true, -- align fidgets along bottom edge of buffer
+        -- 	right = true, -- align fidgets along right edge of buffer
+        -- },
+        progress = {
+            poll_rate = 0,                -- How and when to poll for progress messages
+            suppress_on_insert = false,   -- Suppress new messages while in insert mode
+            ignore_done_already = false,  -- Ignore new tasks that are already complete
+            ignore_empty_message = false, -- Ignore new tasks that don't contain a message
+            clear_on_detach =             -- Clear notification group when LSP server detaches
+                function(client_id)
+                    local client = vim.lsp.get_client_by_id(client_id)
+                    return client and client.name or nil
+                end,
+            notification_group = -- How to get a progress message's notification group key
+                function(msg) return msg.lsp_client.name end,
+            ignore = {},         -- List of LSP servers to ignore
+
+            -- Options related to how LSP progress messages are displayed as notifications
+            display = {
+                render_limit = 16, -- How many LSP messages to show at once
+                done_ttl = 3, -- How long a message should persist after completion
+                done_icon = "✔", -- Icon shown when all LSP progress tasks are complete
+                done_style = "Constant", -- Highlight group for completed LSP tasks
+                progress_ttl = math.huge, -- How long a message should persist when in progress
+                progress_icon = -- Icon shown when LSP progress tasks are in progress
+                { "dots" },
+                progress_style = -- Highlight group for in-progress LSP tasks
+                "WarningMsg",
+                group_style = "Title", -- Highlight group for group name (LSP server name)
+                icon_style = "Question", -- Highlight group for group icons
+                priority = 30, -- Ordering priority for LSP notification group
+                skip_history = true, -- Whether progress notifications should be omitted from history
+                format_message = -- How to format a progress message
+                    require("fidget.progress.display").default_format_message,
+                format_annote = -- How to format a progress annotation
+                    function(msg) return msg.title end,
+                format_group_name = -- How to format a progress notification group's name
+                    function(group) return tostring(group) end,
+                overrides = { -- Override options from the default notification config
+                    rust_analyzer = { name = "rust-analyzer" },
+                },
+            },
+
+            -- Options related to Neovim's built-in LSP client
+            lsp = {
+                progress_ringbuf_size = 0, -- Configure the nvim's LSP progress ring buffer size
+                log_handler = false,       -- Log `$/progress` handler invocations (for debugging)
+            },
+        },
+        notification = {
+            window = {
+                winblend = 0,
+            },
+            poll_rate = 10,               -- How frequently to update and render notifications
+            filter = vim.log.levels.INFO, -- Minimum notifications level
+            history_size = 128,           -- Number of removed messages to retain in history
+            override_vim_notify = false,  -- Automatically override vim.notify() with Fidget
+            -- How to configure notification groups when instantiated
+            configs = { default = require("fidget.notification").default_config },
+            -- Conditionally redirect notifications to another backend
+            redirect = function(msg, level, opts)
+                if opts and opts.on_open then
+                    return require("fidget.integration.nvim-notify").delegate(msg, level, opts)
+                end
+            end,
+
+            -- Options related to how notifications are rendered as text
+            view = {
+                stack_upwards = true,    -- Display notification items from bottom to top
+                icon_separator = " ",    -- Separator between group name and icon
+                group_separator = "---", -- Separator between notification groups
+            },
+        },
+        integration = {
+            ["nvim-tree"] = {
+                enable = true, -- Integrate with nvim-tree/nvim-tree.lua (if installed)
+            },
+            ["xcodebuild-nvim"] = {
+                enable = false, -- Integrate with wojciech-kulik/xcodebuild.nvim (if installed)
+            },
+        },
+        -- Options related to logging
+        logger = {
+            level = vim.log.levels.WARN, -- Minimum logging level
+            max_size = 10000,            -- Maximum log file size, in KB
+            float_precision = 0.01,      -- Limit the number of decimals displayed for floats
+            -- Where Fidget writes its logs to
+            path = string.format("%s/fidget.nvim.log", vim.fn.stdpath("cache")),
+        },
+    },
+}
diff --git a/.config/nvim/lua/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua
new file mode 100644
index 0000000..671fcd6
--- /dev/null
+++ b/.config/nvim/lua/plugins/gitsigns.lua
@@ -0,0 +1,50 @@
+return {
+	"lewis6991/gitsigns.nvim",
+	opts = {
+		signs = {
+			add = { text = "┃" },
+			change = { text = "┃" },
+			delete = { text = "_" },
+			topdelete = { text = "‾" },
+			changedelete = { text = "~" },
+			untracked = { text = "┆" },
+		},
+		signs_staged = {
+			add = { text = "┃" },
+			change = { text = "┃" },
+			delete = { text = "_" },
+			topdelete = { text = "‾" },
+			changedelete = { text = "~" },
+			untracked = { text = "┆" },
+		},
+		signs_staged_enable = true,
+		signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
+		numhl = false, -- Toggle with `:Gitsigns toggle_numhl`
+		linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
+		word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
+		watch_gitdir = { follow_files = true },
+		auto_attach = true,
+		attach_to_untracked = false,
+		current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
+		current_line_blame_opts = {
+			virt_text = true,
+			virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
+			delay = 1000,
+			ignore_whitespace = false,
+			virt_text_priority = 100,
+		},
+		current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
+		sign_priority = 6,
+		update_debounce = 100,
+		status_formatter = nil, -- Use default
+		max_file_length = 40000, -- Disable if file is longer than this (in lines)
+		preview_config = {
+			-- Options passed to nvim_open_win
+			border = "single",
+			style = "minimal",
+			relative = "cursor",
+			row = 0,
+			col = 1,
+		},
+	},
+}
diff --git a/.config/nvim/lua/plugins/goto-preview.lua b/.config/nvim/lua/plugins/goto-preview.lua
new file mode 100644
index 0000000..81a3c24
--- /dev/null
+++ b/.config/nvim/lua/plugins/goto-preview.lua
@@ -0,0 +1 @@
+return { "rmagatti/goto-preview" }
diff --git a/.config/nvim/lua/plugins/image.lua b/.config/nvim/lua/plugins/image.lua
new file mode 100644
index 0000000..2ec625d
--- /dev/null
+++ b/.config/nvim/lua/plugins/image.lua
@@ -0,0 +1,41 @@
+return {
+	"3rd/image.nvim",
+	opts = {
+		backend = "kitty",
+		-- processor = "magick_rock", -- or "magick_cli"
+		processor = "magick_cli", -- or "magick_cli"
+		integrations = {
+			markdown = {
+				enabled = true,
+				clear_in_insert_mode = false,
+				download_remote_images = true,
+				only_render_image_at_cursor = false,
+				floating_windows = false, -- if true, images will be rendered in floating markdown windows
+				filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
+			},
+			neorg = {
+				enabled = true,
+				filetypes = { "norg" },
+			},
+			typst = {
+				enabled = true,
+				filetypes = { "typst" },
+			},
+			html = {
+				enabled = false,
+			},
+			css = {
+				enabled = false,
+			},
+		},
+		max_width = nil,
+		max_height = nil,
+		max_width_window_percentage = nil,
+		max_height_window_percentage = 50,
+		window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
+		window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
+		editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
+		tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
+		hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
+	},
+}
diff --git a/.config/nvim/lua/plugins/indent-blanklines.lua b/.config/nvim/lua/plugins/indent-blanklines.lua
new file mode 100644
index 0000000..e582d20
--- /dev/null
+++ b/.config/nvim/lua/plugins/indent-blanklines.lua
@@ -0,0 +1,35 @@
+return {
+	"lukas-reineke/indent-blankline.nvim",
+	config = function()
+		local highlight = {
+			"RainbowRed",
+			"RainbowYellow",
+			"RainbowBlue",
+			"RainbowOrange",
+			"RainbowGreen",
+			"RainbowViolet",
+			"RainbowCyan",
+		}
+
+		local hooks = require("ibl.hooks")
+		-- create the highlight groups in the highlight setup hook, so they are reset
+		-- every time the colorscheme changes
+		hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
+			vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#ED8796" })
+			vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#EED49F" })
+			vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#8AADF4" })
+			vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#F5A97F" })
+			vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#A6DA95" })
+			vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C6A0F6" })
+			vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#8BD5CA" })
+		end)
+
+		vim.g.rainbow_delimiters = { highlight = highlight }
+		require("ibl").setup({
+			scope = { highlight = highlight },
+			exclude = { filetypes = { "dashboard" } },
+		})
+
+		hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark)
+	end,
+}
diff --git a/.config/nvim/lua/plugins/lazydev.lua b/.config/nvim/lua/plugins/lazydev.lua
new file mode 100644
index 0000000..a3866d6
--- /dev/null
+++ b/.config/nvim/lua/plugins/lazydev.lua
@@ -0,0 +1,14 @@
+return {
+	{
+		"folke/lazydev.nvim",
+		ft = "lua", -- only load on lua files
+		opts = {
+			library = {
+				-- See the configuration section for more details
+				-- Load luvit types when the `vim.uv` word is found
+				{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
+			},
+		},
+	},
+	{ "folke/neodev.nvim", enabled = false }, -- make sure to uninstall or disable neodev.nvim
+}
diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua
new file mode 100644
index 0000000..fd1e3cb
--- /dev/null
+++ b/.config/nvim/lua/plugins/lspconfig.lua
@@ -0,0 +1,107 @@
+return {
+	"neovim/nvim-lspconfig",
+	config = function()
+		local lspconfig = require("lspconfig")
+		vim.notify = require("notify")
+		local servers = {
+			"bashls",
+			-- "jedi_language_server",
+			"basedpyright",
+			"jsonls",
+			-- "yamlls",
+			"vimls",
+			"dotls",
+			"dockerls",
+			"html",
+			"cssls",
+			"lua_ls",
+			"eslint",
+			"ts_ls",
+			"angularls",
+			"ansiblels",
+			"docker_compose_language_service",
+			"golangci_lint_ls",
+			"gopls",
+		}
+		-- Define the highlight color for float border
+		vim.api.nvim_set_hl(0, "FloatBorder", { fg = "#89b4fa", bold = true })
+		local border = {
+			{ "╭", "FloatBorder" },
+			{ "─", "FloatBorder" },
+			{ "╮", "FloatBorder" },
+			{ "│", "FloatBorder" },
+			{ "╯", "FloatBorder" },
+			{ "─", "FloatBorder" },
+			{ "╰", "FloatBorder" },
+			{ "│", "FloatBorder" },
+		}
+
+		for _, lsp in ipairs(servers) do
+			if lsp == "lua_ls" then
+				vim.lsp.enable(lsp)
+				vim.lsp.config("lua_ls", {
+					on_init = function(client)
+						if client.workspace_folders then
+							local path = client.workspace_folders[1].name
+							if
+								path ~= vim.fn.stdpath("config")
+								and (vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc"))
+							then
+								return
+							end
+						end
+
+						client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, {
+							runtime = {
+								-- Tell the language server which version of Lua you're using
+								-- (most likely LuaJIT in the case of Neovim)
+								version = "LuaJIT",
+							},
+							-- Make the server aware of Neovim runtime files
+							workspace = {
+								checkThirdParty = false,
+								library = {
+									vim.env.VIMRUNTIME,
+									-- Depending on the usage, you might want to add additional paths here.
+									-- "${3rd}/luv/library",
+									-- "${3rd}/busted/library",
+								},
+								-- or pull in all of 'runtimepath'. NOTE: this is a lot slower and will cause issues when working on your own configuration (see https://github.com/neovim/nvim-lspconfig/issues/3189)
+								-- library = vim.api.nvim_get_runtime_file("", true)
+							},
+						})
+					end,
+					settings = {
+						Lua = {},
+					},
+					handlers = {},
+				})
+			elseif lsp == "basedpyright" then
+				vim.lsp.enable(lsp)
+				vim.lsp.config(lsp, {
+					analysis = {
+						autoSearchPaths = true,
+						diagnosticMode = "openFilesOnly",
+						useLibraryCodeForTypes = true,
+					},
+					diagnosticMode = "openFilesOnly",
+					inlayHints = {
+						callArgumentNames = true,
+					},
+				})
+			else
+				vim.lsp.enable(lsp)
+				-- vim.lsp.config(lsp, {
+				-- handlers = {
+				-- UNNSUUPPORTED
+				-- ["textDocument/signatureHelp"] = vim.lsp.with(
+				-- 	vim.lsp.handlers.signature_help,
+				-- 	{ border = border }
+				-- ),
+				-- ["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border }),
+				-- },
+				-- })
+			end
+		end
+	end,
+}
diff --git a/.config/nvim/lua/plugins/lspkind.lua b/.config/nvim/lua/plugins/lspkind.lua
new file mode 100644
index 0000000..bbd0f38
--- /dev/null
+++ b/.config/nvim/lua/plugins/lspkind.lua
@@ -0,0 +1 @@
+return { "onsails/lspkind.nvim" }
diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
new file mode 100644
index 0000000..6af0173
--- /dev/null
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -0,0 +1,90 @@
+return {
+	"nvim-lualine/lualine.nvim",
+	config = function()
+		require("lualine").setup({
+			options = {
+				icons_enabled = true,
+				theme = "catppuccin",
+				-- theme = 'dracula',
+				-- theme = 'horizon',
+				-- theme = 'onedark',
+				component_separators = { left = "", right = "" },
+				section_separators = { left = "", right = "" },
+				disabled_filetypes = {},
+				always_divide_middle = true,
+			},
+			sections = {
+				lualine_a = { "mode" },
+				lualine_b = { "branch", "diff" },
+				lualine_c = { "filename" },
+				lualine_x = {
+					{
+						"seachcount",
+						{ require("mcphub.extensions.lualine") },
+						"copilot",
+						symbols = {
+							status = {
+								icons = {
+									enabled = " ",
+									sleep = " ", -- auto-trigger disabled
+									disabled = " ",
+									warning = " ",
+									unknown = " ",
+								},
+								hl = {
+									enabled = "#50FA7B",
+									sleep = "#AEB7D0",
+									disabled = "#6272A4",
+									warning = "#FFB86C",
+									unknown = "#FF5555",
+								},
+							},
+							spinners = "dots", -- has some premade spinners
+							spinner_color = "#6272A4",
+						},
+						show_colors = true,
+						show_loading = true,
+					},
+					{
+						"diagnostics",
+						"fileformat",
+						symbols = {
+							unix = "", -- e712
+							dos = "", -- e70f
+							mac = "", -- e711
+						},
+					},
+					"encoding",
+					"fileformat",
+					{ "filetype", colored = true, icon_only = false },
+				},
+				lualine_y = { "progress" },
+				lualine_z = { "location" },
+			},
+			inactive_sections = {
+				lualine_a = {},
+				lualine_b = {},
+				lualine_c = {
+					{
+						"filename",
+						file_status = true, -- Displays file status (readonly status, modified status)
+						path = 0, -- 0: Just the filename
+						shorting_target = 40, -- Shortens path to leave 40 spaces in the window
+						symbols = {
+							modified = "[+]", -- Text to show when the file is modified.
+							readonly = "[-]", -- Text to show when the file is non-modifiable or readonly.
+							unnamed = "[No Name]", -- Text to show for unnamed buffers.
+						},
+					},
+					M,
+				},
+				lualine_x = { "location" },
+				lualine_y = {},
+				lualine_z = {},
+			},
+			tabline = {},
+			extensions = { "quickfix", "fzf", "nvim-tree", "symbols-outline", "fugitive", "toggleterm", "man" },
+		})
+	end,
+	depends = { "kyazdani42/nvim-web-devicons" },
+}
diff --git a/.config/nvim/lua/plugins/luasnip.lua b/.config/nvim/lua/plugins/luasnip.lua
new file mode 100644
index 0000000..4b223c3
--- /dev/null
+++ b/.config/nvim/lua/plugins/luasnip.lua
@@ -0,0 +1,7 @@
+return {
+	"L3MON4D3/LuaSnip",
+	-- follow latest release.
+	version = "v2.*", -- Replace <CurrentMajor> by the latest released major (first number of latest release)
+	-- install jsregexp (optional!).
+	build = "make install_jsregexp",
+}
diff --git a/.config/nvim/lua/plugins/mcphub.lua b/.config/nvim/lua/plugins/mcphub.lua
new file mode 100644
index 0000000..813e916
--- /dev/null
+++ b/.config/nvim/lua/plugins/mcphub.lua
@@ -0,0 +1,51 @@
+return {
+	"ravitemer/mcphub.nvim",
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+	},
+	cmd = "MCPHub",
+	build = "bundled_build.lua", -- Bundles mcp-hub locally
+	config = function()
+		vim.notify = require("notify")
+		require("mcphub").setup({
+			use_bundled_binary = true, -- Use local binary
+			port = 37373, -- Port for MCP Hub Express API
+			config = vim.fn.expand("~/.config/mcphub/servers.json"), -- Config file path
+			native_servers = {}, -- add your native servers here
+			auto_approve = true,
+			extensions = {
+				avante = {},
+				codecompanion = {
+					show_result_in_chat = true, -- Show tool results in chat
+					make_vars = true, -- Create chat variables from resources
+					make_slash_commands = true, -- make /slash_commands from MCP server prompts
+				},
+			},
+
+			-- UI configuration
+			ui = {
+				window = {
+					width = 0.8, -- Window width (0-1 ratio)
+					height = 0.8, -- Window height (0-1 ratio)
+					border = "rounded", -- Window border style
+					relative = "editor", -- Window positioning
+					zindex = 50, -- Window stack order
+				},
+			},
+
+			-- Event callbacks
+			on_ready = function(hub) end, -- Called when hub is ready
+			on_error = function(err)
+				vim.notify(err, "ERROR")
+			end, -- Called on errors
+
+			-- Logging configuration
+			log = {
+				level = vim.log.levels.WARN, -- Minimum log level
+				to_file = false, -- Enable file logging
+				file_path = nil, -- Custom log file path
+				prefix = "MCPHub", -- Log message prefix
+			},
+		})
+	end,
+}
diff --git a/.config/nvim/lua/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua
new file mode 100644
index 0000000..456b3d9
--- /dev/null
+++ b/.config/nvim/lua/plugins/mini.lua
@@ -0,0 +1,63 @@
+return {
+	"echasnovski/mini.diff",
+	depends = { "echasnovski/mini.nvim" },
+	opts = {
+
+		-- Options for how hunks are visualized
+		view = {
+			-- Visualization style. Possible values are 'sign' and 'number'.
+			-- Default: 'number' if line numbers are enabled, 'sign' otherwise.
+			style = vim.go.number and "number" or "sign",
+
+			-- Signs used for hunks with 'sign' view
+			signs = { add = "▒", change = "▒", delete = "▒" },
+
+			-- Priority of used visualization extmarks
+			priority = 199,
+		},
+
+		-- Source for how reference text is computed/updated/etc
+		-- Uses content from Git index by default
+		source = nil,
+
+		-- Delays (in ms) defining asynchronous processes
+		delay = {
+			-- How much to wait before update following every text change
+			text_change = 200,
+		},
+
+		-- Module mappings. Use `''` (empty string) to disable one.
+		mappings = {
+			-- Apply hunks inside a visual/operator region
+			apply = "gh",
+
+			-- Reset hunks inside a visual/operator region
+			reset = "gH",
+
+			-- Hunk range textobject to be used inside operator
+			-- Works also in Visual mode if mapping differs from apply and reset
+			textobject = "gh",
+
+			-- Go to hunk range in corresponding direction
+			goto_first = "[H",
+			goto_prev = "[h",
+			goto_next = "]h",
+			goto_last = "]H",
+		},
+
+		-- Various options
+		options = {
+			-- Diff algorithm. See `:h vim.diff()`.
+			algorithm = "histogram",
+
+			-- Whether to use "indent heuristic". See `:h vim.diff()`.
+			indent_heuristic = true,
+
+			-- The amount of second-stage diff to align lines (in Neovim>=0.9)
+			linematch = 60,
+
+			-- Whether to wrap around edges during hunk navigation
+			wrap_goto = false,
+		},
+	},
+}
diff --git a/.config/nvim/lua/plugins/nio.lua b/.config/nvim/lua/plugins/nio.lua
new file mode 100644
index 0000000..a8f5d15
--- /dev/null
+++ b/.config/nvim/lua/plugins/nio.lua
@@ -0,0 +1 @@
+return { "nvim-neotest/nvim-nio" }
diff --git a/.config/nvim/lua/plugins/noice.lua b/.config/nvim/lua/plugins/noice.lua
new file mode 100644
index 0000000..536fd2c
--- /dev/null
+++ b/.config/nvim/lua/plugins/noice.lua
@@ -0,0 +1,93 @@
+return {
+	"folke/noice.nvim",
+	event = "VeryLazy",
+	opts = {
+		lsp = {
+			progress = {
+				enabled = true,
+				-- Lsp Progress is formatted using the builtins for lsp_progress. See config.format.builtin
+				-- See the section on formatting for more details on how to customize.
+				--- @type NoiceFormat|string
+				format = "lsp_progress",
+				--- @type NoiceFormat|string
+				format_done = "lsp_progress_done",
+				throttle = 1000 / 30, -- frequency to update lsp progress message
+				view = "mini",
+			},
+			-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
+			override = {
+				["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+				["vim.lsp.util.stylize_markdown"] = true,
+				["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
+			},
+			hover = {
+				enabled = false,
+				silent = false, -- set to true to not show a message if hover is not available
+				view = "split", -- when nil, use defaults from documentation
+				---@type NoiceViewOptions
+				opts = {}, -- merged with defaults from documentation
+			},
+			signature = {
+				enabled = true,
+				auto_open = {
+					enabled = false,
+					trigger = true, -- Automatically show signature help when typing a trigger character from the LSP
+					luasnip = true, -- Will open signature help when jumping to Luasnip insert nodes
+					throttle = 50, -- Debounce lsp signature help request by 50ms
+				},
+				view = nil, -- when nil, use defaults from documentation
+				---@type NoiceViewOptions
+				opts = {}, -- merged with defaults from documentation
+			},
+		},
+		-- you can enable a preset for easier configuration
+		presets = {
+			bottom_search = true, -- use a classic bottom cmdline for search
+			command_palette = true, -- position the cmdline and popupmenu together
+			long_message_to_split = true, -- long messages will be sent to a split
+			inc_rename = false, -- enables an input dialog for inc-rename.nvim
+			lsp_doc_border = true, -- add a border to hover docs and signature help
+		},
+		cmdline = {
+			enabled = true, -- enables the Noice cmdline UI
+			view = "cmdline_popup", -- view for rendering the cmdline. Change to `cmdline` to get a classic cmdline at the bottom
+			opts = {}, -- global options for the cmdline. See section on views
+			---@type table<string, CmdlineFormat>
+			format = {
+				-- conceal: (default=true) This will hide the text in the cmdline that matches the pattern.
+				-- view: (default is cmdline view)
+				-- opts: any options passed to the view
+				-- icon_hl_group: optional hl_group for the icon
+				-- title: set to anything or empty string to hide
+				cmdline = { pattern = "^:", icon = "", lang = "vim" },
+				search_down = { kind = "search", pattern = "^/", icon = " ", lang = "regex" },
+				search_up = { kind = "search", pattern = "^%?", icon = " ", lang = "regex" },
+				filter = { pattern = "^:%s*!", icon = "$", lang = "bash" },
+				lua = { pattern = { "^:%s*lua%s+", "^:%s*lua%s*=%s*", "^:%s*=%s*" }, icon = "", lang = "lua" },
+				help = { pattern = "^:%s*he?l?p?%s+", icon = "" },
+				input = { view = "cmdline_input", icon = "󰥻 " }, -- Used by input()
+				-- lua = false, -- to disable a format, set to `false`
+			},
+		},
+		views = {
+			cmdline_popup = {
+				border = {
+					style = "none",
+					padding = { 0, 0 },
+				},
+				filter_options = {},
+				win_options = {
+					winhighlight = "NormalFloat:NormalFloat,FloatBorder:FloatBorder",
+				},
+			},
+		},
+	},
+	dependencies = {
+		-- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
+		"MunifTanjim/nui.nvim",
+		-- OPTIONAL:
+		--   `nvim-notify` is only needed, if you want to use the notification view.
+		--   If not available, we use `mini` as the fallback
+		"rcarriga/nvim-notify",
+	},
+}
diff --git a/.config/nvim/lua/plugins/none-ls.lua b/.config/nvim/lua/plugins/none-ls.lua
new file mode 100644
index 0000000..0ce8b01
--- /dev/null
+++ b/.config/nvim/lua/plugins/none-ls.lua
@@ -0,0 +1,73 @@
+return {
+	"nvimtools/none-ls.nvim",
+	config = function()
+		local null_ls = require("null-ls")
+		local helpers = require("null-ls.helpers")
+		-- syncronous formatting
+		local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
+
+		-- null_ls.setup({
+		-- on_attach = function(client)
+		--     if client.supports_method "textDocument/formatting" then
+		--         vim.cmd([[
+		--         augroup LspFormatting
+		--             autocmd! * <buffer>
+		--             autocmd BufWritePre <buffer> lua vim.lsp.buf.format()
+		--         augroup END
+		--         ]])
+		--     end
+		-- end,
+		-- })
+		-- you can reuse a shared lspconfig on_attach callback here
+
+		require("null-ls").setup({
+			on_attach = function(client, bufnr)
+				if client.supports_method("textDocument/formatting") then
+					vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+					vim.api.nvim_create_autocmd("BufWritePre", {
+						group = augroup,
+						buffer = bufnr,
+						callback = function()
+							-- on 0.8, you should use vim.lsp.buf.format({ bufnr = bufnr }) instead
+							-- on later neovim version, you should use vim.lsp.buf.format({ async = false }) instead
+							-- vim.lsp.buf.formatting_sync()
+							vim.lsp.buf.format({
+								async = false,
+								bufnr = bufnr,
+								filter = function(client)
+									return client.name == "null-ls"
+								end,
+							})
+						end,
+					})
+				end
+			end,
+			sources = {
+				null_ls.builtins.completion.luasnip,
+				null_ls.builtins.formatting.black,
+				null_ls.builtins.formatting.isort,
+				null_ls.builtins.diagnostics.mypy,
+				null_ls.builtins.diagnostics.markdownlint,
+				null_ls.builtins.diagnostics.pylint,
+				-- null_ls.builtins.diagnostics.pydocstyle.with({
+				-- 	extra_arags = { "--config=$ROOT/setup.cfg" },
+				-- }),
+				-- null_ls.builtins.diagnostics.pydoclint,
+				null_ls.builtins.formatting.stylua,
+				-- null_ls.builtins.formatting.stylua.with({
+				-- 	extra_args = { '--config-path', vim.fn.expand('~/.config/stylua.toml') },
+				-- }),
+				null_ls.builtins.formatting.markdownlint,
+				null_ls.builtins.formatting.prettier, -- handled by lsp server
+				null_ls.builtins.formatting.shfmt.with({
+					filetypes = { "sh", "bash" },
+					extra_args = { "-i", "0", "-ci", "-sr" },
+				}),
+				null_ls.builtins.formatting.gofmt,
+				null_ls.builtins.formatting.goimports,
+				null_ls.builtins.formatting.goimports_reviser,
+				-- null_ls.builtins.diagnostics.actionlint,
+			},
+		})
+	end,
+}
diff --git a/.config/nvim/lua/plugins/notify.lua b/.config/nvim/lua/plugins/notify.lua
new file mode 100644
index 0000000..f40ecc8
--- /dev/null
+++ b/.config/nvim/lua/plugins/notify.lua
@@ -0,0 +1,20 @@
+return {
+	"rcarriga/nvim-notify",
+	opts = {
+		background_colour = "#000000",
+		fps = 144,
+		icons = {
+			DEBUG = "",
+			ERROR = "",
+			INFO = "",
+			TRACE = "✎",
+			WARN = "",
+		},
+		level = 2,
+		minimum_width = 50,
+		render = "default",
+		stages = "fade_in_slide_out",
+		timeout = 3000,
+		top_down = true,
+	},
+}
diff --git a/.config/nvim/lua/plugins/nui.lua b/.config/nvim/lua/plugins/nui.lua
new file mode 100644
index 0000000..9b56f29
--- /dev/null
+++ b/.config/nvim/lua/plugins/nui.lua
@@ -0,0 +1 @@
+return { "MunifTanjim/nui.nvim" }
diff --git a/.config/nvim/lua/plugins/nvim-autopairs.lua b/.config/nvim/lua/plugins/nvim-autopairs.lua
new file mode 100644
index 0000000..c80fd3d
--- /dev/null
+++ b/.config/nvim/lua/plugins/nvim-autopairs.lua
@@ -0,0 +1,26 @@
+return {
+	"windwp/nvim-autopairs",
+	event = "InsertEnter",
+	config = true,
+	opts = {
+		enabled = function(bufnr)
+			return true
+		end,
+		disable_filetype = { "TelescopePrompt", "spectre_panel" },
+		disable_in_macro = true, -- disable when recording or executing a macro
+		disable_in_visualblock = false, -- disable when insert after visual block mode
+		disable_in_replace_mode = true,
+		ignored_next_char = [=[[%w%%%'%[%"%.%`%$]]=],
+		enable_moveright = true,
+		enable_afterquote = true, -- add bracket pairs after quote
+		enable_check_bracket_line = true, --- check bracket in same line
+		enable_bracket_in_quote = true, --
+		enable_abbr = false, -- trigger abbreviation
+		break_undo = true, -- switch for basic rule break undo sequence
+		check_ts = false,
+		map_cr = true,
+		map_bs = true, -- map the <BS> key
+		map_c_h = false, -- Map the <C-h> key to delete a pair
+		map_c_w = false, -- map <c-w> to delete a pair if possible
+	},
+}
diff --git a/.config/nvim/lua/plugins/nvim-cmp.lua b/.config/nvim/lua/plugins/nvim-cmp.lua
new file mode 100644
index 0000000..6036b76
--- /dev/null
+++ b/.config/nvim/lua/plugins/nvim-cmp.lua
@@ -0,0 +1,263 @@
+return {
+	"hrsh7th/nvim-cmp",
+	dependencies = {
+		"saadparwaiz1/cmp_luasnip",
+		"hrsh7th/cmp-buffer",
+		"hrsh7th/cmp-cmdline",
+		"hrsh7th/cmp-nvim-lsp-signature-help",
+		"hrsh7th/cmp-nvim-lsp-document-symbol",
+		-- "hrsh7th/cmp-nvim-lsp",
+		-- "hrsh7th/cmp-path",
+		"rafamadriz/friendly-snippets",
+		"Jezda1337/nvim-html-css",
+		"https://codeberg.org/FelipeLema/cmp-async-path",
+	},
+	config = function()
+		-- Setup nvim-cmp.
+		local cmp = require("cmp")
+		local lspkind = require("lspkind")
+		-- luasnip setup
+		local luasnip = require("luasnip")
+
+		local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+
+		local has_words_before = function()
+			if vim.api.nvim_buf_get_option(0, "buftype") == "prompt" then
+				return false
+			end
+			local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+			return col ~= 0 and vim.api.nvim_buf_get_text(0, line - 1, 0, line - 1, col, {})[1]:match("^%s*$") == nil
+		end
+		require("luasnip.loaders.from_vscode").lazy_load()
+
+		lspkind.init({ symbol_map = { Copilot = "" } })
+
+		cmp.setup.cmdline("/", {
+			mapping = cmp.mapping.preset.cmdline(),
+			sources = cmp.config.sources({
+				{ name = "nvim_lsp_document_symbol" },
+			}, {
+				{ name = "buffer" },
+			}),
+		})
+
+		cmp.setup.cmdline(":", {
+			mapping = cmp.mapping.preset.cmdline(),
+			sources = cmp.config.sources({ { name = "path" } }, {
+				{ name = "cmdline", option = { ignore_cmds = { "Man", "!" } } },
+			}),
+			matching = { disallow_symbol_nonprefix_matching = false },
+		})
+
+		cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
+
+		require("cmp").setup({
+			snippet = {
+				expand = function(args)
+					-- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+					luasnip.lsp_expand(args.body) -- For `luasnip` users.
+					-- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+					-- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+				end,
+			},
+			mapping = {
+				["<C-p>"] = cmp.mapping(function(fallback)
+					if cmp.visible() then
+						cmp.select_prev_item()
+					elseif luasnip.expand_or_jumpable() then
+						luasnip.expand_or_jump()
+					elseif has_words_before() then
+						cmp.complete()
+					else
+						fallback()
+					end
+				end, { "i", "s" }),
+				["<C-n>"] = cmp.mapping(function(fallback)
+					if cmp.visible() then
+						cmp.select_next_item()
+					elseif luasnip.expand_or_jumpable() then
+						luasnip.expand_or_jump()
+					elseif has_words_before() then
+						cmp.complete()
+					else
+						fallback()
+					end
+				end, { "i", "s" }),
+				["<C-b>"] = cmp.mapping.scroll_docs(-4),
+				["<C-f>"] = cmp.mapping.scroll_docs(4),
+				["<C-Space>"] = cmp.mapping.complete(),
+				["<C-e>"] = cmp.mapping.abort(),
+				["<CR>"] = cmp.mapping.confirm({
+					behavior = cmp.ConfirmBehavior.Replace,
+					select = false,
+				}),
+				["<Tab>"] = cmp.mapping(function(fallback)
+					if cmp.visible() and has_words_before() then
+						cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
+					elseif luasnip.locally_jumpable(1) then
+						luasnip.jump(1)
+					else
+						fallback()
+					end
+				end, { "i", "s" }),
+				["<S-Tab>"] = cmp.mapping(function(fallback)
+					if cmp.visible() then
+						cmp.select_prev_item()
+					elseif luasnip.locally_jumpable(-1) then
+						luasnip.jump(-1)
+					else
+						fallback()
+					end
+				end, { "i", "s" }),
+			},
+			window = {
+				completion = {
+					-- winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None",
+					col_offset = 0,
+					side_padding = 0,
+					border = "rounded",
+					borderchars = {
+						"─",
+						"│",
+						"─",
+						"│",
+						"╭",
+						"╮",
+						"╯",
+						"╰",
+					},
+				},
+				documentation = {
+					border = "rounded",
+					borderchars = {
+						"─",
+						"│",
+						"─",
+						"│",
+						"╭",
+						"╮",
+						"╯",
+						"╰",
+					},
+					-- padding = 15,
+				},
+			},
+			formatting = {
+				-- options: 'text', 'text_symbol', 'symbol_text', 'symbol'
+				-- mode = 'symbol_text',
+				fields = { "kind", "abbr", "menu" },
+				expandable_indicator = true,
+				format = function(entry, vim_item)
+					local kind = require("lspkind").cmp_format({
+						mode = "symbol_text",
+						-- mode = "symbol",
+						maxwidth = 75,
+						symbol_map = {
+							Copilot = "  ",
+							Text = "  ",
+							Method = "  ",
+							Function = "  ",
+							Constructor = "  ",
+							Field = "  ",
+							Variable = "  ",
+							Class = "  ",
+							Interface = "  ",
+							Module = "  ",
+							Property = "  ",
+							Unit = "  ",
+							Value = "  ",
+							Enum = "  ",
+							Keyword = "  ",
+							Snippet = "  ",
+							Color = "  ",
+							File = "  ",
+							Reference = "  ",
+							Folder = "  ",
+							EnumMember = "  ",
+							Constant = "  ",
+							Struct = "  ",
+							Event = "  ",
+							Operator = "  ",
+							TypeParameter = "  ",
+						},
+					})(entry, vim_item)
+					local strings = vim.split(kind.kind, "%s", { trimempty = true })
+					kind.kind = " " .. strings[1] .. " "
+					kind.menu = "    (" .. strings[2] .. ")"
+
+					return kind
+				end,
+			},
+			sources = cmp.config.sources({
+				{ name = "nvim_lsp_signature_help", group_index = 0 },
+				{ name = "lazydev", group_index = 0 },
+				{ name = "nvim_lsp", group_index = 1 },
+				{ name = "copilot", group_index = 1 },
+				{ name = "codecompanion", group_index = 2 },
+				{ name = "async_path", group_index = 2 },
+				-- { name = "path", group_index = 2 },
+				-- { name = "cmdline", option = { ignore_cmds = { "Man", "!" } } },
+				{ name = "nvim_lsp_document_symbol", group_index = 2 },
+				{ name = "luasnip", group_index = 2 }, -- For luasnip users.
+				{ name = "render-markdown", group_index = 2 },
+				{
+					name = "html-css",
+					group_indx = 2,
+					option = {
+						enable_on = { "html", "jsx", "tsx", "typescript", "typescriptreact" }, -- html is enabled by default
+						notify = false,
+						documentation = {
+							auto_show = true, -- show documentation on select
+						},
+						-- add any external scss like one below
+						style_sheets = {
+							"https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css",
+							"https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css",
+						},
+					},
+				},
+				{
+					name = "buffer",
+					option = {
+						get_bufnrs = function()
+							local bufs = {}
+							for _, win in ipairs(vim.api.nvim_list_wins()) do
+								bufs[vim.api.nvim_win_get_buf(win)] = true
+							end
+							return vim.tbl_keys(bufs)
+						end,
+					},
+				},
+				-- { name = 'ultisnips' }, -- For ultisnips users.
+				-- { name = 'snippy' }, -- For snippy users.
+			}, { { name = "buffer" } }),
+			sorting = {
+				priority_weight = 2,
+				comparators = {
+					require("copilot_cmp.comparators").prioritize,
+					cmp.config.compare.offset,
+					cmp.config.compare.exact,
+					require("copilot_cmp.comparators").score,
+					require("copilot_cmp.comparators").recently_used,
+					cmp.config.compare.locality,
+					require("copilot_cmp.comparators").kind,
+					require("copilot_cmp.comparators").sort_text,
+					require("copilot_cmp.comparators").length,
+					require("copilot_cmp.comparators").order,
+
+					-- Below is the default comparitor list and order for nvim-cmp
+					cmp.config.compare.offset,
+					-- cmp.config.compare.scopes, --this is commented in nvim-cmp too
+					cmp.config.compare.exact,
+					cmp.config.compare.score,
+					cmp.config.compare.recently_used,
+					cmp.config.compare.locality,
+					cmp.config.compare.kind,
+					cmp.config.compare.sort_text,
+					cmp.config.compare.length,
+					cmp.config.compare.order,
+				},
+			},
+		})
+	end,
+}
diff --git a/.config/nvim/lua/plugins/nvim-colorizer.lua b/.config/nvim/lua/plugins/nvim-colorizer.lua
new file mode 100644
index 0000000..dee6b43
--- /dev/null
+++ b/.config/nvim/lua/plugins/nvim-colorizer.lua
@@ -0,0 +1,6 @@
+return {
+	"norcalli/nvim-colorizer.lua",
+	config = function()
+		require("colorizer").setup()
+	end,
+}
diff --git a/.config/nvim/lua/plugins/nvim-lint.lua b/.config/nvim/lua/plugins/nvim-lint.lua
new file mode 100644
index 0000000..f09516c
--- /dev/null
+++ b/.config/nvim/lua/plugins/nvim-lint.lua
@@ -0,0 +1,34 @@
+return {
+	"mfussenegger/nvim-lint",
+	config = function()
+		local lint = require("lint")
+		lint.linters_by_ft = {
+			markdown = { "markdownlint" },
+			lua = { "luacheck" },
+			py = { "flake8", "pylint", "pydocstyle", "pycodestyle", "mypy" },
+			sh = { "shellcheck" },
+			json = { "jsonlint" },
+			yaml = { "yamllint" },
+			vim = { "vint" },
+			go = { "golangcilint" },
+		}
+		local shellcheck = require("lint").linters.shellcheck
+		shellcheck.args = {
+			"-s",
+			"bash",
+			"-o",
+			"all",
+			"-e",
+			"2250",
+		}
+		local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
+
+		vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
+			group = lint_augroup,
+			callback = function()
+				lint.try_lint()
+			end,
+		})
+	end,
+	event = { "BufReadPre", "BufNewFile" },
+}
diff --git a/.config/nvim/lua/plugins/nvim-tree.lua b/.config/nvim/lua/plugins/nvim-tree.lua
new file mode 100644
index 0000000..ec6fb2f
--- /dev/null
+++ b/.config/nvim/lua/plugins/nvim-tree.lua
@@ -0,0 +1,11 @@
+return {
+	"nvim-tree/nvim-tree.lua",
+	version = "*",
+	lazy = false,
+	dependencies = {
+		"nvim-tree/nvim-web-devicons",
+	},
+	config = function()
+		require("nvim-tree").setup({})
+	end,
+}
diff --git a/.config/nvim/lua/plugins/nvim-treesitter-context.lua b/.config/nvim/lua/plugins/nvim-treesitter-context.lua
new file mode 100644
index 0000000..511dedb
--- /dev/null
+++ b/.config/nvim/lua/plugins/nvim-treesitter-context.lua
@@ -0,0 +1 @@
+return { "nvim-treesitter/nvim-treesitter-context" }
diff --git a/.config/nvim/lua/plugins/obsidian.lua b/.config/nvim/lua/plugins/obsidian.lua
new file mode 100644
index 0000000..9e653f5
--- /dev/null
+++ b/.config/nvim/lua/plugins/obsidian.lua
@@ -0,0 +1,102 @@
+vim.notify = require("notify")
+return {
+	"epwalsh/obsidian.nvim",
+	version = "*", -- recommended, use latest release instead of latest commit
+	lazy = true,
+	ft = "markdown",
+	-- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault:
+	-- event = {
+	--   -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'.
+	--   -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md"
+	--   -- refer to `:h file-pattern` for more examples
+	--   "BufReadPre path/to/my-vault/*.md",
+	--   "BufNewFile path/to/my-vault/*.md",
+	-- },
+	dependencies = {
+		-- Required.
+		"nvim-lua/plenary.nvim",
+
+		-- see below for full list of optional dependencies 👇
+	},
+	opts = {
+		workspaces = {
+			{
+				name = "vault",
+				path = "~/S/obsidian/Vault",
+			},
+			-- {
+			-- 	name = "work",
+			-- 	path = "~/vaults/work",
+			-- },
+		},
+		completion = {
+			-- Set to false to disable completion.
+			nvim_cmp = true,
+			-- Trigger completion at 2 chars.
+			min_chars = 2,
+		},
+		-- Optional, configure additional syntax highlighting / extmarks.
+		-- This requires you have `conceallevel` set to 1 or 2. See `:help conceallevel` for more details.
+		ui = {
+			enable = true, -- set to false to disable all additional syntax features
+			update_debounce = 200, -- update delay after a text change (in milliseconds)
+			max_file_length = 5000, -- disable UI features for files with more than this many lines
+			-- Define how various check-boxes are displayed
+			checkboxes = {
+				-- NOTE: the 'char' value has to be a single character, and the highlight groups are defined below.
+				[" "] = { char = "󰄱", hl_group = "ObsidianTodo" },
+				["x"] = { char = "", hl_group = "ObsidianDone" },
+				[">"] = { char = "", hl_group = "ObsidianRightArrow" },
+				["~"] = { char = "󰰱", hl_group = "ObsidianTilde" },
+				["!"] = { char = "", hl_group = "ObsidianImportant" },
+				-- Replace the above with this if you don't have a patched font:
+				-- [" "] = { char = "☐", hl_group = "ObsidianTodo" },
+				-- ["x"] = { char = "✔", hl_group = "ObsidianDone" },
+
+				-- You can also add more custom ones...
+			},
+		},
+		attachments = {
+			-- The default folder to place images in via `:ObsidianPasteImg`.
+			-- If this is a relative path it will be interpreted as relative to the vault root.
+			-- You can always override this per image by passing a full path to the command instead of just a filename.
+			img_folder = "screenshots", -- This is the default
+
+			-- Optional, customize the default name or prefix when pasting images via `:ObsidianPasteImg`.
+			---@return string
+			img_name_func = function()
+				-- Prefix image names with timestamp.
+				return string.format("%s-", os.time())
+			end,
+
+			-- A function that determines the text to insert in the note when pasting an image.
+			-- It takes two arguments, the `obsidian.Client` and an `obsidian.Path` to the image file.
+			-- This is the default implementation.
+			---@param client obsidian.Client
+			---@param path obsidian.Path the absolute path to the image file
+			---@return string
+			img_text_func = function(client, path)
+				path = client:vault_relative_path(path) or path
+				return string.format("![%s](%s)", path.name, path)
+			end,
+		},
+		-- Optional, by default when you use `:ObsidianFollowLink` on a link to an external
+		-- URL it will be ignored but you can customize this behavior here.
+		---@param url string
+		follow_url_func = function(url)
+			-- Open the URL in the default web browser.
+			vim.fn.jobstart({ "open", url }) -- Mac OS
+			-- vim.fn.jobstart({"xdg-open", url})  -- linux
+			-- vim.cmd(':silent exec "!start ' .. url .. '"') -- Windows
+			-- vim.ui.open(url) -- need Neovim 0.10.0+
+		end,
+		-- Optional, by default when you use `:ObsidianFollowLink` on a link to an image
+		-- file it will be ignored but you can customize this behavior here.
+		---@param img string
+		follow_img_func = function(url)
+			-- vim.fn.jobstart({ "qlmanage", "-p", img }) -- Mac OS quick look preview
+			vim.fn.jobstart({ "xdg-open", url }) -- linux
+			-- vim.cmd(':silent exec "!start ' .. url .. '"') -- Windows
+		end,
+	},
+}
diff --git a/.config/nvim/lua/plugins/odis.lua b/.config/nvim/lua/plugins/odis.lua
new file mode 100644
index 0000000..af5e990
--- /dev/null
+++ b/.config/nvim/lua/plugins/odis.lua
@@ -0,0 +1,52 @@
+return {
+	url = "https://gitea.suda.codes/sudacode/odis",
+	dependencies = {
+		"nvim-treesitter/nvim-treesitter",
+		"neovim/nvim-lspconfig",
+	},
+	opts = {
+		opts = {
+			display = {
+				default_mode = "vsplit",
+				picker = true,
+				float = {
+					maxwidth = 80,
+					maxheight = 40,
+					border = "rounded",
+					title = true,
+					style = "minimal",
+					auto_focus = true,
+					anchor = "bottom_right",
+					offset = { row = -2, col = -2 },
+				},
+				window = {
+					width = 0.4,
+					height = 0.25,
+					position = "bottom|right",
+					floating = false,
+					border = "none",
+				},
+			},
+			integrations = {
+				treesitter = {
+					enabled = true, -- Enable Treesitter integration
+					highlight = true, -- Enable syntax highlighting
+					langs = { -- Language mapping for different doc types
+						lsp = "markdown",
+						man = "man",
+						help = "vimdoc",
+					},
+				},
+			},
+			sources = {
+				lsp = { enabled = true },
+				vim = { enabled = true },
+				man = { enabled = true },
+			},
+			priority = { "LSP", "Vim", "Man" },
+			mappings = {
+				close = "<leader>dc",
+			},
+		},
+	},
+}
diff --git a/.config/nvim/lua/plugins/plenary.lua b/.config/nvim/lua/plugins/plenary.lua
new file mode 100644
index 0000000..dfc4697
--- /dev/null
+++ b/.config/nvim/lua/plugins/plenary.lua
@@ -0,0 +1,3 @@
+return {
+	"nvim-lua/plenary.nvim",
+}
diff --git a/.config/nvim/lua/plugins/presence.lua b/.config/nvim/lua/plugins/presence.lua
new file mode 100644
index 0000000..00c290e
--- /dev/null
+++ b/.config/nvim/lua/plugins/presence.lua
@@ -0,0 +1,25 @@
+return {
+	"andweeb/presence.nvim",
+	opts = {
+		-- General options
+		auto_update = true, -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`)
+		neovim_image_text = "The One True Text Editor", -- Text displayed when hovered over the Neovim image
+		main_image = "neovim", -- Main image display (either "neovim" or "file")
+		-- client_id           = "793271441293967371",       -- Use your own Discord application client id (not recommended)
+		log_level = nil, -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
+		debounce_timeout = 10, -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
+		enable_line_number = false, -- Displays the current line number instead of the current project
+		blacklist = {}, -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
+		buttons = true, -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table)
+		file_assets = {}, -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
+
+		-- Rich Presence text options
+		editing_text = "Editing %s", -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string)
+		file_explorer_text = "Browsing %s", -- Format string rendered when browsing a file explorer (either string or function(file_explorer_name: string): string)
+		git_commit_text = "Committing changes", -- Format string rendered when committing changes in git (either string or function(filename: string): string)
+		plugin_manager_text = "Managing plugins", -- Format string rendered when managing plugins (either string or function(plugin_manager_name: string): string)
+		reading_text = "Reading %s", -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
+		workspace_text = "Working on %s", -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
+		line_number_text = "Line %s out of %s", -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
+	},
+}
diff --git a/.config/nvim/lua/plugins/rainbow-delimeters.lua b/.config/nvim/lua/plugins/rainbow-delimeters.lua
new file mode 100644
index 0000000..94bb27a
--- /dev/null
+++ b/.config/nvim/lua/plugins/rainbow-delimeters.lua
@@ -0,0 +1,24 @@
+return {
+	"HiPhish/rainbow-delimiters.nvim",
+	config = function()
+		-- This module contains a number of default definitions
+		local rainbow_delimiters = require("rainbow-delimiters")
+
+		vim.g.rainbow_delimiters = {
+			strategy = {
+				[""] = rainbow_delimiters.strategy["global"],
+				vim = rainbow_delimiters.strategy["local"],
+			},
+			query = { [""] = "rainbow-delimiters", lua = "rainbow-blocks" },
+			highlight = {
+				"RainbowDelimiterRed",
+				"RainbowDelimiterYellow",
+				"RainbowDelimiterBlue",
+				"RainbowDelimiterOrange",
+				"RainbowDelimiterGreen",
+				"RainbowDelimiterViolet",
+				"RainbowDelimiterCyan",
+			},
+		}
+	end,
+}
diff --git a/.config/nvim/lua/plugins/render-markdown.lua b/.config/nvim/lua/plugins/render-markdown.lua
new file mode 100644
index 0000000..027c1d3
--- /dev/null
+++ b/.config/nvim/lua/plugins/render-markdown.lua
@@ -0,0 +1,197 @@
+return {
+	"MeanderingProgrammer/render-markdown.nvim",
+	dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite
+	ft = { "markdown", "codecompanion", "lsp" },
+	-- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins
+	-- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
+	---@module 'render-markdown'
+	---@type render.md.UserConfig
+	opts = {
+		injections = {
+			gitcommit = {
+				enabled = true,
+				query = [[
+                            ((message) @injection.content
+                                (#set! injection.combined)
+                                (#set! injection.include-children)
+                                (#set! injection.language "markdown"))
+                        ]],
+			},
+		},
+		heading = {
+			enabled = true,
+			render_modes = false,
+			sign = true,
+			icons = { "󰲡 ", "󰲣 ", "󰲥 ", "󰲧 ", "󰲩 ", "󰲫 " },
+			position = "overlay",
+			signs = { "󰫎 " },
+			width = "full",
+			left_margin = 0,
+			left_pad = 0,
+			right_pad = 0,
+			min_width = 0,
+			border = false,
+			border_virtual = false,
+			border_prefix = false,
+			-- above = "▄",
+			-- below = "▀",
+			backgrounds = {
+				"RenderMarkdownH1Bg",
+				"RenderMarkdownH2Bg",
+				"RenderMarkdownH3Bg",
+				"RenderMarkdownH4Bg",
+				"RenderMarkdownH5Bg",
+				"RenderMarkdownH6Bg",
+			},
+			foregrounds = {
+				"RenderMarkdownH1",
+				"RenderMarkdownH2",
+				"RenderMarkdownH3",
+				"RenderMarkdownH4",
+				"RenderMarkdownH5",
+				"RenderMarkdownH6",
+			},
+			custom = {},
+		},
+		code = {
+			enabled = true,
+			render_modes = false,
+			sign = true,
+			style = "full",
+			position = "left",
+			language_pad = 0,
+			language_name = true,
+			disable_background = { "diff" },
+			width = "full",
+			left_margin = 0,
+			left_pad = 0,
+			right_pad = 0,
+			min_width = 0,
+			border = "thin",
+			above = "▄",
+			below = "▀",
+			highlight = "RenderMarkdownCode",
+			highlight_language = nil,
+			inline_pad = 0,
+			highlight_inline = "RenderMarkdownCodeInline",
+		},
+		bullet = {
+			enabled = true,
+			render_modes = false,
+			icons = { "●", "○", "◆", "◇" },
+			ordered_icons = function(ctx)
+				local value = vim.trim(ctx.value)
+				local index = tonumber(value:sub(1, #value - 1))
+				return string.format("%d.", index > 1 and index or ctx.index)
+			end,
+			left_pad = 0,
+			right_pad = 0,
+			highlight = "RenderMarkdownBullet",
+		},
+		callout = {
+			note = { raw = "[!NOTE]", rendered = "󰋽 Note", highlight = "RenderMarkdownInfo" },
+			tip = { raw = "[!TIP]", rendered = "󰌶 Tip", highlight = "RenderMarkdownSuccess" },
+			important = { raw = "[!IMPORTANT]", rendered = "󰅾 Important", highlight = "RenderMarkdownHint" },
+			warning = { raw = "[!WARNING]", rendered = "󰀪 Warning", highlight = "RenderMarkdownWarn" },
+			caution = { raw = "[!CAUTION]", rendered = "󰳦 Caution", highlight = "RenderMarkdownError" },
+			abstract = { raw = "[!ABSTRACT]", rendered = "󰨸 Abstract", highlight = "RenderMarkdownInfo" },
+			summary = { raw = "[!SUMMARY]", rendered = "󰨸 Summary", highlight = "RenderMarkdownInfo" },
+			tldr = { raw = "[!TLDR]", rendered = "󰨸 Tldr", highlight = "RenderMarkdownInfo" },
+			info = { raw = "[!INFO]", rendered = "󰋽 Info", highlight = "RenderMarkdownInfo" },
+			todo = { raw = "[!TODO]", rendered = "󰗡 Todo", highlight = "RenderMarkdownInfo" },
+			hint = { raw = "[!HINT]", rendered = "󰌶 Hint", highlight = "RenderMarkdownSuccess" },
+			success = { raw = "[!SUCCESS]", rendered = "󰄬 Success", highlight = "RenderMarkdownSuccess" },
+			check = { raw = "[!CHECK]", rendered = "󰄬 Check", highlight = "RenderMarkdownSuccess" },
+			done = { raw = "[!DONE]", rendered = "󰄬 Done", highlight = "RenderMarkdownSuccess" },
+			question = { raw = "[!QUESTION]", rendered = "󰘥 Question", highlight = "RenderMarkdownWarn" },
+			help = { raw = "[!HELP]", rendered = "󰘥 Help", highlight = "RenderMarkdownWarn" },
+			faq = { raw = "[!FAQ]", rendered = "󰘥 Faq", highlight = "RenderMarkdownWarn" },
+			attention = { raw = "[!ATTENTION]", rendered = "󰀪 Attention", highlight = "RenderMarkdownWarn" },
+			failure = { raw = "[!FAILURE]", rendered = "󰅖 Failure", highlight = "RenderMarkdownError" },
+			fail = { raw = "[!FAIL]", rendered = "󰅖 Fail", highlight = "RenderMarkdownError" },
+			missing = { raw = "[!MISSING]", rendered = "󰅖 Missing", highlight = "RenderMarkdownError" },
+			danger = { raw = "[!DANGER]", rendered = "󱐌 Danger", highlight = "RenderMarkdownError" },
+			error = { raw = "[!ERROR]", rendered = "󱐌 Error", highlight = "RenderMarkdownError" },
+			bug = { raw = "[!BUG]", rendered = "󰨰 Bug", highlight = "RenderMarkdownError" },
+			example = { raw = "[!EXAMPLE]", rendered = "󰉹 Example", highlight = "RenderMarkdownHint" },
+			quote = { raw = "[!QUOTE]", rendered = "󱆨 Quote", highlight = "RenderMarkdownQuote" },
+			cite = { raw = "[!CITE]", rendered = "󱆨 Cite", highlight = "RenderMarkdownQuote" },
+		},
+		link = {
+			enabled = true,
+			render_modes = false,
+			footnote = {
+				superscript = true,
+				prefix = "",
+				suffix = "",
+			},
+			image = "󰋵 ",
+			email = " ",
+			hyperlink = "󰌹 ",
+			highlight = "RenderMarkdownLink",
+			wiki = { icon = "󱗖 ", highlight = "RenderMarkdownWikiLink" },
+			custom = {
+				web = { pattern = "^http", icon = "󰖟 " },
+				discord = { pattern = "discord%.com", icon = "󰙯 " },
+				github = { pattern = "github%.com", icon = "󰊤 " },
+				gitlab = { pattern = "gitlab%.com", icon = "󰮠 " },
+				google = { pattern = "google%.com", icon = "󰊭 " },
+				neovim = { pattern = "neovim%.io", icon = " " },
+				reddit = { pattern = "reddit%.com", icon = "󰑍 " },
+				stackoverflow = { pattern = "stackoverflow%.com", icon = "󰓌 " },
+				wikipedia = { pattern = "wikipedia%.org", icon = "󰖬 " },
+				youtube = { pattern = "youtube%.com", icon = "󰗃 " },
+				python = { pattern = "%.py$", icon = "󰌠 " },
+			},
+		},
+		pipe_table = {
+			enabled = true,
+			render_modes = false,
+			preset = "round",
+			style = "full",
+			cell = "padded",
+			padding = 1,
+			min_width = 0,
+			border = {
+				"┌",
+				"┬",
+				"┐",
+				"├",
+				"┼",
+				"┤",
+				"└",
+				"┴",
+				"┘",
+				"│",
+				"─",
+			},
+			alignment_indicator = "━",
+			head = "RenderMarkdownTableHead",
+			row = "RenderMarkdownTableRow",
+			filler = "RenderMarkdownTableFill",
+		},
+		checkbox = {
+			enabled = true,
+			render_modes = false,
+			position = "inline",
+			unchecked = {
+				icon = "󰄱 ",
+				highlight = "RenderMarkdownUnchecked",
+				scope_highlight = nil,
+			},
+			checked = {
+				icon = "󰱒 ",
+				highlight = "RenderMarkdownChecked",
+				scope_highlight = nil,
+			},
+			custom = {
+				todo = {
+					raw = "[-]",
+					rendered = "󰥔 ",
+					highlight = "RenderMarkdownTodo",
+					scope_highlight = nil,
+				},
+			},
+		},
+	},
+}
diff --git a/.config/nvim/lua/plugins/telescope-glyph.lua b/.config/nvim/lua/plugins/telescope-glyph.lua
new file mode 100644
index 0000000..b1fb112
--- /dev/null
+++ b/.config/nvim/lua/plugins/telescope-glyph.lua
@@ -0,0 +1,5 @@
+return {
+	"tpope/vim-commentary",
+	"tpope/vim-dotenv",
+	"tpope/vim-surround",
+}
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
new file mode 100644
index 0000000..5a18f2b
--- /dev/null
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -0,0 +1,123 @@
+return {
+	"nvim-telescope/telescope.nvim",
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+		-- "jonarrien/telescope-cmdline.nvim",
+		"nat-418/telescope-color-names.nvim",
+		"nvim-telescope/telescope-file-browser.nvim",
+		"ghassan0/telescope-glyph.nvim",
+		"nvim-telescope/telescope-ui-select.nvim",
+		{
+			"nvim-telescope/telescope-fzf-native.nvim",
+			build = "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release",
+		},
+		"folke/noice.nvim",
+	},
+	opts = {
+		defaults = {
+			-- Default configuration for telescope goes here:
+			-- config_key = value,
+			layout_strategy = "flex",
+			width = 0.9,
+			wrap_results = true,
+			preview = {
+				border = true,
+				borderchars = {
+					"─",
+					"│",
+					"─",
+					"│",
+					"╭",
+					"╮",
+					"╯",
+					"╰",
+				},
+				title = true,
+				dynamic_preview_title = true,
+				treesitter = true,
+			},
+			mappings = {
+				i = {
+					-- map actions.which_key to <C-h> (default: <C-/>)
+					-- actions.which_key shows the mappings for your picker,
+					-- e.g. git_{create, delete, ...}_branch for the git_branches picker
+					["<C-h>"] = "which_key",
+					["<C-u"] = false,
+				},
+			},
+			file_ignore_patterns = { "^node_modules/", "^env/", "^__pycache__/" },
+		},
+		pickers = {
+			-- Default configuration for builtin pickers goes here:
+			-- picker_name = {
+			--   picker_config_key = value,
+			--   ...
+			-- }
+			-- Now the picker_config_key will be applied every time you call this
+			-- builtin picker
+			find_files = {
+				-- theme = "dropdown"
+			},
+		},
+		extensions = {
+			fzf = {
+				fuzzy = true, -- false will only do exact matching
+				override_generic_sorter = true, -- override the generic sorter
+				override_file_sorter = true, -- override the file sorter
+				case_mode = "smart_case", -- or "ignore_case" or "respect_case"
+				-- the default case_mode is "smart_case"
+			},
+			glyph = {
+				action = function(glyph)
+					-- argument glyph is a table.
+					-- {name="", value="", category="", description=""}
+					-- vim.fn.setreg("*", glyph.value)
+					-- print([[Press p or "*p to paste this glyph]] .. glyph.value)
+					-- insert glyph when picked
+					vim.api.nvim_put({ glyph.value }, "c", false, true)
+				end,
+			},
+			cmdline = {
+				-- Adjust telescope picker size and layout
+				picker = {
+					layout_config = {
+						width = 120,
+						height = 25,
+					},
+				},
+				-- Adjust your mappings
+				mappings = {
+					complete = "<Tab>",
+					run_selection = "<C-CR>",
+					run_input = "<CR>",
+				},
+				-- Triggers any shell command using overseer.nvim (`:!`)
+				overseer = {
+					enabled = true,
+				},
+			},
+			file_browser = {
+				theme = "ivy",
+				-- disables netrw and use telescope-file-browser in its place
+				hijack_netrw = true,
+				mappings = {
+					["i"] = {
+						-- your custom insert mode mappings
+					},
+					["n"] = {
+						-- your custom normal mode mappings
+					},
+				},
+			},
+			["ui-select"] = {
+				require("telescope.themes").get_dropdown({
+					winblend = 10,
+					width = 0.5,
+					prompt = " ",
+					results_height = 15,
+					previewer = true,
+				}),
+			},
+		},
+	},
+}
diff --git a/.config/nvim/lua/plugins/toggleterm.lua b/.config/nvim/lua/plugins/toggleterm.lua
new file mode 100644
index 0000000..3a9d989
--- /dev/null
+++ b/.config/nvim/lua/plugins/toggleterm.lua
@@ -0,0 +1,85 @@
+return {
+	"akinsho/toggleterm.nvim",
+	version = "*",
+	opts = {
+		-- size can be a number or function which is passed the current terminal
+		size = function(term)
+			if term.direction == "horizontal" then
+				return 20
+			elseif term.direction == "vertical" then
+				return vim.o.columns * 0.45
+			end
+		end,
+		open_mapping = { [[<c-t>]] }, -- or { [[<c-\>]], [[<c-¥>]] } if you also use a Japanese keyboard.
+		-- on_create = fun(t: Terminal), -- function to run when the terminal is first created
+		-- on_open = fun(t: Terminal), -- function to run when the terminal opens
+		-- on_close = fun(t: Terminal), -- function to run when the terminal closes
+		-- on_stdout = fun(t: Terminal, job: number, data: string[], name: string) -- callback for processing output on stdout
+		-- on_stderr = fun(t: Terminal, job: number, data: string[], name: string) -- callback for processing output on stderr
+		-- on_exit = fun(t: Terminal, job: number, exit_code: number, name: string) -- function to run when terminal process exits
+		hide_numbers = true, -- hide the number column in toggleterm buffers
+		-- shade_filetypes = {},
+		autochdir = false, -- when neovim changes it current directory the terminal will change it's own when next it's opened
+		highlights = {
+			-- highlights which map to a highlight group name and a table of it's values
+			-- NOTE: this is only a subset of values, any group placed here will be set for the terminal window split
+			Normal = {
+				guibg = "#24273A",
+			},
+			NormalFloat = {
+				link = "Normal",
+			},
+			-- FloatBorder = {
+			--   guifg = "<VALUE-HERE>",
+			--   guibg = "<VALUE-HERE>",
+			-- },
+		},
+		shade_terminals = false, -- NOTE: this option takes priority over highlights specified so if you specify Normal highlights you should set this to false
+		-- shading_factor = '-10',   -- the percentage by which to lighten dark terminal background, default: -30
+		-- shading_ratio = '-3',     -- the ratio of shading factor for light/dark terminal background, default: -3
+		start_in_insert = true,
+		insert_mappings = true, -- whether or not the open mapping applies in insert mode
+		terminal_mappings = true, -- whether or not the open mapping applies in the opened terminals
+		persist_size = false,
+		persist_mode = true, -- if set to true (default) the previous terminal mode will be remembered
+		-- direction = 'vertical' | 'horizontal' | 'tab' | 'float',
+		direction = "float",
+		-- close_on_exit = true, -- close the terminal window when the process exits
+		-- clear_env = false, -- use only environmental variables from `env`, passed to jobstart()
+		-- Change the default shell. Can be a string or a function returning a string
+		shell = vim.o.shell,
+		auto_scroll = true, -- automatically scroll to the bottom on terminal output
+		-- This field is only relevant if direction is set to 'float'
+		float_opts = {
+			-- The border key is *almost* the same as 'nvim_open_win'
+			-- see :h nvim_open_win for details on borders however
+			-- the 'curved' border is a custom border type
+			-- not natively supported but implemented in this plugin.
+			-- border = 'single' | 'double' | 'shadow' | 'curved' | ... other options supported by win open
+			border = "curved",
+			-- like `size`, width, height, row, and col can be a number or function which is passed the current terminal
+			width = function()
+				return vim.o.columns - 35
+			end,
+			-- height = 75,
+			-- row = <value>,
+			-- col = vim.o.columns * 0.8,
+			winblend = 3,
+			zindex = 10,
+			-- title_pos = 'left' | 'center' | 'right', position of the title of the floating window
+			title_pos = "center",
+		},
+		winbar = {
+			enabled = false,
+			name_formatter = function(term) --  term: Terminal
+				return term.name
+			end,
+		},
+		responsiveness = {
+			-- breakpoint in terms of `vim.o.columns` at which terminals will start to stack on top of each other
+			-- instead of next to each other
+			-- default = 0 which means the feature is turned off
+			horizontal_breakpoint = 135,
+		},
+	},
+}
diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
new file mode 100644
index 0000000..8343a32
--- /dev/null
+++ b/.config/nvim/lua/plugins/treesitter.lua
@@ -0,0 +1,48 @@
+return {
+	"nvim-treesitter/nvim-treesitter",
+	build = ":TSUpdate",
+	config = function()
+		local configs = require("nvim-treesitter.configs")
+
+		configs.setup({
+			ensure_installed = {
+				"c",
+				"lua",
+				"vim",
+				"vimdoc",
+				"query",
+				"cpp",
+				"python",
+				"bash",
+				"sql",
+				"yaml",
+				"toml",
+				"dockerfile",
+				"gitcommit",
+				"gitignore",
+				"html",
+				"css",
+				"javascript",
+				"typescript",
+				"rust",
+				"go",
+				"json",
+				"regex",
+				"latex",
+				"comment",
+				"cmake",
+				"graphql",
+				"haskell",
+				"java",
+				"php",
+				"ruby",
+				"vue",
+				"markdown",
+				"markdown_inline",
+			},
+			sync_install = false,
+			highlight = { enable = true },
+			indent = { enable = true },
+		})
+	end,
+}
diff --git a/.config/nvim/lua/plugins/vim-commentary.lua b/.config/nvim/lua/plugins/vim-commentary.lua
new file mode 100644
index 0000000..db3b0cf
--- /dev/null
+++ b/.config/nvim/lua/plugins/vim-commentary.lua
@@ -0,0 +1 @@
+return { "tpope/vim-commentary" }
diff --git a/.config/nvim/lua/plugins/vim-wakatime.lua b/.config/nvim/lua/plugins/vim-wakatime.lua
new file mode 100644
index 0000000..0c9070e
--- /dev/null
+++ b/.config/nvim/lua/plugins/vim-wakatime.lua
@@ -0,0 +1 @@
+return { "wakatime/vim-wakatime" }
diff --git a/.config/nvim/lua/plugins/whichkey.lua b/.config/nvim/lua/plugins/whichkey.lua
new file mode 100644
index 0000000..1924bb1
--- /dev/null
+++ b/.config/nvim/lua/plugins/whichkey.lua
@@ -0,0 +1,144 @@
+return {
+	"folke/which-key.nvim",
+	opts = {},
+	-- config = function()
+	-- local wk = require("which-key")
+
+	-- wk.add({
+	-- 	{ "<leader>C", group = "CodeCompanion", desc = "CodeCompanion", icon = "󰭻" },
+	-- 	{ "<leader>Ca", desc = "CodeCompanion Actions" },
+	-- 	{ "<leader>Cc", desc = "CodeCompanionChat" },
+	-- 	{ "<leader>Cd", desc = "Docstring" },
+	-- 	{ "<leader>Ce", desc = "Explain Code" },
+	-- 	{ "<leader>Ci", desc = "Inline Chat" },
+	-- 	{ "<leader>Cf", desc = "Fix Code" },
+	-- 	{ "<leader>Cl", desc = "Explain LSP Diagnostics" },
+	-- 	{ "<leader>Ct", desc = "Generate Tests" },
+	-- 	{ "<leader>CT", desc = "Toggle CodeCompanionChat" },
+	-- 	-- { "<leader>Ci", desc = "Edit with Instructions" },
+	-- 	-- { "<leader>Co", desc = "Optimize Code" },
+	-- 	-- { "<leader>Cs", desc = "Summarize" },
+	-- 	{ "<leader>K", desc = "Show Docs", icon = "󱔗" },
+	-- 	{ "<leader>T", group = "Telescope", icon = "" },
+	-- 	{ "<leader>Tc", desc = "Color Names" },
+	-- 	{ "<leader>Tg", desc = "Glyph" },
+	-- 	{ "<leader>Tn", desc = "Notifications" },
+	-- 	{ "<leader>Tt", desc = "Telescope" },
+	-- 	{ "<leader>a", group = "AnyJump", icon = "" },
+	-- 	{ "<leader>ab", desc = "Back" },
+	-- 	{ "<leader>al", desc = "Last Result" },
+	-- 	{ "<leader>b", group = "Buffers" },
+	-- 	{ "<leader>bb", desc = "Show Buffers" },
+	-- 	{ "<leader>bd", desc = "Delete Buffer" },
+	-- 	{ "<leader>bn", desc = "Next Buffer" },
+	-- 	{ "<leader>bp", desc = "Previous Buffer" },
+	-- 	{ "<leader>c", group = "Code", icon = "" },
+	-- 	{ "<leader>cD", group = "Diagnostic List" },
+	-- 	{ "<leader>cDn", desc = "Next Diagnostic" },
+	-- 	{ "<leader>cDp", desc = "Previous Diagnostic" },
+	-- 	{ "<leader>ca", desc = "Code Action" },
+	-- 	{ "<leader>cd", desc = "Diagnostics" },
+	-- 	{ "<leader>cl", desc = "Set Loclist" },
+	-- 	{ "<leader>cp", desc = "Copilot Panel" },
+	-- 	{ "<leader>d", group = "Debug" },
+	-- 	{ "<leader>dO", desc = "Step Out" },
+	-- 	{ "<leader>dP", group = "Dap-python" },
+	-- 	{ "<leader>dPc", desc = "Test Class" },
+	-- 	{ "<leader>dPm", desc = "Test Method" },
+	-- 	{ "<leader>dPs", desc = "Debug Selection" },
+	-- 	{ "<leader>db", desc = "Toggle Breakpoint" },
+	-- 	{ "<leader>dc", desc = "Continue" },
+	-- 	{ "<leader>df", desc = "Frames" },
+	-- 	{ "<leader>dh", desc = "Hover" },
+	-- 	{ "<leader>di", desc = "Step Into" },
+	-- 	{ "<leader>dl", desc = "Run Last" },
+	-- 	{ "<leader>do", desc = "Step Over" },
+	-- 	{ "<leader>dp", desc = "Preview" },
+	-- 	{ "<leader>dr", desc = "REPL Open" },
+	-- 	{ "<leader>ds", desc = "Scopes" },
+	-- 	{ "<leader>du", group = "Dap UI" },
+	-- 	{ "<leader>duc", desc = "Close" },
+	-- 	{ "<leader>duo", desc = "Open" },
+	-- 	{ "<leader>dut", desc = "Toggle" },
+	-- 	{ "<leader>f", group = "Find File" },
+	-- 	{ "<leader>fb", desc = "File Browser" },
+	-- 	{ "<leader>fc", desc = "File Color" },
+	-- 	{ "<leader>ff", desc = "Find in Current Directory" },
+	-- 	{ "<leader>fg", desc = "Live Grep" },
+	-- 	{ "<leader>fr", desc = "File Recent" },
+	-- 	{ "<leader>g", group = "Git" },
+	-- 	{ "<leader>gP", desc = "Close goto-preview window" },
+	-- 	{ "<leader>gR", desc = "Telescope References" },
+	-- 	{ "<leader>gb", desc = "Blame" },
+	-- 	{ "<leader>gc", desc = "Commit" },
+	-- 	{ "<leader>gf", desc = "Files" },
+	-- 	{ "<leader>gg", desc = "Lazygit" },
+	-- 	{ "<leader>gp", desc = "Peek" },
+	-- 	{ "<leader>gpc", desc = "Close Preview" },
+	-- 	{ "<leader>gpd", desc = "Preview Definition" },
+	-- 	{ "<leader>gpi", desc = "Preview Implementation" },
+	-- 	{ "<leader>h", group = "Help", icon = "󰋖" },
+	-- 	{ "<leader>hc", desc = "Commands" },
+	-- 	{ "<leader>hd", group = "Dap", icon = "" },
+	-- 	{ "<leader>hdC", desc = "Configurations" },
+	-- 	{ "<leader>hdb", desc = "Breakpoints" },
+	-- 	{ "<leader>hdc", desc = "Commands" },
+	-- 	{ "<leader>hdf", desc = "Frames" },
+	-- 	{ "<leader>hdv", desc = "Variables" },
+	-- 	{ "<leader>hk", desc = "Keymaps" },
+	-- 	{ "<leader>hs", desc = "Spell Suggest" },
+	-- 	{ "<leader>hv", desc = "Vim Options" },
+	-- 	{ "<leader>i", group = "Insert", icon = "" },
+	-- 	{ "<leader>is", group = "Snippet" },
+	-- 	{ "<leader>isp", desc = "Python File" },
+	-- 	{ "<leader>j", desc = "Any Jump", icon = "" },
+	-- 	{ "<leader>cD", desc = "Diagnostics" },
+	-- 	{ "<leader>cR", desc = "Rename" },
+	-- 	{ "<leader>ca", desc = "Code Actions" },
+	-- 	{ "<leader>cc", group = "Calls" },
+	-- 	{ "<leader>cci", desc = "Incoming" },
+	-- 	{ "<leader>cco", desc = "Outgoing" },
+	-- 	{ "<leader>cd", desc = "Definitions" },
+	-- 	{ "<leader>ch", desc = "Signature Help" },
+	-- 	{ "<leader>ci", desc = "Implementations" },
+	-- 	{ "<leader>cr", desc = "References" },
+	-- 	{ "<leader>cs", desc = "Document Symbols" },
+	-- 	{ "<leader>ct", desc = "Type Definitions" },
+	-- 	{ "<leader>cw", desc = "Workspace Symbols" },
+	-- 	{ "<leader>n", desc = "NvimTree" },
+	-- 	{ "<leader>o", group = "Open", icon = "󰮫" },
+	-- 	{ "<leader>oB", desc = "Btop" },
+	-- 	{ "<leader>oC", desc = "Nvim Config" },
+	-- 	{ "<leader>oP", desc = "Ipython (fullscreen)" },
+	-- 	{ "<leader>ob", desc = "File Browser" },
+	-- 	{ "<leader>oc", desc = "CodeCompanionChat" },
+	-- 	{ "<leader>od", desc = "Lazydocker" },
+	-- 	{ "<leader>of", desc = "Floating Terminal" },
+	-- 	{ "<leader>oh", desc = "Horizontal Terminal" },
+	-- 	{ "<leader>op", desc = "Ipython" },
+	-- 	{ "<leader>or", desc = "Ranger" },
+	-- 	{ "<leader>ot", desc = "Vertical Terminal" },
+	-- 	{ "<leader>s", group = "Search" },
+	-- 	{ "<leader>sc", desc = "Clear Highlights" },
+	-- 	{ "<leader>sf", desc = "Files" },
+	-- 	{ "<leader>tG", desc = "Glyph" },
+	-- 	{ "<leader>sg", desc = "Grep" },
+	-- 	{ "<leader>sh", desc = "Command History" },
+	-- 	{ "<leader>sm", desc = "Man Pages" },
+	-- 	{ "<leader>t", group = "Toggle" },
+	-- 	{ "<leader>tP", desc = "Ipython (fullscreen)" },
+	-- 	{ "<leader>tc", desc = "Colorscheme" },
+	-- 	{ "<leader>td", desc = "DBUI" },
+	-- 	{ "<leader>tf", desc = "Floating Terminal" },
+	-- 	{ "<leader>tp", desc = "Ipython" },
+	-- 	{ "<leader>tt", desc = "Split Terminal" },
+	-- 	{ "<leader>w", group = "Workspace" },
+	-- 	{ "<leader>wa", desc = "Add Folder" },
+	-- 	{ "<leader>wl", desc = "List Folders" },
+	-- 	{ "<leader>wr", desc = "Remove Folder" },
+	-- 	{ "<leader>x", group = "Set Executable Bit", desc = "Set Executable Bit" },
+	-- 	{ "<leader>y", desc = "System Yank", icon = "" },
+	-- 	{ "<leader>e", desc = "Edit", icon = "" },
+	-- })
+	-- end,
+}
diff --git a/.config/nvim/lua/utils/extensions/init.lua b/.config/nvim/lua/utils/extensions/init.lua
new file mode 100644
index 0000000..fb1542b
--- /dev/null
+++ b/.config/nvim/lua/utils/extensions/init.lua
@@ -0,0 +1,3 @@
+return {
+	require("utils.extensions.telescope"),
+}
diff --git a/.config/nvim/lua/utils/extensions/telescope/init.lua b/.config/nvim/lua/utils/extensions/telescope/init.lua
new file mode 100644
index 0000000..48dadf7
--- /dev/null
+++ b/.config/nvim/lua/utils/extensions/telescope/init.lua
@@ -0,0 +1,7 @@
+local ts = require("telescope")
+ts.load_extension("fzf")
+ts.load_extension("color_names")
+ts.load_extension("file_browser")
+ts.load_extension("glyph")
+ts.load_extension("ui-select")
+ts.load_extension("noice")
diff --git a/.config/nvim/lua/utils/git_paste/init.lua b/.config/nvim/lua/utils/git_paste/init.lua
new file mode 100644
index 0000000..8c2fb74
--- /dev/null
+++ b/.config/nvim/lua/utils/git_paste/init.lua
@@ -0,0 +1,57 @@
+local M = {}
+
+--- Fetches the content from the given URL and then pastes the contents below the current line.
+---@param url string The URL to fetch (expects a Git raw URL).
+function M.fetch_and_paste(url)
+	if not url or url == "" then
+		vim.notify("git-paste: No URL provided.", vim.log.levels.WARN)
+		return
+	end
+
+	-- Use curl to fetch the raw file content
+	local result = vim.fn.system({ "curl", "-s", url })
+
+	if vim.v.shell_error ~= 0 then
+		vim.notify("git-paste: Failed to fetch content from URL:\n" .. result, vim.log.levels.ERROR)
+		return
+	end
+
+	-- Split the result into lines. This creates a table with each line.
+	local lines = vim.split(result, "\n")
+
+	-- Get the current cursor position. This returns a table {line, col}
+	-- Nvim's API for setting lines expects 0-indexed line numbers.
+	local pos = vim.api.nvim_win_get_cursor(0)
+	-- Insert the fetched lines after the current cursor line.
+	-- Since pos[1] is 1-indexed, we use it directly as the insertion index (which is 0-indexed)
+	-- when inserting *after* the current line.
+	local insert_at = pos[1]
+	vim.api.nvim_buf_set_lines(0, insert_at, insert_at, false, lines)
+
+	vim.notify("git-paste: Content pasted successfully", vim.log.levels.INFO)
+end
+
+--- Prompts the user for a Git raw URL and then pastes the fetched content.
+function M.git_paste_prompt()
+	vim.ui.input({ prompt = "Git raw URL: " }, function(input)
+		if input then
+			M.fetch_and_paste(input)
+		else
+			vim.notify("git-paste: No URL provided", vim.log.levels.WARN)
+		end
+	end)
+end
+
+--- Sets up the git-paste module.
+---
+--- The module expects an optional configuration table:
+---   { telescope_key = "<leader>pg" } (or any other keymap you prefer)
+---
+---@param opts table|nil
+function M.setup(opts)
+	opts = opts or {}
+	local telescope_key = opts.telescope_key or "<leader>pg"
+	vim.keymap.set("n", telescope_key, M.git_paste_prompt, { desc = "Git Paste: paste content from git raw URL" })
+end
+
+return M
diff --git a/.config/nvim/lua/utils/hyprland/lsp/init.lua b/.config/nvim/lua/utils/hyprland/lsp/init.lua
new file mode 100644
index 0000000..b0a926f
--- /dev/null
+++ b/.config/nvim/lua/utils/hyprland/lsp/init.lua
@@ -0,0 +1,102 @@
+vim.notify = require("notify")
+
+local client_notifs = {}
+
+local function get_notif_data(client_id, token)
+	if not client_notifs[client_id] then
+		client_notifs[client_id] = {}
+	end
+
+	if not client_notifs[client_id][token] then
+		client_notifs[client_id][token] = {}
+	end
+
+	return client_notifs[client_id][token]
+end
+
+local spinner_frames = { "⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷" }
+
+local function update_spinner(client_id, token)
+	local notif_data = get_notif_data(client_id, token)
+
+	if notif_data.spinner then
+		local new_spinner = (notif_data.spinner + 1) % #spinner_frames
+		notif_data.spinner = new_spinner
+
+		notif_data.notification = vim.notify("", nil, {
+			hide_from_history = true,
+			icon = spinner_frames[new_spinner],
+			replace = notif_data.notification,
+		})
+
+		vim.defer_fn(function()
+			update_spinner(client_id, token)
+		end, 100)
+	end
+end
+
+local function format_title(title, client_name)
+	return client_name .. (#title > 0 and ": " .. title or "")
+end
+
+local function format_message(message, percentage)
+	return (percentage and percentage .. "%\t" or "") .. (message or "")
+end
+vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
+	pattern = { "*.hl", "hypr*.conf" },
+	callback = function(event)
+		-- print(string.format("starting hyprls for %s", vim.inspect(event)))
+		vim.lsp.start({
+			name = "hyprlang",
+			cmd = { "hyprls" },
+			root_dir = vim.fn.getcwd(),
+			on_attach = function()
+				vim.notify("Hyprlang LSP attached", "info")
+			end,
+			on_init = function()
+				vim.notify("Hyprlang LSP initialized", "info")
+			end,
+			handlers = {
+				["$/progress"] = function(_, result, ctx)
+					local client_id = ctx.client_id
+
+					local val = result.value
+
+					if not val.kind then
+						return
+					end
+
+					local notif_data = get_notif_data(client_id, result.token)
+
+					if val.kind == "begin" then
+						local message = format_message(val.message, val.percentage)
+
+						notif_data.notification = vim.notify(message, "info", {
+							title = format_title(val.title, vim.lsp.get_client_by_id(client_id).name),
+							icon = spinner_frames[1],
+							timeout = false,
+							hide_from_history = false,
+						})
+
+						notif_data.spinner = 1
+						update_spinner(client_id, result.token)
+					elseif val.kind == "report" and notif_data then
+						notif_data.notification = vim.notify(format_message(val.message, val.percentage), "info", {
+							replace = notif_data.notification,
+							hide_from_history = false,
+						})
+					elseif val.kind == "end" and notif_data then
+						notif_data.notification =
+							vim.notify(val.message and format_message(val.message) or "Complete", "info", {
+								icon = "",
+								replace = notif_data.notification,
+								timeout = 3000,
+							})
+
+						notif_data.spinner = nil
+					end
+				end,
+			},
+		})
+	end,
+})
diff --git a/.config/nvim/lua/utils/keymaps/converters/from_table/init.lua b/.config/nvim/lua/utils/keymaps/converters/from_table/init.lua
new file mode 100644
index 0000000..53a1c7f
--- /dev/null
+++ b/.config/nvim/lua/utils/keymaps/converters/from_table/init.lua
@@ -0,0 +1,12 @@
+local M = {}
+local map = vim.keymap.set
+local opts = { noremap = true, silent = true }
+
+function M.set_keybindings(bindings)
+	for _, binding in ipairs(bindings) do
+		map(binding.mode, binding.key, binding.cmd, binding.opts or opts)
+	end
+	return bindings
+end
+
+return M
diff --git a/.config/nvim/lua/utils/keymaps/converters/whichkey/init.lua b/.config/nvim/lua/utils/keymaps/converters/whichkey/init.lua
new file mode 100644
index 0000000..b19eb4b
--- /dev/null
+++ b/.config/nvim/lua/utils/keymaps/converters/whichkey/init.lua
@@ -0,0 +1,48 @@
+local M = {}
+
+local whichkey = require("which-key")
+vim.notify = require("notify")
+
+---Helper function to add mappings to which-key
+---@parm mappings table : List of mappings to add to which-key
+---@parm group table : Group to add mappings to (optional)
+---@return nil
+---@usage addToWhichKey(mappings, group)
+---@example addToWhichKey({{key = "n", cmd = "next", mode = "n", desc = "Next Line", group = "Navigation"}, {key = "t", group = "example"})
+function M.addToWhichKey(mappings, group)
+	local wk_mappings = {}
+	if group then
+		whichkey.add({ group.key, group = group.group })
+	end
+	if not mappings and not group then
+		vim.notify("Error: Mappings is nil", "error")
+		return
+	elseif not mappings and group then
+		return
+	end
+	for _, mapping in ipairs(mappings) do
+		if not mapping.key or mapping.key == "" then
+			vim.notify("Error: Key is empty or nil", "error")
+			return
+		end
+
+		if not mapping.cmd or mapping.cmd == "" then
+			vim.notify("Error: Command is empty or nil for key: " .. mapping.key, "error")
+			return
+		end
+
+		if not mapping.mode or mapping.mode == "" then
+			vim.notify("Error: Mode is empty or nil for key: " .. mapping.key, "error")
+			return
+		end
+
+		wk_mappings[1] = mapping.key
+		wk_mappings[2] = mapping.cmd
+		wk_mappings.mode = mapping.mode
+		wk_mappings.desc = mapping.desc or "No Description"
+		wk_mappings.group = mapping.group or "No Group"
+		whichkey.add(wk_mappings)
+	end
+end
+
+return M
diff --git a/.config/nvim/lua/utils/keymaps/init.lua b/.config/nvim/lua/utils/keymaps/init.lua
new file mode 100644
index 0000000..5c580c4
--- /dev/null
+++ b/.config/nvim/lua/utils/keymaps/init.lua
@@ -0,0 +1,4 @@
+return {
+	require('utils.keymaps.converters.whichkey'),
+	require('utils.keymaps.converters.from_table'),
+}
diff --git a/.config/nvim/lua/utils/telescope_extra/init.lua b/.config/nvim/lua/utils/telescope_extra/init.lua
new file mode 100644
index 0000000..a23b420
--- /dev/null
+++ b/.config/nvim/lua/utils/telescope_extra/init.lua
@@ -0,0 +1,68 @@
+local telescope = require("telescope")
+local telescopeConfig = require("telescope.config")
+
+local M = {}
+
+function M.setup()
+	-- Clone the default Telescope configuration
+	local vimgrep_arguments = { unpack(telescopeConfig.values.vimgrep_arguments) }
+
+	-- I want to search in hidden/dot files.
+	table.insert(vimgrep_arguments, "--hidden")
+	-- I don't want to search in the `.git` directory.
+	table.insert(vimgrep_arguments, "--glob")
+	table.insert(vimgrep_arguments, "!**/.git/*")
+	telescope.setup({
+		defaults = {
+			-- `hidden = true` is not supported in text grep commands.
+			vimgrep_arguments = vimgrep_arguments,
+		},
+		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/*" },
+				mappings = {
+					n = {
+						["cd"] = function(prompt_bufnr)
+							local selection = require("telescope.actions.state").get_selected_entry()
+							local dir = vim.fn.fnamemodify(selection.path, ":p:h")
+							require("telescope.actions").close(prompt_bufnr)
+							-- Depending on what you want put `cd`, `lcd`, `tcd`
+							vim.cmd(string.format("silent lcd %s", dir))
+						end,
+					},
+				},
+			},
+		},
+		preview = {
+			-- show images in telescope using kitty
+			mime_hook = function(filepath, bufnr, opts)
+				local is_image = function(filepath)
+					local image_extensions = { "png", "jpg" } -- Supported image formats
+					local split_path = vim.split(filepath:lower(), ".", { plain = true })
+					local extension = split_path[#split_path]
+					return vim.tbl_contains(image_extensions, extension)
+				end
+				if is_image(filepath) then
+					local term = vim.api.nvim_open_term(bufnr, {})
+					local function send_output(_, data, _)
+						for _, d in ipairs(data) do
+							vim.api.nvim_chan_send(term, d .. "\r\n")
+						end
+					end
+					vim.fn.jobstart({
+						"kitty +icat " .. filepath, -- Terminal image viewer command
+					}, { on_stdout = send_output, stdout_buffered = true, pty = true })
+				else
+					require("telescope.previewers.utils").set_preview_message(
+						bufnr,
+						opts.winid,
+						"Binary cannot be previewed"
+					)
+				end
+			end,
+		},
+	})
+end
+
+return M
diff --git a/.config/nvim/lua/utils/terminal/init.lua b/.config/nvim/lua/utils/terminal/init.lua
new file mode 100644
index 0000000..f0330c0
--- /dev/null
+++ b/.config/nvim/lua/utils/terminal/init.lua
@@ -0,0 +1,6 @@
+local M = {}
+
+M.term_factory = require("utils.terminal.term_factory").term_factory
+M.term_toggle = require("utils.terminal.toggle").term_toggle
+
+return M
diff --git a/.config/nvim/lua/utils/terminal/term_factory/init.lua b/.config/nvim/lua/utils/terminal/term_factory/init.lua
new file mode 100644
index 0000000..a19200c
--- /dev/null
+++ b/.config/nvim/lua/utils/terminal/term_factory/init.lua
@@ -0,0 +1,12 @@
+local Terminal = require("toggleterm.terminal").Terminal
+local notify = require("notify")
+local M = {}
+
+function M.term_factory(cfg)
+	cfg["on_stderr"] = function(_, job, data, name)
+		notify(name .. " encountered an error on job: " .. job .. "\nData: " .. data, "error")
+	end
+	return Terminal:new(cfg)
+end
+
+return M
diff --git a/.config/nvim/lua/utils/terminal/toggle/init.lua b/.config/nvim/lua/utils/terminal/toggle/init.lua
new file mode 100644
index 0000000..6488154
--- /dev/null
+++ b/.config/nvim/lua/utils/terminal/toggle/init.lua
@@ -0,0 +1,9 @@
+local M = {}
+
+function M.term_toggle(term)
+	if term then
+		term:toggle()
+	end
+end
+
+return M
diff --git a/.config/nvim/lua/utils/treesitter/parsers/hyprlang/init.lua b/.config/nvim/lua/utils/treesitter/parsers/hyprlang/init.lua
new file mode 100644
index 0000000..d617dcb
--- /dev/null
+++ b/.config/nvim/lua/utils/treesitter/parsers/hyprlang/init.lua
@@ -0,0 +1,15 @@
+local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+parser_config.hyprlang = {
+	install_info = {
+		url = "~/github/tree-sitter-hyprlang", -- local path or git repo
+		files = { "src/parser.c" }, -- note that some parsers also require src/scanner.c or src/scanner.cc
+		-- optional entries:
+		branch = "main", -- default branch in case of git repo if different from master
+		generate_requires_npm = false, -- if stand-alone parser without npm dependencies
+		requires_generate_from_grammar = true, -- if folder contains pre-generated src/parser.c
+	},
+	filetype = "conf", -- if filetype does not match the parser name
+}
+vim.filetype.add({
+	pattern = { [".*/hypr/.*%.conf"] = "hyprlang" },
+})
diff --git a/.gitmodules b/.gitmodules
index e3b91d5..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule ".config/nvim"]
-	path = .config/nvim
-	url = git@gitea.suda.codes:sudacode/nvim.git