From 2215365e0597d4c5754eb375d40d6fb265d95cd2 Mon Sep 17 00:00:00 2001
From: Andrew Haynes <andrewh.swe@gmail.com>
Date: Fri, 11 Sep 2026 12:43:30 -0400
Subject: [PATCH] Changes

---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 brew/.Brewfile                                |   9 +-
 ghostty/.config/ghostty/config                |  21 +-
 ghostty/.config/ghostty/themes/kanso-zen      |  22 +
 nvim/.DS_Store                                | Bin 6148 -> 0 bytes
 nvim/.config/nvim/init.lua                    |  34 +-
 .../nvim/lua/DarthMooMancer/colors.lua        |  49 +-
 .../nvim/lua/DarthMooMancer/keymaps.lua       |  59 +-
 nvim/.config/nvim/lua/DarthMooMancer/lsp.lua  | 136 ++--
 nvim/.config/nvim/lua/DarthMooMancer/opts.lua |  69 +-
 .../nvim/lua/DarthMooMancer/plugins.lua       |  95 ++-
 .../.config/nvim/lua/DarthMooMancer/tools.lua | 103 +--
 nvim/.config/nvim/lua/DarthMooMancer/ui.lua   | 608 +++++++++---------
 nvim/.config/nvim/nvim-pack-lock.json         |  88 +--
 ssh/.DS_Store                                 | Bin 6148 -> 6148 bytes
 ssh/.ssh/config                               |   5 +-
 tmux/.config/tmux/plugins/tpm                 |   2 +-
 tmux/.config/tmux/tmux.conf                   |   6 +-
 18 files changed, 643 insertions(+), 663 deletions(-)
 create mode 100644 ghostty/.config/ghostty/themes/kanso-zen
 delete mode 100644 nvim/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index 87b13c771879f7b0091ef81c4c15afce83446ef7..e66b3cd6ed00b76bc84667f00dd6fd044456be27 100644
GIT binary patch
delta 554
zcmZn(XbIS$Dp3Epg@b{CfrUYjA)O(Up(Hoo#U&{xKM5$t5f%I1%~JD(BdUA~UipFy
z!{Frn+ybB;2HhtQKoko@5<?L~DnofrIzo<tfpIfPZt@ZV5jJLl<1%OYChrrFf-*PX
z6Zp@>B%d+)zObBbj4((R><o6GBQqHC8HyQ7fUq(*AK@6Ns>xa+ii`=HeMH_dF)evB
z*+yJ~-Obq3<vibs$<gAHaCWu0G$X_0>EcE<ASW^d4J>BJK=!+^2i#J)EW$FV>||Dn
zc#aq!h|0+d5+aiuBzRB-R!C?$rp^F|LJ31ILn%WAvMmn-;I^;;Jp`3U*aMZHEG!wy
aJ|hmSc5=R?G>pA@qU1_mqP%HMfj0qXgq*$r

delta 554
zcmZn(XbIS$Dp3E-_ag%X0}F#5LpnnyLrHGFi%U{YeiBfO!}{N^id2>pj;Qh}c;yQ+
z41<&Na|?ia7<6Au08uOqNeo2{sSM>g=?FOn2F9r%xyefeMA-Cqw}qs#Ox`CT1!Zo&
zC-9$%N%r96`@(X%Tir_*$?ZE1at1rlkr@p648;s3Kv<cZk8liB)nqLZMaF>5J|gd!
zm^M$HY$Gng{%l>tES+n|Cr67*!r9g0(u@X^r;8ie8~_^23^cHqAp_a(&5l{^Vh_QV
z!etSbL1ibiO2l(43WhjuvVw%j<OT^IRDl%|T8@dIK|TdKIG3T6p#s^K)4p)8A;}}`
hfyz%7mJDUT@E+ogd`W2-d-FuemApiG)0zTr0swlet@Ho@

diff --git a/brew/.Brewfile b/brew/.Brewfile
index 27352d3..375d25b 100644
--- a/brew/.Brewfile
+++ b/brew/.Brewfile
@@ -1,10 +1,9 @@
 cask "ghostty"
-cask "logi-options+"
 cask "font-jetbrains-mono-nerd-font"
-cask "modrinth"
 cask "google-chrome"
-cask "linearmouse"
+cask "tailscale-app"
 
+brew "mole"
 brew "ripgrep"
 brew "neovim"
 brew "tree-sitter" # dep to neovim
@@ -13,6 +12,7 @@ brew "eza"
 brew "starship"
 brew "tmux"
 brew "bat"
+brew "python"
 brew "cmake"
 brew "fd"
 brew "fzf"
@@ -20,6 +20,9 @@ brew "git"
 brew "zoxide"
 brew "stow"
 brew "jpeg-turbo"
+brew "pkgconfig"
 brew "npm"
+brew "go"
 brew "wget"
 brew "jq"
+brew "ruby"
diff --git a/ghostty/.config/ghostty/config b/ghostty/.config/ghostty/config
index 56af713..ec069b3 100644
--- a/ghostty/.config/ghostty/config
+++ b/ghostty/.config/ghostty/config
@@ -1,21 +1,18 @@
-font-size = 14
-# theme = Kanagawa Wave
-theme = Kanagawa Dragon
-macos-titlebar-style = tabs
+theme = "/Users/andrew/.config/ghostty/themes/kanso-zen"
 font-family = "JetBrainsMono Nerd Font Medium"
 font-thicken = true
-font-thicken-strength = 10
+font-size = 14
 
-background = 000000
-# .92 on most wallpapers
-background-opacity = 0.65
-background-blur = true
+macos-titlebar-style = transparent
+macos-titlebar-proxy-icon = hidden
+title = " "
+background-opacity = 0.92
+background-blur = 64
 confirm-close-surface = false
-window-padding-x = 6
-window-padding-y = 6
+window-padding-x = 15
+window-padding-y = 15
 mouse-hide-while-typing = true
 adjust-cell-height = 5%
 adjust-cell-width = -5%
 alpha-blending = linear-corrected
-bold-is-bright = true
 mouse-hide-while-typing = true
diff --git a/ghostty/.config/ghostty/themes/kanso-zen b/ghostty/.config/ghostty/themes/kanso-zen
new file mode 100644
index 0000000..4e8c4f8
--- /dev/null
+++ b/ghostty/.config/ghostty/themes/kanso-zen
@@ -0,0 +1,22 @@
+palette = 0=#090E13
+palette = 1=#c4746e
+palette = 2=#8a9a7b
+palette = 3=#c4b28a
+palette = 4=#8ba4b0
+palette = 5=#a292a3
+palette = 6=#8ea4a2
+palette = 7=#a4a7a4
+palette = 8=#5C6066
+palette = 9=#e46876
+palette = 10=#87a987
+palette = 11=#e6c384
+palette = 12=#7fb4ca
+palette = 13=#938aa9
+palette = 14=#7aa89f
+palette = 15=#c5c9c7
+
+background = #090E13
+foreground = #c5c9c7
+cursor-color = #c5c9c7
+selection-background = #22262D
+selection-foreground = #c5c9c7
diff --git a/nvim/.DS_Store b/nvim/.DS_Store
deleted file mode 100644
index 9246d39d4eeb96c04d1485860ec1134e1ef23c06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKK~EDw6n+EMZb4*$7BR+TV=pE&3JOF+3`>D12Lqu5i-2`^J1rZwJI(Hv3WTI*
zJ#q11;t%j2ka+Q?7q8rmKS8hFd^58R&|>0Ah}oCSd~e>o_h#nX?z}DlkZi3u3ZMdj
zf{kOW3%fIf&-2zM9ib(TNJNej*ibg>e${l^ydy)zK*YdBV}QTAakv8(FmU0-`^!w6
zIW((|?FS<xN2H@OcIk3li7Va8MsAbUbAb`m{H)=v@zFA4j@i@=bH%3hf|{IRZeZ9h
z^+bSOr0BB#%yx^co@F(+=!@8#oKO-<qM#1#?Tz1mkkLjb#`iPY-otw%8EtH0Y=1wY
zq|$dMmkL`>#bvK0jRbEUAw3~B;SDM+r?RbWyp{N=$k*nnzN>2UT#2skD?L|x)xQ3L
zzGPo2l^VP@bbau~U_l))4Qs3H@%_#)hk042M%T)oUCdPt%XZ88fW8WH_AV``{VlFb
zwD{uKw7gSApX9MYq<id9>WX{|rIJsB{0V)vp!WKf#~f#o`F3D4cXi!Iw&w#{nRiPJ
zSKLOX7pi>9U!k6l*cOvtH9XI7%QU;Q;TR@$7Thcg0#?b}7IWp!dqr9tE_#%wOi%rk
zT&DH8hS1XbZD~;<Efs)7vZ;kg(x0eQmtCVm6KQ=>4ii{GhG80>!U}A`E*!vn_y8Z_
z3w(ng@QcKWN^X&1GDaSeDe{EOljp=Do5UubOwiGM)HlPWLLfdWEsxqMkLD~^sY;i(
zlkFZAHajbS44@nwHr{29K2M+JRs0LD>gI{n2rs0q``ONUuEX3i&NNTKz0O_2%_!aH
zzLRJJ5d#qe7mWdaKWNxE>LE5HimL-V@d<z!L$eUn#TAICaRZ_rVnZTYP>2jgl%XX2
z#2_*p?ON!khuDxP!-0sEF;BQM3BOR}1&nr0xC7B8Mt#IU#K36=I^|I1^?&Zq-~XqB
zqEW;^#K3>W0Ex}!X0v#tu(q}xj@McZ+e>U*xL-q}2*EBa$3o$ycnF&ioYT01sE62)
Th!&LSkAR>d>LLdIDFeR&mCx)U

diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index f90e31d..9938588 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -8,21 +8,21 @@ require('DarthMooMancer.lsp')
 require('DarthMooMancer.tools')
 
 vim.api.nvim_create_autocmd('FileType', {
-	pattern = {
-		'c',
-		'cpp',
-		'rust',
-		'lua',
-		'typescript',
-		'javascript',
-		'css',
-		'html',
-		'python',
-		'go',
-		'yaml',
-	},
-	callback = function()
-		vim.treesitter.start()
-		vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
-	end,
+    pattern = {
+        'c',
+        'cpp',
+        'rust',
+        'lua',
+        'typescript',
+        'javascript',
+        'css',
+        'html',
+        'python',
+        'go',
+        'yaml',
+    },
+    callback = function()
+        vim.treesitter.start()
+        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+    end,
 })
diff --git a/nvim/.config/nvim/lua/DarthMooMancer/colors.lua b/nvim/.config/nvim/lua/DarthMooMancer/colors.lua
index da55acc..cf57f32 100644
--- a/nvim/.config/nvim/lua/DarthMooMancer/colors.lua
+++ b/nvim/.config/nvim/lua/DarthMooMancer/colors.lua
@@ -1,25 +1,30 @@
--- require('bamboo').load()
--- vim.cmd.colorscheme('bamboo')
--- vim.cmd.colorscheme('melange')
--- vim.cmd.colorscheme('rose-pine')
--- vim.cmd.colorscheme('bamboo-multiplex')
-require('kanagawa').setup({
-	overrides = function(colors)
-		local theme = colors.theme
-		return {
-			Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1 }, -- add `blend = vim.o.pumblend` to enable transparency
-			PmenuSel = { fg = 'NONE', bg = theme.ui.bg_p2 },
-			PmenuSbar = { bg = theme.ui.bg_m1 },
-			PmenuThumb = { bg = theme.ui.bg_p2 },
-		}
-	end,
+require('kanso').setup({
+    foreground = {
+        dark = "saturated", -- Use default colors in dark mode
+    },
+    overrides = function(colors)
+        local theme = colors.theme
+        return {
+            NormalFloat = { bg = "none" },
+            FloatBorder = { bg = "none" },
+            FloatTitle = { bg = "none" },
+            TelescopeBorder = { fg = theme.ui.special, bg = "none" },
+            TelescopePromptBorder = { fg = theme.ui.special, bg = "none" },
+            TelescopeResultsBorder = { fg = theme.ui.special, bg = "none" },
+            TelescopePreviewBorder = { fg = theme.ui.special, bg = "none" },
+            NotifyBackground = { bg = "none" },
+            NotifyBorder = { fg = theme.ui.special, bg = "none" },
+            NotifyBody = { fg = theme.ui.fg, bg = "none" },
+            NotifyTitle = { fg = theme.ui.special, bg = "none" },
+        }
+    end,
 })
-
-vim.cmd.colorscheme('kanagawa-dragon')
--- vim.cmd.colorscheme('rose-pine')
+--
+vim.cmd.colorscheme('kanso-zen')
 
 vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' })
-vim.api.nvim_set_hl(0, 'NormalFloat', { link = 'Normal' })
+-- vim.api.nvim_set_hl(0, 'NormalFloat', { link = 'Normal' })
+-- vim.api.nvim_set_hl(0, "FloatBorder", { bg = "none" })
 vim.api.nvim_set_hl(0, 'StatusLine', { link = 'Normal' })
 vim.api.nvim_set_hl(0, 'StatusLineTerm', { link = 'Normal' })
 vim.api.nvim_set_hl(0, 'StatusLineNC', { link = 'Normal' })
@@ -29,7 +34,7 @@ vim.api.nvim_set_hl(0, 'LineNrBelow', { link = 'NonText', bold = true })
 vim.api.nvim_set_hl(0, 'LineNr', { link = 'Normal' })
 vim.api.nvim_set_hl(0, 'FoldColumn', { link = 'Normal' })
 vim.api.nvim_set_hl(
-	0,
-	'CursorLineNr',
-	{ bg = 'none', link = 'MatchParen', bold = true }
+    0,
+    'CursorLineNr',
+    { bg = 'none', link = 'MatchParen', bold = true }
 )
diff --git a/nvim/.config/nvim/lua/DarthMooMancer/keymaps.lua b/nvim/.config/nvim/lua/DarthMooMancer/keymaps.lua
index 075f654..d91f2f8 100644
--- a/nvim/.config/nvim/lua/DarthMooMancer/keymaps.lua
+++ b/nvim/.config/nvim/lua/DarthMooMancer/keymaps.lua
@@ -1,8 +1,7 @@
 vim.keymap.set('v', 'J', ":m '>+1<CR>gv=gv")
 vim.keymap.set('v', 'K', ":m '<-2<CR>gv=gv")
--- vim.keymap.set("n", "<leader>ff", vim.lsp.buf.format)
 vim.keymap.set('n', '<leader>ff', function()
-	require('conform').format({ async = true, lsp_format = 'never' })
+    require('conform').format({ async = true, lsp_format = 'never' })
 end)
 vim.keymap.set('n', '<leader>vs', ':vsplit<CR>')
 vim.keymap.set('n', '<leader>ss', ':split<CR>')
@@ -14,42 +13,35 @@ vim.keymap.set('n', 'N', 'Nzzzv')
 vim.keymap.set('x', '<leader>p', [["_dP]])
 local builtin = require('telescope.builtin')
 vim.keymap.set(
-	'n',
-	'<leader><leader>',
-	builtin.find_files,
-	{ desc = 'Telescope find files' }
+    'n',
+    '<leader><leader>',
+    builtin.find_files,
+    { desc = 'Telescope find files' }
 )
 vim.keymap.set(
-	'n',
-	'<leader>fh',
-	builtin.help_tags,
-	{ desc = 'Telescope help tags' }
+    'n',
+    '<leader>fh',
+    builtin.help_tags,
+    { desc = 'Telescope help tags' }
 )
 vim.keymap.set(
-	'n',
-	'<leader>fg',
-	builtin.live_grep,
-	{ desc = 'Telescope live grep' }
+    'n',
+    '<leader>fg',
+    builtin.live_grep,
+    { desc = 'Telescope live grep' }
 )
 vim.keymap.set(
-	'n',
-	'<leader>fm',
-	builtin.man_pages,
-	{ desc = 'Telescope man_pages' }
+    'n',
+    '<leader>fm',
+    builtin.man_pages,
+    { desc = 'Telescope man_pages' }
 )
--- vim.keymap.set(
--- 	'n',
--- 	'<leader>xx',
--- 	builtin.diagnostics,
--- 	{ desc = 'Telescope diagnostics' }
--- )
 vim.keymap.set(
-	'n',
-	'<leader>xn',
-	':Telescope notify<CR>',
-	{ desc = 'Telescope notify' }
+    'n',
+    '<leader>xn',
+    ':Telescope notify<CR>',
+    { desc = 'Telescope notify' }
 )
--- vim.keymap.set('n', '<leader>xx', ':FzfLua diagnostics_workspace<CR>')
 
 vim.keymap.set('n', '<leader>fs', vim.lsp.buf.document_symbol)
 vim.keymap.set('n', '<leader>gd', vim.lsp.buf.definition)
@@ -63,12 +55,13 @@ vim.keymap.set('n', '[q', ':cprev<CR>zz', { desc = 'Previous Quickfix Item' })
 vim.keymap.set('n', ']q', ':cnext<CR>zz', { desc = 'Next Quickfix Item' })
 vim.keymap.set('n', '<leader>qo', ':copen<CR>', { desc = 'Open Quickfix' })
 vim.keymap.set('n', '<leader>qc', ':cclose<CR>', { desc = 'Close Quickfix' })
+vim.keymap.set('n', '<leader>lp', ':LivePreview pick<cr>')
 vim.keymap.set('n', '<C-h>', ':NvimTmuxNavigateLeft<CR>', { silent = true })
 vim.keymap.set('n', '<C-j>', ':NvimTmuxNavigateDown<CR>', { silent = true })
 vim.keymap.set('n', '<C-k>', ':NvimTmuxNavigateUp<CR>', { silent = true })
 vim.keymap.set('n', '<C-l>', ':NvimTmuxNavigateRight<CR>', { silent = true })
--- vim.keymap.set('n', '<leader>fr', ':FlutterRun<CR>')
--- vim.keymap.set('n', '<leader>fq', ':FlutterQuit<CR>')
--- vim.keymap.set('n', '<leader>fR', ':FlutterReload<CR>')
--- vim.keymap.set('n', '<leader>frr', ':FlutterRestart<CR>')
 vim.keymap.set('n', '<leader>xx', ':Trouble diagnostics toggle<cr>')
+local dropbar_api = require("dropbar.api")
+vim.keymap.set("n", "<Leader>;", dropbar_api.pick, { desc = "Pick symbols in winbar" })
+vim.keymap.set("n", "[;", dropbar_api.goto_context_start, { desc = "Go to start of current context" })
+vim.keymap.set("n", "];", dropbar_api.select_next_context, { desc = "Select next context" })
diff --git a/nvim/.config/nvim/lua/DarthMooMancer/lsp.lua b/nvim/.config/nvim/lua/DarthMooMancer/lsp.lua
index a60bbc7..f40aac9 100644
--- a/nvim/.config/nvim/lua/DarthMooMancer/lsp.lua
+++ b/nvim/.config/nvim/lua/DarthMooMancer/lsp.lua
@@ -1,82 +1,90 @@
 require('mason').setup()
 require('mason-lspconfig').setup({
-	ensure_installed = {
-		'vtsls',
-		'lua_ls',
-		'pylsp',
-		'gopls',
-		'html',
-		'tailwindcss',
-		'bashls',
-	},
-	automatic_enable = false,
+    ensure_installed = {
+        'vtsls',
+        'lua_ls',
+        'pylsp',
+        'gopls',
+        'html',
+        'cssls',
+        'bashls',
+    },
+    automatic_enable = false,
 })
 
 require('nvim-treesitter').install({
-	'rust',
-	'c',
-	'cpp',
-	'lua',
-	'javascript',
-	'go',
-	'typescript',
-	'css',
-	'html',
-	'python',
-	'yaml',
+    'rust',
+    'c',
+    'cpp',
+    'lua',
+    'javascript',
+    'go',
+    'typescript',
+    'css',
+    'html',
+    'python',
+    'yaml',
 })
 
 require('conform').setup({
-	formatters_by_ft = {
-		rust = { 'rustfmt', lsp_format = 'fallback' },
-		lua = { 'stylua', lsp_format = 'fallback' },
-		javascript = { 'prettier', stop_after_first = true },
-		typescript = { 'prettier', stop_after_first = true },
-		json = { 'prettier' },
-		html = { 'prettier' },
-		go = { 'goimports' },
-		c = { 'clang-format' },
-		cpp = { 'clang-format' },
-		dart = { 'dart_format', lsp_format = 'fallback' },
-		['_'] = { 'trim_whitespace' },
-	},
-	format_on_save = {
-		timeout_ms = 2000,
-		lsp_format = 'fallback',
-	},
+    formatters_by_ft = {
+        rust = { 'rustfmt', lsp_format = 'fallback' },
+        lua = { 'stylua', lsp_format = 'fallback' },
+        javascript = { 'prettier', stop_after_first = true },
+        typescript = { 'prettier', stop_after_first = true },
+        json = { 'prettier' },
+        html = { 'prettier' },
+        go = { 'goimports' },
+        c = { 'clang-format' },
+        cpp = { 'clang-format' },
+        css = { 'csskit' },
+        dart = { 'dart_format', lsp_format = 'fallback' },
+        python = { 'autopep8' },
+        ['_'] = { 'trim_whitespace' },
+    },
+    format_on_save = {
+        timeout_ms = 2000,
+        lsp_format = 'fallback',
+    },
 })
 
 local capabilities = require('blink.cmp').get_lsp_capabilities()
 vim.lsp.config('lua_ls', {
-	capabilities = capabilities,
-	settings = {
-		Lua = {
-			diagnostics = { globals = { 'vim' } },
-			workspace = {
-				library = vim.api.nvim_get_runtime_file('', true),
-				checkThirdParty = false,
-			},
-		},
-	},
+    capabilities = capabilities,
+    settings = {
+        Lua = {
+            diagnostics = { globals = { 'vim' } },
+            workspace = {
+                library = vim.api.nvim_get_runtime_file('', true),
+                checkThirdParty = false,
+            },
+        },
+    },
 })
 vim.lsp.config('vtsls', {
-	settings = {
-		typescript = {
-			updateImportsOnFileMove = { enabled = 'always' },
-			inlayHints = {
-				parameterNames = { enabled = 'all' },
-				variableTypes = { enabled = true },
-			},
-		},
-	},
+    settings = {
+        typescript = {
+            updateImportsOnFileMove = { enabled = 'always' },
+            inlayHints = {
+                parameterNames = { enabled = 'all' },
+                variableTypes = { enabled = true },
+            },
+        },
+    },
+})
+
+vim.lsp.config('html', {
+    capabilities = capabilities,
 })
 
 vim.lsp.enable({
-	'lua_ls',
-	'clangd',
-	'rust-analyzer',
-	'vtsls',
-	'tailwindcss-language-server',
-	'vscode-html-language-server',
-	'gopls',
+    'lua_ls',
+    'clangd',
+    'rust-analyzer',
+    'vtsls',
+    'tailwindcss-language-server',
+    'cssls',
+    'html',
+    'gopls',
+    'pylsp'
 })
diff --git a/nvim/.config/nvim/lua/DarthMooMancer/opts.lua b/nvim/.config/nvim/lua/DarthMooMancer/opts.lua
index df17e4e..bb0b8e2 100644
--- a/nvim/.config/nvim/lua/DarthMooMancer/opts.lua
+++ b/nvim/.config/nvim/lua/DarthMooMancer/opts.lua
@@ -2,29 +2,32 @@ vim.opt.termguicolors = true
 vim.g.mapleader = ' '
 vim.opt.number = true
 vim.opt.relativenumber = true
-vim.opt.tabstop = 8 -- Number of spaces a <Tab> counts for
-vim.opt.shiftwidth = 8 -- Number of spaces for autoindent (>>, <<, etc.)
-vim.opt.softtabstop = 8 -- Number of spaces for <Tab> in insert mode (backspace deletes 4 spaces)
+vim.opt.tabstop = 8      -- Number of spaces a <Tab> counts for
+vim.opt.shiftwidth = 8   -- Number of spaces for autoindent (>>, <<, etc.)
+vim.opt.softtabstop = 8  -- Number of spaces for <Tab> in insert mode (backspace deletes 4 spaces)
 vim.opt.expandtab = true -- Use spaces instead of tabs
 vim.api.nvim_create_autocmd('FileType', {
-	callback = function(ev)
-		local map = {
-			-- c = { ts = 8, sw = 8, sts = 8, et = false },
-			-- cpp = { ts = 8, sw = 8, sts = 8, et = false },
-			-- go = { ts = 8, sw = 8, sts = 8, et = false },
-			rust = { ts = 4, sw = 4, sts = 4 },
-			lua = { ts = 4, sw = 4, sts = 4 },
-			python = { ts = 4, sw = 4, sts = 4 },
-			dart = { ts = 2, sw = 2, sts = 2 },
-		}
-		local ft = map[ev.match]
-		if ft then
-			vim.bo[ev.buf].tabstop = ft.ts
-			vim.bo[ev.buf].shiftwidth = ft.sw
-			vim.bo[ev.buf].softtabstop = ft.sts
-			vim.bo[ev.buf].expandtab = ft.et ~= nil and ft.et or true
-		end
-	end,
+    callback = function(ev)
+        local map = {
+            -- c = { ts = 8, sw = 8, sts = 8, et = false },
+            -- cpp = { ts = 8, sw = 8, sts = 8, et = false },
+            -- go = { ts = 8, sw = 8, sts = 8, et = false },
+            rust = { ts = 4, sw = 4, sts = 4 },
+            lua = { ts = 4, sw = 4, sts = 4 },
+            python = { ts = 4, sw = 4, sts = 4 },
+            dart = { ts = 2, sw = 2, sts = 2 },
+            html = { ts = 2, sw = 2, sts = 2 },
+            javascript = { ts = 2, sw = 2, sts = 2 },
+            typescript = { ts = 2, sw = 2, sts = 2 },
+        }
+        local ft = map[ev.match]
+        if ft then
+            vim.bo[ev.buf].tabstop = ft.ts
+            vim.bo[ev.buf].shiftwidth = ft.sw
+            vim.bo[ev.buf].softtabstop = ft.sts
+            vim.bo[ev.buf].expandtab = ft.et ~= nil and ft.et or true
+        end
+    end,
 })
 vim.opt.autoindent = true -- Copy indent from current line when starting a new line
 vim.opt.wrap = false
@@ -39,25 +42,27 @@ vim.g.netrw_browse_split = 0
 vim.g.netrw_banner = 0
 vim.g.netrw_liststyle = 3
 vim.g.netrw_winsize = 25
-vim.opt.wrapscan = true -- begin search from top of the file when nothng is found
-vim.opt.cursorline = true -- enable cursorline
+vim.opt.wrapscan = true                            -- begin search from top of the file when nothng is found
+vim.opt.cursorline = true                          -- enable cursorline
 vim.opt.cursorlineopt = { 'screenline', 'number' } -- cursorline look
 vim.opt.foldmethod = 'indent'
 vim.opt.foldcolumn = '1'
 vim.opt.foldenable = false
-vim.opt.shortmess = 'aF' -- abbreviates messages and prevents file name being echoed when opened
-vim.opt.ignorecase = true -- ignore cases when searching
-vim.opt.smartcase = true -- However if we use a capital in search string we then consider case-sensitivity, ignorecase is disabled
+vim.opt.shortmess = 'aF'    -- abbreviates messages and prevents file name being echoed when opened
+vim.opt.ignorecase = true   -- ignore cases when searching
+vim.opt.smartcase = true    -- However if we use a capital in search string we then consider case-sensitivity, ignorecase is disabled
 vim.opt.smartindent = false -- smarter indentation
-vim.opt.smarttab = true -- make tab behaviour smarter
+vim.opt.smarttab = true     -- make tab behaviour smarter
 vim.opt.laststatus = 3
 vim.opt.showmode = false
 vim.opt.cmdheight = 0
 vim.opt.smoothscroll = true
+vim.opt.spell = true
 vim.diagnostic.config({
-	virtual_text = true, -- This is the magic line
-	signs = true, -- Shows icons in the gutter
-	underline = true,
-	update_in_insert = false, -- Don't clutter the screen while typing
-	severity_sort = true,
+    virtual_text = true,      -- This is the magic line
+    signs = true,             -- Shows icons in the gutter
+    underline = true,
+    update_in_insert = false, -- Don't clutter the screen while typing
+    severity_sort = true,
 })
+vim.o.winborder = "rounded"
diff --git a/nvim/.config/nvim/lua/DarthMooMancer/plugins.lua b/nvim/.config/nvim/lua/DarthMooMancer/plugins.lua
index 597ad52..f30af30 100644
--- a/nvim/.config/nvim/lua/DarthMooMancer/plugins.lua
+++ b/nvim/.config/nvim/lua/DarthMooMancer/plugins.lua
@@ -1,60 +1,41 @@
 vim.pack.add({
-	-- Themes
-	{
-		src = 'https://github.com/rose-pine/neovim',
-		name = 'rose-pine',
-	},
-	{
-		src = 'https://github.com/ribru17/bamboo.nvim',
-	},
-	{
-		src = 'https://github.com/savq/melange-nvim',
-	},
-	{
-		src = 'https://github.com/mountain-theme/Mountain',
-	},
-	{
-		src = 'https://github.com/sainnhe/everforest',
-	},
-	{
-		src = 'https://github.com/rebelot/kanagawa.nvim',
-	},
+    -- Themes
+    { src = 'https://github.com/webhooked/kanso.nvim' },
 
-	-- The rest
-	{ src = 'https://github.com/mbbill/undotree' },
-	{
-		src = 'https://github.com/nvim-mini/mini.pairs',
-		version = vim.version.range('*'),
-	},
-	{
-		src = 'https://github.com/nvim-mini/mini.hipatterns',
-		version = vim.version.range('*'),
-	},
-	{ src = 'https://github.com/nvim-tree/nvim-web-devicons' },
-	{ src = 'https://github.com/nvim-telescope/telescope.nvim' },
-	{
-		src = 'https://github.com/saghen/blink.cmp',
-		version = vim.version.range('*'),
-	},
-	{ src = 'git@moo:dmm/polydev.git' },
-	{
-		src = 'https://github.com/nvim-treesitter/nvim-treesitter',
-		build = ':TSUpdate',
-	},
-	{ src = 'https://github.com/alexghergh/nvim-tmux-navigation' },
-	{ src = 'https://github.com/mason-org/mason.nvim' },
-	{ src = 'https://github.com/mason-org/mason-lspconfig.nvim' },
-	{ src = 'https://github.com/neovim/nvim-lspconfig' },
-	{ src = 'https://github.com/stevearc/conform.nvim' },
-	{ src = 'https://github.com/b0o/incline.nvim' },
-	{ src = 'https://github.com/windwp/nvim-ts-autotag' },
-	{ src = 'https://github.com/MunifTanjim/nui.nvim' },
-	-- { src = 'https://github.com/nvim-lualine/lualine.nvim' },
-	{ src = 'https://github.com/nvim-lua/plenary.nvim' },
-	{ src = 'https://github.com/folke/noice.nvim' },
-	-- { src = 'https://github.com/akinsho/flutter-tools.nvim' },
-	-- { src = 'https://github.com/mfussenegger/nvim-dap' },
-	{ src = 'https://github.com/stevearc/dressing.nvim' },
-	{ src = 'https://github.com/rcarriga/nvim-notify' },
-	{ src = 'https://github.com/folke/trouble.nvim' },
+    -- The rest
+    { src = 'https://github.com/mbbill/undotree' },
+    {
+        src = 'https://github.com/nvim-mini/mini.pairs',
+        version = vim.version.range('*'),
+    },
+    {
+        src = 'https://github.com/nvim-mini/mini.hipatterns',
+        version = vim.version.range('*'),
+    },
+    { src = 'https://github.com/nvim-tree/nvim-web-devicons' },
+    { src = 'https://github.com/nvim-telescope/telescope.nvim' },
+    {
+        src = 'https://github.com/saghen/blink.cmp',
+        version = vim.version.range('*'),
+    },
+    { src = 'https://git.moomancer.xyz/DarthMooMancer/polydev.git' },
+    {
+        src = 'https://github.com/nvim-treesitter/nvim-treesitter',
+        build = ':TSUpdate',
+    },
+    { src = 'https://github.com/alexghergh/nvim-tmux-navigation' },
+    { src = 'https://github.com/mason-org/mason.nvim' },
+    { src = 'https://github.com/mason-org/mason-lspconfig.nvim' },
+    { src = 'https://github.com/neovim/nvim-lspconfig' },
+    { src = 'https://github.com/stevearc/conform.nvim' },
+    { src = 'https://github.com/b0o/incline.nvim' },
+    { src = 'https://github.com/windwp/nvim-ts-autotag' },
+    { src = 'https://github.com/MunifTanjim/nui.nvim' },
+    { src = 'https://github.com/nvim-lua/plenary.nvim' },
+    { src = 'https://github.com/folke/noice.nvim' },
+    -- { src = 'https://github.com/stevearc/dressing.nvim' },
+    { src = 'https://github.com/rcarriga/nvim-notify' },
+    { src = 'https://github.com/folke/trouble.nvim' },
+    { src = 'https://github.com/brianhuster/live-preview.nvim' },
+    { src = 'https://github.com/Bekaboo/dropbar.nvim' },
 })
diff --git a/nvim/.config/nvim/lua/DarthMooMancer/tools.lua b/nvim/.config/nvim/lua/DarthMooMancer/tools.lua
index f317c1d..d6f5268 100644
--- a/nvim/.config/nvim/lua/DarthMooMancer/tools.lua
+++ b/nvim/.config/nvim/lua/DarthMooMancer/tools.lua
@@ -1,53 +1,84 @@
 local hipatterns = require('mini.hipatterns')
 hipatterns.setup({
-	highlighters = {
-		-- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE'
-		fixme = {
-			pattern = '%f[%w]()FIXME()%f[%W]',
-			group = 'MiniHipatternsFixme',
-		},
-		hack = {
-			pattern = '%f[%w]()HACK()%f[%W]',
-			group = 'MiniHipatternsHack',
-		},
-		todo = {
-			pattern = '%f[%w]()TODO()%f[%W]',
-			group = 'MiniHipatternsTodo',
-		},
-		note = {
-			pattern = '%f[%w]()NOTE()%f[%W]',
-			group = 'MiniHipatternsNote',
-		},
+    highlighters = {
+        -- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE'
+        fixme = {
+            pattern = '%f[%w]()FIXME()%f[%W]',
+            group = 'MiniHipatternsFixme',
+        },
+        hack = {
+            pattern = '%f[%w]()HACK()%f[%W]',
+            group = 'MiniHipatternsHack',
+        },
+        todo = {
+            pattern = '%f[%w]()TODO()%f[%W]',
+            group = 'MiniHipatternsTodo',
+        },
+        note = {
+            pattern = '%f[%w]()NOTE()%f[%W]',
+            group = 'MiniHipatternsNote',
+        },
 
-		hex_color = hipatterns.gen_highlighter.hex_color(),
-	},
+        hex_color = hipatterns.gen_highlighter.hex_color(),
+    },
 })
 
 require('mini.pairs').setup()
 require('nvim-tmux-navigation').setup({
-	disable_when_zoomed = true, -- defaults to false
+    disable_when_zoomed = true, -- defaults to false
 })
 
 require('blink.cmp').setup({
-	completion = {
-		menu = {
-			draw = {
-				columns = {
-					{ 'label', gap = 1 },
-					{ 'kind_icon', gap = 1, 'kind' },
-				},
-			},
-		},
-	},
+    completion = {
+        documentation = {
+            auto_show = true,
+            auto_show_delay_ms = 100,
+            window = {
+                winhighlight = 'Normal:NormalFloat,FloatBorder:TelescopeBorder,CursorLine:Visual,Search:None',
+            },
+        },
+        menu = {
+            draw = {
+                columns = {
+                    { "label",       "label_description", gap = 1 },
+                    { "kind_icon",   "kind",              gap = 1 },
+                    { "source_name", gap = 1 },
+                },
+            },
+            scrollbar = false,
+            winhighlight =
+            'Pmenu:NormalFloat,FloatBorder:TelescopeBorder,PmenuSel:TelescopeSelection,CursorLine:TelescopeSelection,Search:None',
+        },
+    },
 })
 
 require('Polydev').setup()
 require('nvim-ts-autotag').setup({
-	opts = {
-		enable_close = true, -- Auto close tags
-		enable_rename = true, -- Auto rename pairs of tags
-		enable_close_on_slash = false, -- Auto close on trailing </
-	},
+    opts = {
+        enable_close = true,           -- Auto close tags
+        enable_rename = true,          -- Auto rename pairs of tags
+        enable_close_on_slash = false, -- Auto close on trailing </
+    },
 })
 
 require('trouble').setup({})
+-- require('dropbar').setup({})
+require("telescope").setup({
+    defaults = {
+        prompt_prefix = "   ", -- Changes the search icon/prompt prefix
+        selection_caret = " ", -- Changes the arrow/caret next to the selected item
+        layout_strategy = "horizontal",
+        layout_config = {
+            horizontal = {
+                prompt_position = 'top',
+                prompt_min_width = 40,
+                prompt_max_width = 80,
+                preview_width = 80,
+            },
+        },
+        sorting_strategy = "ascending",
+        preview = {
+            hide_on_startup = true,
+        },
+    },
+})
diff --git a/nvim/.config/nvim/lua/DarthMooMancer/ui.lua b/nvim/.config/nvim/lua/DarthMooMancer/ui.lua
index 073a2cb..ac6e735 100644
--- a/nvim/.config/nvim/lua/DarthMooMancer/ui.lua
+++ b/nvim/.config/nvim/lua/DarthMooMancer/ui.lua
@@ -1,382 +1,366 @@
 --- Derive a highlight from an existing scheme group.
 local function derive_hl(name, opts)
-	local base = opts.base and vim.api.nvim_get_hl(0, { name = opts.base })
-		or {}
-	local fg = opts.fg and vim.api.nvim_get_hl(0, { name = opts.fg }) or {}
-	local bg = opts.bg and vim.api.nvim_get_hl(0, { name = opts.bg }) or {}
-	vim.api.nvim_set_hl(0, name, {
-		fg = fg.fg or base.fg,
-		bg = bg.bg or base.bg,
-		bold = opts.bold,
-	})
+    local base = opts.base and vim.api.nvim_get_hl(0, { name = opts.base })
+        or {}
+    local fg = opts.fg and vim.api.nvim_get_hl(0, { name = opts.fg }) or {}
+    local bg = opts.bg and vim.api.nvim_get_hl(0, { name = opts.bg }) or {}
+    vim.api.nvim_set_hl(0, name, {
+        fg = fg.fg or base.fg,
+        bg = bg.bg or base.bg,
+        bold = opts.bold,
+    })
 end
 --- Derive a mode highlight where bg comes from a syntax group and fg contrasts.
 local function derive_mode_hl(name, color_group)
-	local color = vim.api.nvim_get_hl(0, { name = color_group })
-	local status_bg = vim.api.nvim_get_hl(0, { name = 'StatusLine' })
-	vim.api.nvim_set_hl(0, name, {
-		bg = color.fg,
-		fg = status_bg.bg or '#191724',
-		bold = true,
-	})
+    local color = vim.api.nvim_get_hl(0, { name = color_group })
+    local status_bg = vim.api.nvim_get_hl(0, { name = 'StatusLine' })
+    vim.api.nvim_set_hl(0, name, {
+        bg = color.fg,
+        fg = status_bg.bg or '#191724',
+        bold = true,
+    })
 end
+
 --- (Re)build all statusline highlight groups from current scheme.
 local function setup_statusline_highlights()
-	derive_mode_hl('StatusModeNormal', 'Type')
-	derive_mode_hl('StatusModeInsert', 'String')
-	derive_mode_hl('StatusModeVisual', 'Statement')
-	derive_mode_hl('StatusModeCommand', 'PreProc')
-	derive_mode_hl('StatusModeReplace', 'WarningMsg')
-	derive_mode_hl('StatusModeTerminal', 'Special')
-	derive_hl('StatusGit', { base = 'CursorLine', fg = 'LineNr' })
-	derive_hl('StatusLsp', { base = 'StatusLine', fg = 'DiagnosticInfo' })
-	derive_hl('StatusLspSpinner', { base = 'StatusLine', fg = 'Constant' })
-	derive_hl(
-		'StatusDiagError',
-		{ base = 'StatusLine', fg = 'DiagnosticError' }
-	)
-	derive_hl('StatusDiagWarn', { base = 'StatusLine', fg = 'DiagnosticWarn' })
-	derive_hl('StatusDiagHint', { base = 'StatusLine', fg = 'DiagnosticHint' })
-	derive_hl('StatusCursor', { base = 'CursorLine', fg = 'Normal' })
-	-- derive_hl('StatusGitAdded', { base = 'StatusLine', fg = 'OkMsg' })
-	derive_hl('StatusGitAdded', { base = 'StatusLine', fg = 'MoreMsg' })
-	derive_hl(
-		'StatusGitRemoved',
-		{ base = 'StatusLine', fg = 'DiagnosticError' }
-	)
-	derive_hl('StatusRecording', { base = 'StatusLine', fg = 'WarningMsg' })
+    derive_mode_hl('StatusModeNormal', 'Type')
+    derive_mode_hl('StatusModeInsert', 'String')
+    derive_mode_hl('StatusModeVisual', 'Statement')
+    derive_mode_hl('StatusModeCommand', 'PreProc')
+    derive_mode_hl('StatusModeReplace', 'WarningMsg')
+    derive_mode_hl('StatusModeTerminal', 'Special')
+    derive_hl('StatusGit', { base = 'CursorLine', fg = 'LineNr' })
+    derive_hl('StatusLsp', { base = 'StatusLine', fg = 'DiagnosticInfo' })
+    derive_hl('StatusLspSpinner', { base = 'StatusLine', fg = 'Constant' })
+    derive_hl(
+        'StatusDiagError',
+        { base = 'StatusLine', fg = 'DiagnosticError' }
+    )
+    derive_hl('StatusDiagWarn', { base = 'StatusLine', fg = 'DiagnosticWarn' })
+    derive_hl('StatusDiagHint', { base = 'StatusLine', fg = 'DiagnosticHint' })
+    derive_hl('StatusCursor', { base = 'CursorLine', fg = 'Normal' })
+    -- derive_hl('StatusGitAdded', { base = 'StatusLine', fg = 'OkMsg' })
+    derive_hl('StatusGitAdded', { base = 'StatusLine', fg = 'MoreMsg' })
+    derive_hl(
+        'StatusGitRemoved',
+        { base = 'StatusLine', fg = 'DiagnosticError' }
+    )
+    derive_hl('StatusRecording', { base = 'StatusLine', fg = 'WarningMsg' })
 end
 vim.api.nvim_create_autocmd('ColorScheme', {
-	callback = setup_statusline_highlights,
+    callback = setup_statusline_highlights,
 })
 setup_statusline_highlights()
+
 --- Mode text mapping.
 local mode_map = {
-	['n'] = ' NORM ',
-	['i'] = ' INS ',
-	['v'] = ' VIS ',
-	['V'] = ' V-LINE ',
-	[''] = ' V-BLK ',
-	['R'] = ' REPL ',
-	['c'] = ' CMD ',
-	['t'] = ' TERM ',
+    ['n'] = ' NORM ',
+    ['i'] = ' INS ',
+    ['v'] = ' VIS ',
+    ['V'] = ' V-LINE ',
+    [''] = ' V-BLK ',
+    ['R'] = ' REPL ',
+    ['c'] = ' CMD ',
+    ['t'] = ' TERM ',
 }
 local mode_hl_map = {
-	['n'] = 'StatusModeNormal',
-	['i'] = 'StatusModeInsert',
-	['v'] = 'StatusModeVisual',
-	['V'] = 'StatusModeVisual',
-	[''] = 'StatusModeVisual',
-	['R'] = 'StatusModeReplace',
-	['c'] = 'StatusModeCommand',
-	['t'] = 'StatusModeTerminal',
+    ['n'] = 'StatusModeNormal',
+    ['i'] = 'StatusModeInsert',
+    ['v'] = 'StatusModeVisual',
+    ['V'] = 'StatusModeVisual',
+    [''] = 'StatusModeVisual',
+    ['R'] = 'StatusModeReplace',
+    ['c'] = 'StatusModeCommand',
+    ['t'] = 'StatusModeTerminal',
 }
 
 --- Git branch (async, cached per buffer, refreshed every 5s)
 local function update_git_branch()
-	if vim.bo.buftype ~= '' then
-		return
-	end
-	vim.system(
-		{ 'git', 'branch', '--show-current' },
-		{ text = true },
-		function(out)
-			vim.b.git_branch = (out.code == 0 and out.stdout or ''):gsub(
-				'%s+',
-				''
-			)
-		end
-	)
+    if vim.bo.buftype ~= '' then
+        return
+    end
+    vim.system(
+        { 'git', 'branch', '--show-current' },
+        { text = true },
+        function(out)
+            vim.b.git_branch = (out.code == 0 and out.stdout or ''):gsub(
+                '%s+',
+                ''
+            )
+        end
+    )
 end
 vim.uv.new_timer():start(5000, 5000, vim.schedule_wrap(update_git_branch))
 vim.api.nvim_create_autocmd({ 'BufEnter', 'FocusGained' }, {
-	callback = function()
-		update_git_branch()
-	end,
+    callback = function()
+        update_git_branch()
+    end,
 })
 
 --- LSP progress (Neovim 0.10+ built-in handler)
 local progress = {}
 local spinner_frames =
-	{ '⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷' }
+{ '⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷' }
 
 local frame = 0
 --- Clean stale progress messages periodically
 local progress_timer = vim.uv.new_timer()
 local function start_progress_timer()
-	if not progress_timer:is_active() then
-		progress_timer:start(0, 200, function()
-			local now = vim.loop.now()
-			for k, v in pairs(progress) do
-				local ttl = v.done and 2000 or 10000
-				if now - v.t > ttl then
-					progress[k] = nil
-				end
-			end
-			if next(progress) then
-				frame = (frame % #spinner_frames) + 1
-				vim.schedule(function()
-					vim.cmd('redrawstatus')
-				end)
-			else
-				progress_timer:stop()
-				vim.schedule(function()
-					vim.cmd('redrawstatus')
-				end)
-			end
-		end)
-	end
+    if not progress_timer:is_active() then
+        progress_timer:start(0, 200, function()
+            local now = vim.loop.now()
+            for k, v in pairs(progress) do
+                local ttl = v.done and 2000 or 10000
+                if now - v.t > ttl then
+                    progress[k] = nil
+                end
+            end
+            if next(progress) then
+                frame = (frame % #spinner_frames) + 1
+                vim.schedule(function()
+                    vim.cmd('redrawstatus')
+                end)
+            else
+                progress_timer:stop()
+                vim.schedule(function()
+                    vim.cmd('redrawstatus')
+                end)
+            end
+        end)
+    end
 end
 
 vim.api.nvim_create_autocmd('LspProgress', {
-	callback = function(ev)
-		local d = ev.data
-		if not d then
-			return
-		end
-		local params = d.params
-		if not params or not params.token then
-			return
-		end
-		local key = d.client_id .. ':' .. tostring(params.token)
-		local value = params.value or {}
-		if value.kind == 'begin' then
-			progress[key] = {
-				msg = (value.message or 'working...'):gsub('%%', '%%%%'),
-				t = vim.loop.now(),
-			}
-			start_progress_timer()
-		elseif value.kind == 'report' then
-			local msg_parts = {}
-			if value.message then
-				msg_parts[#msg_parts + 1] = value.message
-			end
-			if value.percentage ~= nil then
-				msg_parts[#msg_parts + 1] = '(' .. value.percentage .. '%%)'
-			end
-			progress[key] = {
-				msg = table.concat(msg_parts, ' '),
-				t = vim.loop.now(),
-			}
-		elseif value.kind == 'end' then
-			if progress[key] then
-				progress[key].done = true
-			end
-			vim.cmd('redrawstatus')
-		end
-	end,
+    callback = function(ev)
+        local d = ev.data
+        if not d then
+            return
+        end
+        local params = d.params
+        if not params or not params.token then
+            return
+        end
+        local key = d.client_id .. ':' .. tostring(params.token)
+        local value = params.value or {}
+        if value.kind == 'begin' then
+            progress[key] = {
+                msg = (value.message or 'working...'):gsub('%%', '%%%%'),
+                t = vim.loop.now(),
+            }
+            start_progress_timer()
+        elseif value.kind == 'report' then
+            local msg_parts = {}
+            if value.message then
+                msg_parts[#msg_parts + 1] = value.message
+            end
+            if value.percentage ~= nil then
+                msg_parts[#msg_parts + 1] = '(' .. value.percentage .. '%%)'
+            end
+            progress[key] = {
+                msg = table.concat(msg_parts, ' '),
+                t = vim.loop.now(),
+            }
+        elseif value.kind == 'end' then
+            if progress[key] then
+                progress[key].done = true
+            end
+            vim.cmd('redrawstatus')
+        end
+    end,
 })
 
 vim.api.nvim_create_autocmd({ 'LspAttach', 'LspDetach' }, {
-	callback = function(args)
-		local names = {}
-		for _, c in ipairs(vim.lsp.get_clients({ bufnr = args.buf })) do
-			table.insert(names, c.name)
-		end
-		vim.b[args.buf].lsp_names = #names > 0
-				and (' ● ' .. table.concat(names, ', ') .. ' ')
-			or ''
-	end,
+    callback = function(args)
+        local names = {}
+        for _, c in ipairs(vim.lsp.get_clients({ bufnr = args.buf })) do
+            table.insert(names, c.name)
+        end
+        vim.b[args.buf].lsp_names = #names > 0
+            and (' ● ' .. table.concat(names, ', ') .. ' ')
+            or ''
+    end,
 })
 
 local function lsp_section()
-	local client_ids = {}
-	for _, c in
-		ipairs(vim.lsp.get_clients({ bufnr = vim.api.nvim_get_current_buf() }))
-	do
-		client_ids[c.id] = true
-	end
-	local latest = nil
-	for key, p in pairs(progress) do
-		local cid = tonumber(key:match('^(%d+):'))
-		if cid and client_ids[cid] then
-			if not latest or p.t > latest.t then
-				latest = p
-			end
-		end
-	end
-	if latest and (not latest.done or (vim.loop.now() - latest.t < 2000)) then
-		return '%#StatusLspSpinner# ○ ' .. latest.msg .. ' %*'
-	end
-	return '%#StatusLsp#' .. (vim.b.lsp_names or '') .. '%*'
+    local client_ids = {}
+    for _, c in
+    ipairs(vim.lsp.get_clients({ bufnr = vim.api.nvim_get_current_buf() }))
+    do
+        client_ids[c.id] = true
+    end
+    local latest = nil
+    for key, p in pairs(progress) do
+        local cid = tonumber(key:match('^(%d+):'))
+        if cid and client_ids[cid] then
+            if not latest or p.t > latest.t then
+                latest = p
+            end
+        end
+    end
+    if latest and (not latest.done or (vim.loop.now() - latest.t < 2000)) then
+        return '%#StatusLspSpinner# ○ ' .. latest.msg .. ' %*'
+    end
+    return '%#StatusLsp#' .. (vim.b.lsp_names or '') .. '%*'
 end
 
 local diag_cache = {}
 local function build_diag_string(counts)
-	local parts = {}
-	if counts[1] and counts[1] > 0 then
-		table.insert(parts, '%#StatusDiagError# E' .. counts[1] .. ' %*')
-	end
-	if counts[2] and counts[2] > 0 then
-		table.insert(parts, '%#StatusDiagWarn# W' .. counts[2] .. ' %*')
-	end
-	if counts[4] and counts[4] > 0 then
-		table.insert(parts, '%#StatusDiagHint# H' .. counts[4] .. ' %*')
-	end
-	return table.concat(parts)
+    local parts = {}
+    if counts[1] and counts[1] > 0 then
+        table.insert(parts, '%#StatusDiagError# E' .. counts[1] .. ' %*')
+    end
+    if counts[2] and counts[2] > 0 then
+        table.insert(parts, '%#StatusDiagWarn# W' .. counts[2] .. ' %*')
+    end
+    if counts[4] and counts[4] > 0 then
+        table.insert(parts, '%#StatusDiagHint# H' .. counts[4] .. ' %*')
+    end
+    return table.concat(parts)
 end
 
 local function update_diag_cache(ev)
-	diag_cache[ev.buf] = build_diag_string(vim.diagnostic.count(ev.buf))
+    diag_cache[ev.buf] = build_diag_string(vim.diagnostic.count(ev.buf))
 end
 vim.api.nvim_create_autocmd(
-	'DiagnosticChanged',
-	{ callback = update_diag_cache }
+    'DiagnosticChanged',
+    { callback = update_diag_cache }
 )
 
 local function update_git_diff()
-	if vim.bo.buftype ~= '' then
-		return
-	end
-	local file = vim.fn.expand('%:p')
-	if file == '' then
-		return
-	end
-	vim.system(
-		{ 'git', 'diff', '--numstat', 'HEAD', '--', file },
-		{ text = true },
-		function(out)
-			if out.code ~= 0 or out.stdout == '' then
-				vim.b.git_diff = nil
-				return
-			end
-			local added, removed = out.stdout:match('(%d+)%s+(%d+)')
-			vim.b.git_diff = {
-				added = tonumber(added) or 0,
-				removed = tonumber(removed) or 0,
-			}
-		end
-	)
+    if vim.bo.buftype ~= '' then
+        return
+    end
+    local file = vim.fn.expand('%:p')
+    if file == '' then
+        return
+    end
+    vim.system(
+        { 'git', 'diff', '--numstat', 'HEAD', '--', file },
+        { text = true },
+        function(out)
+            if out.code ~= 0 or out.stdout == '' then
+                vim.b.git_diff = nil
+                return
+            end
+            local added, removed = out.stdout:match('(%d+)%s+(%d+)')
+            vim.b.git_diff = {
+                added = tonumber(added) or 0,
+                removed = tonumber(removed) or 0,
+            }
+        end
+    )
 end
 vim.api.nvim_create_autocmd({ 'BufEnter', 'FocusGained', 'BufWritePost' }, {
-	callback = update_git_diff,
+    callback = update_git_diff,
 })
 
 function _G.__statusline()
-	local m = vim.fn.mode()
-	local mode_hl = mode_hl_map[m] or 'StatusModeNormal'
-	local git = vim.b.git_branch or ''
-	local cur_buf = vim.api.nvim_get_current_buf()
-	local parts = {
-		'%#' .. mode_hl .. '#' .. (mode_map[m] or ' ??  ') .. '%*',
-		git ~= '' and ('%#StatusGit#  ' .. git .. ' %*') or '',
-	}
-	local diff = vim.b.git_diff
-	if diff and (diff.added > 0 or diff.removed > 0) then
-		if diff.added > 0 then
-			table.insert(parts, '%#StatusGitAdded# +' .. diff.added .. ' %*')
-		end
-		if diff.removed > 0 then
-			table.insert(
-				parts,
-				'%#StatusGitRemoved# -' .. diff.removed .. ' %*'
-			)
-		end
-	end
-	table.insert(parts, lsp_section())
-	table.insert(parts, '%=')
-	local recording = vim.fn.reg_recording()
-	if recording ~= '' then
-		table.insert(
-			parts,
-			'%#StatusRecording# ● Rec @' .. recording .. ' %*'
-		)
-	end
-	table.insert(
-		parts,
-		diag_cache[cur_buf] or build_diag_string(vim.diagnostic.count(cur_buf))
-	)
-	table.insert(parts, '%#StatusCursor# %l:%-2c %*')
-	table.insert(parts, '%#' .. mode_hl .. '# %p%% %*')
-	return table.concat(parts)
+    local m = vim.fn.mode()
+    local mode_hl = mode_hl_map[m] or 'StatusModeNormal'
+    local git = vim.b.git_branch or ''
+    local cur_buf = vim.api.nvim_get_current_buf()
+    local parts = {
+        '%#' .. mode_hl .. '#' .. (mode_map[m] or ' ??  ') .. '%*',
+        git ~= '' and ('%#StatusGit#  ' .. git .. ' %*') or '',
+    }
+    local diff = vim.b.git_diff
+    if diff and (diff.added > 0 or diff.removed > 0) then
+        if diff.added > 0 then
+            table.insert(parts, '%#StatusGitAdded# +' .. diff.added .. ' %*')
+        end
+        if diff.removed > 0 then
+            table.insert(
+                parts,
+                '%#StatusGitRemoved# -' .. diff.removed .. ' %*'
+            )
+        end
+    end
+    table.insert(parts, lsp_section())
+    table.insert(parts, '%=')
+    local recording = vim.fn.reg_recording()
+    if recording ~= '' then
+        table.insert(
+            parts,
+            '%#StatusRecording# ● Rec @' .. recording .. ' %*'
+        )
+    end
+    table.insert(
+        parts,
+        diag_cache[cur_buf] or build_diag_string(vim.diagnostic.count(cur_buf))
+    )
+    table.insert(parts, '%#StatusCursor# %l:%-2c %*')
+    table.insert(parts, '%#' .. mode_hl .. '# %p%% %*')
+    return table.concat(parts)
 end
 
 vim.o.statusline = '%!v:lua.__statusline()'
 
 require('incline').setup({
-	window = {
-		padding = 0,
-		margin = { horizontal = 0 },
-		options = {
-			-- Reset winhl so it doesn't force total transparency
-			winhl = 'Normal:InclineNormal',
-		},
-	},
-	render = function(props)
-		local filename =
-			vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ':t')
-		if filename == '' then
-			filename = '[No Name]'
-		end
-		local ft_icon, ft_color =
-			require('nvim-web-devicons').get_icon_color(filename)
-		local modified = vim.bo[props.buf].modified
+    window = { margin = { vertical = 0, horizontal = 1 } },
+    hide = { cursorline = true },
+    render = function(props)
+        local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ":t")
+        if vim.bo[props.buf].modified then
+            filename = "[+] " .. filename
+        end
 
-		return {
-			ft_icon and {
-				' ',
-				ft_icon,
-				' ',
-				guibg = ft_color,
-				guifg = require('incline.helpers').contrast_color(ft_color),
-			} or '',
-			-- Wrap the text and padding inside a structural block linked to 'CursorLine'
-			{
-				' ',
-				{ filename, gui = modified and 'bold,italic' or 'bold' },
-				' ',
-				group = 'CursorLine',
-			},
-		}
-	end,
+        local icon, color = require("nvim-web-devicons").get_icon_color(filename)
+        return { { icon, guifg = color }, { " " }, { filename } }
+    end,
+    -- window = {
+    --     padding = 0,
+    --     margin = { horizontal = 0 },
+    --     options = {
+    --         -- Reset winhl so it doesn't force total transparency
+    --         winhl = 'Normal:InclineNormal',
+    --     },
+    -- },
+    -- render = function(props)
+    --     local filename =
+    --         vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ':t')
+    --     if filename == '' then
+    --         filename = '[No Name]'
+    --     end
+    --     local ft_icon, ft_color =
+    --         require('nvim-web-devicons').get_icon_color(filename)
+    --     local modified = vim.bo[props.buf].modified
+    --
+    --     return {
+    --         ft_icon and {
+    --             ' ',
+    --             ft_icon,
+    --             ' ',
+    --             guibg = ft_color,
+    --             guifg = require('incline.helpers').contrast_color(ft_color),
+    --             -- guibg = ft_color,
+    --             -- guifg = require('incline.helpers').contrast_color(ft_color),
+    --         } or '',
+    --         -- Wrap the text and padding inside a structural block linked to 'CursorLine'
+    --         {
+    --             ' ',
+    --             { filename, gui = modified and 'bold,italic' or 'bold' },
+    --             ' ',
+    --             group = 'CursorLine',
+    --         },
+    --     }
+    -- end,
 })
--- require('incline').setup({
--- 	window = {
--- 		padding = 0,
--- 		margin = { horizontal = 0 },
--- 	},
--- 	render = function(props)
--- 		local filename =
--- 			vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ':t')
--- 		if filename == '' then
--- 			filename = '[No Name]'
--- 		end
--- 		local ft_icon, ft_color =
--- 			require('nvim-web-devicons').get_icon_color(filename)
--- 		local modified = vim.bo[props.buf].modified
--- 		-- Query 'StatusLine' since your custom highlights derive from it
--- 		return {
--- 			ft_icon and {
--- 				' ',
--- 				ft_icon,
--- 				' ',
--- 				guibg = ft_color,
--- 				guifg = require('incline.helpers').contrast_color(ft_color),
--- 			} or '',
--- 			' ',
--- 			{ filename, gui = modified and 'bold,italic' or 'bold' },
--- 			' ',
--- 			guibg = '#363646',
--- 		}
--- 	end,
--- })
-
 require('noice').setup({
-	lsp = {
-		-- 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,
-		},
-	},
-	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 = false, -- add a border to hover docs and signature help
-	},
+    lsp = {
+        -- 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,
+        },
+    },
+    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 = false,       -- add a border to hover docs and signature help
+    },
 })
 require('notify').setup({
-	background_colour = '#000000',
+    background_colour = '#000000',
 })
diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json
index a3d8b0e..bbb6d51 100644
--- a/nvim/.config/nvim/nvim-pack-lock.json
+++ b/nvim/.config/nvim/nvim-pack-lock.json
@@ -1,74 +1,38 @@
 {
   "plugins": {
-    "Mountain": {
-      "rev": "27db65fef4654095bf7e46a8930f411b6545fbe5",
-      "src": "https://github.com/mountain-theme/Mountain"
-    },
-    "bamboo.nvim": {
-      "rev": "1309bc88bffcf1bedc3e84e7fa9004de93da774a",
-      "src": "https://github.com/ribru17/bamboo.nvim"
-    },
     "blink.cmp": {
       "rev": "78336bc89ee5365633bcf754d93df01678b5c08f",
       "src": "https://github.com/saghen/blink.cmp",
       "version": ">=0.0.0"
     },
-    "catppuccin": {
-      "rev": "05e8787020dcfdb937bf2ff23855ea2415b4e072",
-      "src": "https://github.com/catppuccin/nvim"
-    },
     "conform.nvim": {
-      "rev": "619363c30309d29ffa631e67c8183f2a72caa373",
+      "rev": "016802de402556da54c36bd7359b441266b01cdd",
       "src": "https://github.com/stevearc/conform.nvim"
     },
-    "dart-vim-plugin": {
-      "rev": "13fa42674f1685a1c5a095c1dac74d94e43a9849",
-      "src": "https://github.com/dart-lang/dart-vim-plugin"
-    },
-    "dressing.nvim": {
-      "rev": "2d7c2db2507fa3c4956142ee607431ddb2828639",
-      "src": "https://github.com/stevearc/dressing.nvim"
-    },
-    "everforest": {
-      "rev": "85a86eb62409e3ec88713bff3d1b9d7374e112e4",
-      "src": "https://github.com/sainnhe/everforest"
-    },
-    "flutter-tools.nvim": {
-      "rev": "7d1acfd139215e02d2784733af69a61aaebe06e8",
-      "src": "https://github.com/akinsho/flutter-tools.nvim"
-    },
-    "fzf-lua": {
-      "rev": "532d463f5c83595192fe740572d8fd6902b2217a",
-      "src": "https://github.com/ibhagwan/fzf-lua"
+    "dropbar.nvim": {
+      "rev": "808ba31cde89aec8833e9789f5e04557cd31c9e1",
+      "src": "https://github.com/Bekaboo/dropbar.nvim"
     },
     "incline.nvim": {
       "rev": "debd628e9395f7a9da57bdc31ce75ca6b40a880b",
       "src": "https://github.com/b0o/incline.nvim"
     },
-    "kanagawa.nvim": {
-      "rev": "bb85e4bfc8d89b0e62c8fa53ccdd13d12e2f77b3",
-      "src": "https://github.com/rebelot/kanagawa.nvim"
+    "kanso.nvim": {
+      "rev": "1afbbb449aa0254823dbe1932e3cbb51886ff9fe",
+      "src": "https://github.com/webhooked/kanso.nvim"
     },
-    "lsp-status.nvim": {
-      "rev": "54f48eb5017632d81d0fd40112065f1d062d0629",
-      "src": "https://github.com/nvim-lua/lsp-status.nvim"
-    },
-    "lualine.nvim": {
-      "rev": "221ce6b2d999187044529f49da6554a92f740a96",
-      "src": "https://github.com/nvim-lualine/lualine.nvim"
+    "live-preview.nvim": {
+      "rev": "a6307fa340ed7c0d96f5c567afc8c991aad94ce0",
+      "src": "https://github.com/brianhuster/live-preview.nvim"
     },
     "mason-lspconfig.nvim": {
-      "rev": "a4068c3ebd4cb335b25239e5ea35c22ee6007962",
+      "rev": "b5576cd62899a1a478d0e67ef3d378ee55dba82d",
       "src": "https://github.com/mason-org/mason-lspconfig.nvim"
     },
     "mason.nvim": {
       "rev": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d",
       "src": "https://github.com/mason-org/mason.nvim"
     },
-    "melange-nvim": {
-      "rev": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce",
-      "src": "https://github.com/savq/melange-nvim"
-    },
     "mini.hipatterns": {
       "rev": "607d604e650cdf21d71f863d040c496a1d0cb320",
       "src": "https://github.com/nvim-mini/mini.hipatterns",
@@ -79,24 +43,16 @@
       "src": "https://github.com/nvim-mini/mini.pairs",
       "version": ">=0.0.0"
     },
-    "mini.statusline": {
-      "rev": "127997ebef7ef632161203b960c5ef9d158f4810",
-      "src": "https://github.com/nvim-mini/mini.statusline"
-    },
     "noice.nvim": {
       "rev": "7bfd942445fb63089b59f97ca487d605e715f155",
       "src": "https://github.com/folke/noice.nvim"
     },
     "nui.nvim": {
-      "rev": "de740991c12411b663994b2860f1a4fd0937c130",
+      "rev": "10fc361835c856ba4233ef5ea135b919bf3dce97",
       "src": "https://github.com/MunifTanjim/nui.nvim"
     },
-    "nvim-dap": {
-      "rev": "9e848e09a697ee95302a3ef2dd43fd6eb709e570",
-      "src": "https://github.com/mfussenegger/nvim-dap"
-    },
     "nvim-lspconfig": {
-      "rev": "d5b6e3db4c17b0146f63a2fc47e2027a754b2cb1",
+      "rev": "84b6b6c3f13cb34a6c8a0354b0da4c67d8ccf867",
       "src": "https://github.com/neovim/nvim-lspconfig"
     },
     "nvim-notify": {
@@ -108,7 +64,7 @@
       "src": "https://github.com/alexghergh/nvim-tmux-navigation"
     },
     "nvim-treesitter": {
-      "rev": "4916d6592ede8c07973490d9322f187e07dfefac",
+      "rev": "5cb0114e6242625db56dd6440e945ed1ece10bc7",
       "src": "https://github.com/nvim-treesitter/nvim-treesitter"
     },
     "nvim-ts-autotag": {
@@ -116,7 +72,7 @@
       "src": "https://github.com/windwp/nvim-ts-autotag"
     },
     "nvim-web-devicons": {
-      "rev": "0ca28b61a04fe7426cefbdd52c2647ef0e335b5f",
+      "rev": "5f032a85be210cd1c6ac98861eb3b187ff3bd5eb",
       "src": "https://github.com/nvim-tree/nvim-web-devicons"
     },
     "plenary.nvim": {
@@ -124,19 +80,11 @@
       "src": "https://github.com/nvim-lua/plenary.nvim"
     },
     "polydev": {
-      "rev": "8d41141e9ab68c271bb8bb2db5528bb0a61c78eb",
-      "src": "git@moo:dmm/polydev.git"
-    },
-    "rose-pine": {
-      "rev": "ff483051a47e27d84bdef47703538df1ed9f4a47",
-      "src": "https://github.com/rose-pine/neovim"
-    },
-    "statusline.lua": {
-      "rev": "4c7083cdd8b902ce06762861124ac4c031b2e581",
-      "src": "https://github.com/beauwilliams/statusline.lua"
+      "rev": "2b30e36fade3272081f7166bc0ec614b0b7da1c9",
+      "src": "https://git.moomancer.xyz/DarthMooMancer/polydev.git"
     },
     "telescope.nvim": {
-      "rev": "427b576c16792edad01a92b89721d923c19ad60f",
+      "rev": "40aedd8a68c78a656a10a8d62d80c54af59420fb",
       "src": "https://github.com/nvim-telescope/telescope.nvim"
     },
     "trouble.nvim": {
diff --git a/ssh/.DS_Store b/ssh/.DS_Store
index d659cf60be0e0bf8541d7960b0cf82f1e3af644b..15ab3adb83dfd12b4d2970c77f03f2b8b75615e6 100644
GIT binary patch
delta 75
zcmZoMXfc?u+~E!b0|N_#9z!t@X5{9(xFqG|CjrGcbUlyDoaH;=h$^3gF2C`)tT+Jv
ChZOe!

delta 75
zcmZoMXfc?u+~G6>0|N_#9z!t@X5{9(xFqG|CjrGcs-88>(z$lr5mi0~U4G+pS#bb4
CJ{NQV

diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index fd982f0..433f0c8 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -4,12 +4,13 @@ Host *
   IdentityFile ~/.ssh/id_ed25519
 
 Host moo
-    HostName 192.168.5.16
+    # HostName 192.168.5.16
+    HostName 100.78.144.113
     User git
     IdentityFile ~/.ssh/id_ed25519  # Path to your private key
 
 Host oasis
-    HostName 192.168.5.16
+    HostName 100.78.144.113
     User andrew
     Port 2222
     IdentityFile ~/.ssh/id_ed25519
diff --git a/tmux/.config/tmux/plugins/tpm b/tmux/.config/tmux/plugins/tpm
index 99469c4..e261deb 160000
--- a/tmux/.config/tmux/plugins/tpm
+++ b/tmux/.config/tmux/plugins/tpm
@@ -1 +1 @@
-Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946
+Subproject commit e261deb1b47614eed3400089ce7197dc68acc4eb
diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf
index c762279..a6bbc04 100644
--- a/tmux/.config/tmux/tmux.conf
+++ b/tmux/.config/tmux/tmux.conf
@@ -14,8 +14,10 @@ set -g status-style 'bg=default' # Completely transparent container
 set -g status-left-length 100
 set -g status-left "#[fg=colour4,bg=default,bold]  #S #[fg=colour8,nobold]│ "
 
-set -g status-right-length 150
-set -g status-right "#[fg=colour5]󰃭 %m-%d #[fg=colour8]│ #[fg=colour1]󱑒 %H:%M "
+# set -g status-right-length 150
+# set -g status-right "#[fg=colour5]󰃭 %m-%d #[fg=colour8]│ #[fg=colour1]󱑒 %H:%M "
+# set -g status-right "#[fg=colour3] #{b:pane_current_path} "
+set -g status-right ""
 
 set -g window-status-current-format "#[fg=colour6,bg=default,bold] #F#I:#W"
 set -g window-status-format "#[fg=colour7,bg=default] #I:#W"