Revert "Breaking changes for blink.cmp, so that needed to be updated. Updated keymaps location based on that plugin as well."

This reverts commit 2cafc91ba1.

Hopefully this successfully pushes to Github. Removed secrets.

nvim/.config/nvim/init.lua

@@ -1,14 +1,17 @@
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-  if not vim.loop.fs_stat(lazypath) then
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
-    vim.fn.system({
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-      "git",
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-      "clone",
+  if vim.v.shell_error ~= 0 then
-      "--filteer=blob:none",
+    vim.api.nvim_echo({
-      "https://github.com/folke/lazy.nvim.git",
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      "--branch=stable", -- latest stable release
+      { out, "WarningMsg" },
-      lazypath,
+      { "\nPress any key to exit..." },
-    })
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
   end
+end
 vim.opt.rtp:prepend(lazypath)
 
 vim.g.mapleader = ','
@@ -48,14 +51,17 @@ g.markdown_folding = 1
 -- g.markdown_enable_folding = 1
 opt.spell=true
 opt.spelllang = 'en_us'
-cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]]
+opt.autochdir = true
+vim.cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]]
+-- vim.cmd [[ autocmd autochdir ]]
 -----------------------------------------------------------
 -- Neovim UI
 -----------------------------------------------------------
 opt.number = true               -- Show line number
 opt.relativenumber = true       -- Show Current Line with Relative numbers above and below cursor.
 opt.showmatch = true            -- Highlight matching parenthesis
-opt.foldmethod = "syntax"       -- Enable folding (default 'foldmarker')
+opt.foldmethod = "expr"       -- Enable folding (default 'foldmarker')
+opt.foldexpr = "nvim_treesitter#foldexpr()"
 opt.splitright = true           -- Vertical split to the right
 opt.splitbelow = true           -- Horizontal split to the bottom
 opt.ignorecase = true           -- Ignore case letters when search
@@ -78,9 +84,9 @@ opt.termguicolors = true      -- Enable 24-bit RGB colors
 -----------------------------------------------------------
 -- Tabs, indent
 -----------------------------------------------------------
-g.expandtab = true            -- Use spaces instead of tabs
+g.expandtab = false            -- Use spaces instead of tabs
 g.shiftwidth = 2              -- Shift 4 spaces when tab
-g.tabstop = 1                 -- 1 tab == 4 spaces
+g.tabstop = 2                 -- 1 tab == 4 spaces
 g.smartindent = true          -- Autoindent new lines
 -----------------------------------------------------------
 -- Glow Settings
@@ -96,13 +102,13 @@ g.glow_style = 'dark'
 -----------------------------------------------------------
 -- 2 spaces for selected filetypes
 vim.cmd [[
-  autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=4 noexpandtab
+  autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=2 noexpandtab
   ]]
-vim.cmd [[ autocmd FileType python set textwidth=110 ]]
+vim.cmd [[ autocmd FileType python set textwidth=250 ]]
 vim.cmd [[ autocmd FileType lua set textwidth=80 ]]
 vim.cmd [[ autocmd FileType markdown,text set shiftwidth=2 foldlevel=99 ]]
 -- vim.cmd [[ autocmd FileType markdown setlocal foldlevel=99 ]]
-vim.cmd[[ colorscheme eldritch ]]
+vim.cmd[[ colorscheme duskfox ]]
 
 local disabled_built_ins = {
     "netrw",

nvim/.config/nvim/lazy-lock.json

@@ -1,91 +1,96 @@
 {
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" },
-  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
+  "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
   "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" },
-  "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" },
+  "avante.nvim": { "branch": "main", "commit": "01e05a538b4b7f20fb922016d72be8c42d400b0e" },
-  "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" },
+  "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "blink.cmp": { "branch": "main", "commit": "d534f9e8bf39299c480e0c2e11dad21f51cfb2fe" },
-  "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
+  "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" },
-  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "blink.cmp": { "branch": "main", "commit": "ae5a4ce8f7e519e49de7ae6fcadd74547f820a52" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "blink.cmp": { "branch": "main", "commit": "ae5a4ce8f7e519e49de7ae6fcadd74547f820a52" },
-  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
+  "deadcolumn.nvim": { "branch": "master", "commit": "897c905aef1a268ce4cc507d5cce048ed808fa7a" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" },
+  "dracula.nvim": { "branch": "main", "commit": "515acae4fd294fcefa5b15237a333c2606e958d1" },
-  "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
+  "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "eldritch.nvim": { "branch": "master", "commit": "d3df98f58841bdbd88fbe1ca27c9eb76ccca6572" },
-  "deadcolumn.nvim": { "branch": "master", "commit": "af13928aa281f36273e8f220b19e78d497c7fb87" },
-  "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
-  "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" },
-  "eldritch.nvim": { "branch": "master", "commit": "dee72af67a089f7a4a7bbc64f7de06ae826362fd" },
   "f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" },
-  "fidget.nvim": { "branch": "main", "commit": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5" },
+  "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
-  "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" },
+  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
-  "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
+  "hover.nvim": { "branch": "main", "commit": "140c4d0ae9397b76baa46b87c574f5377de09309" },
-  "hover.nvim": { "branch": "main", "commit": "ebdc4c0f967bb36b70bb27763397dd71064c2067" },
+  "img-clip.nvim": { "branch": "main", "commit": "5ff183655ad98b5fc50c55c66540375bbd62438c" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
-  "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" },
+  "kanagawa.nvim": { "branch": "master", "commit": "ad3dddecd606746374ba4807324a08331dfca23c" },
-  "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" },
+  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
-  "lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" },
   "lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "lush.nvim": { "branch": "main", "commit": "7c0e27f50901481fe83b974493c4ea67a4296aeb" },
+  "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" },
-  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
-  "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" },
+  "mini.comment": { "branch": "main", "commit": "03c13e37318bdb18481311c0ac1adc9ed731caf1" },
-  "mini.fuzzy": { "branch": "stable", "commit": "986d83dfced0dc36c442a4172bcfd7281703f269" },
+  "mini.fuzzy": { "branch": "stable", "commit": "ea9d1380ad925c4d0e890f68dbf830d2b19bae5d" },
-  "mini.hipatterns": { "branch": "main", "commit": "088bbfef23e17934080f125751a94a2758ba7fdf" },
+  "mini.hipatterns": { "branch": "main", "commit": "f34975103a38b3f608219a1324cdfc58ea660b8b" },
-  "mini.move": { "branch": "main", "commit": "251d541a8ab745e81295a53c128829cb2bff18e3" },
+  "mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" },
-  "mini.pairs": { "branch": "stable", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" },
+  "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" },
-  "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" },
+  "mini.pairs": { "branch": "stable", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" },
-  "mini.trailspace": { "branch": "main", "commit": "91f2e0c1b0ee7b72189e6f88da03da9d04077051" },
+  "mini.pick": { "branch": "main", "commit": "b87f4d4e75673f6e7b918408017833424ecaa245" },
-  "mkdnflow.nvim": { "branch": "main", "commit": "4c8890890426d57f20fc6d459c7631e0bbb50975" },
+  "mini.surround": { "branch": "main", "commit": "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e" },
-  "neoscroll.nvim": { "branch": "master", "commit": "0a86b3dc2555cb7872feedca64ef036b8417fb73" },
+  "mini.trailspace": { "branch": "main", "commit": "3a328e62559c33014e422fb9ae97afc4208208b1" },
-  "neovim": { "branch": "main", "commit": "17b466e79479758b332a3cac12544a3ad2be6241" },
+  "mkdnflow.nvim": { "branch": "main", "commit": "d459bd7ce68910272038ed037c028180161fd14d" },
-  "night-owl.nvim": { "branch": "main", "commit": "87ce125baa29bfdee064418fb49ed484dfce2766" },
+  "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" },
-  "nightfly": { "branch": "master", "commit": "a54ba6131c4e5feb47176efb78b1f93501df1572" },
+  "neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" },
-  "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" },
+  "night-owl.nvim": { "branch": "main", "commit": "86ed124c2f7e118670649701288e024444bf91e5" },
-  "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
+  "nightfly": { "branch": "master", "commit": "f1176605eb01b38d84e0e9e221c9599bd022dfd4" },
+  "nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" },
+  "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
   "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
-  "nvim": { "branch": "main", "commit": "a1439ad7c584efb3d0ce14ccb835967f030450fe" },
+  "nvim": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" },
-  "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
+  "nvim-cmp": { "branch": "main", "commit": "98e8b9d593a5547c126a39212d6f5e954a2d85dd" },
-  "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
+  "nvim-dap": { "branch": "master", "commit": "7e48a80551e0b8fd7e34436d74243de7ae1ec397" },
-  "nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" },
+  "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
-  "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" },
+  "nvim-http": { "branch": "main", "commit": "9a0e97b639d34af17d06b3421fe633b416dd64ee" },
-  "nvim-http": { "branch": "main", "commit": "11de61bcdf01f4728dd8d8bbcd48901d220c28cc" },
+  "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" },
-  "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" },
+  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
-  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
   "nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" },
-  "nvim-tree.lua": { "branch": "master", "commit": "ddd1d6eb21c45433bdc65cc8015f2457998f2bf2" },
+  "nvim-treesitter": { "branch": "master", "commit": "cfbc1c0e0ff63e5b5e37b465b915b95fc2e98cef" },
-  "nvim-treesitter": { "branch": "master", "commit": "160e5d52c841dc9261c0b2dc6f253bddbcf3d766" },
+  "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" },
-  "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" },
+  "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" },
-  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
+  "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
+  "nvim-tree.lua": { "branch": "master", "commit": "375e38673b5c61debd8074ced01cfd4f3b7ce1e9" },
+  "nvim-treesitter": { "branch": "master", "commit": "fa915a30c5cdf1d18129e9ef6ac2ee0fa799904f" },
+  "nvim-ufo": { "branch": "main", "commit": "270ca542dae992ffe40274718c63645217ebc8bf" },
+  "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" },
+  "oil.nvim": { "branch": "master", "commit": "dba037598843973b8c54bc5ce0318db4a0da439d" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "7ef0766b5cd2f5cdf4fcb08886f0a2ebf65981fa" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "77e5bad54227dcfe3878ffbda88ab1efdaacb475" },
-  "rainbow_csv.nvim": { "branch": "main", "commit": "5033e3abd4fb0a0ee07232530a032296535704b4" },
+  "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" },
-  "solarized-osaka.nvim": { "branch": "main", "commit": "92c5def2b522e7869b29b55b448544f226e07524" },
+  "render-markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" },
-  "sonokai": { "branch": "master", "commit": "da162343354fbd9bf9cd49293a856f0e3761e8ac" },
+  "solarized-osaka.nvim": { "branch": "main", "commit": "eebeb55b2bca73db287b5a6bf9b8c4b7d0317515" },
-  "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" },
+  "sonokai": { "branch": "master", "commit": "fd42b20963c34dfc1744ac31f6a6efe78f4edad2" },
-  "telescope-cmdline.nvim": { "branch": "main", "commit": "9d4ef3e16e117e7ce91cb335247c87fb8d744696" },
+  "spacecamp": { "branch": "master", "commit": "8945b4a2bfaaa16fbcee9f1d7c00cb9c1256b591" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "4d5fd21bae12ee6e9a79232e1c377f43c419d0c5" },
+  "telescope-cmdline.nvim": { "branch": "main", "commit": "8b05928ac1b9f2b772cedde891faa6669b0ec59a" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
-  "telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
+  "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" },
   "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
   "thethethe.nvim": { "branch": "main", "commit": "357580127cd291c8a813564eeaff07c09303084e" },
-  "tmux.nvim": { "branch": "main", "commit": "53ea7eab504730e7e8397fd2ae0133053d56afc8" },
+  "tmux.nvim": { "branch": "main", "commit": "307bad95a1274f7288aaee09694c25c8cbcd6f1a" },
-  "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
+  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
+  "toggleterm.nvim": { "branch": "main", "commit": "022ff5594acccc8d90d2e46dc43994f7722ebdf7" },
-  "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" },
+  "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" },
-  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
+  "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
-  "venn.nvim": { "branch": "main", "commit": "a5430d75875acbe93e9685cdeb78c6eb2a329ed5" },
+  "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" },
   "vim-arduino": { "branch": "master", "commit": "2ded67cdf09bb07c4805d9e93d478095ed3d8606" },
   "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" },
-  "vim-wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" },
+  "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" },
-  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "9e354e86fcc67a5ec2c104f312e374ea2f89c799" },
-  "wtf.nvim": { "branch": "main", "commit": "8e7bec4d3cb2ea2e3d078b9af8c4cc68d1066c33" }
+  "vim-dadbod-ui": { "branch": "master", "commit": "0fec59e3e1e619e302198cd491b7d27f8d398b7c" },
-}
+  "vim-wakatime": { "branch": "master", "commit": "cf51327a9e08935569614d1cb24e779ee9f45519" },
+  "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" },
+  "wtf.nvim": { "branch": "main", "commit": "16eec1f32c3608bd8519e9e520041fe34201abb0" }
+}

nvim/.config/nvim/lua/core/keymaps.lua

@@ -27,10 +27,6 @@ map('n', '<leader>q', '<Plug>vem_move_buffer_left', default_opts)
 -- Nvim-Tree
 map('n', '<leader>v', ':NvimTreeToggle<CR>', default_opts)
 
--- Nvim Sidebar
-map('n', '<leader>n', ':SidebarNvimToggle<CR>', default_opts)
-map('n', '<leader>q', ':SidebarNvimUpdate<CR>', default_opts)
-
 -- Telescope
 map('n', '<leader>ff', ':Telescope find_files<CR>', default_opts)
 map('n', '<leader>fh', ':Telescope live_grep<CR>', default_opts)
@@ -45,6 +41,7 @@ map('n', '<leader>cb', ':Telescope current_buffer_fuzzy_find<CR>', default_opts)
 map('n', '<leader>b', ':! black %<CR>', default_opts)
 map('n', '<leader>m', ':! markdownlint -f %<CR>', default_opts)
 map('n', '<leader>pj', ':!python -m json.tool<CR>', default_opts)
+map('n', '<leader>cs', ':%s/\\s*\\([^|]\\{-}\\)\\s*|/"\1",/g', default_opts)
 
 -- Fold all comments
 map('n', '<leader>fc', ':set foldmethod=expr foldexpr=getline(v:lnum)=~"^\\s*".&commentstring[0]<CR>', default_opts)

nvim/.config/nvim/lua/plugins/avante.lua

@@ -0,0 +1,46 @@
+return {
+  "yetone/avante.nvim",
+  event = "VeryLazy",
+  lazy = false,
+  version = false, -- set this if you want to always pull the latest change
+  opts = {
+    -- add any opts here
+  },
+  -- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
+  build = "make",
+  -- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows
+  dependencies = {
+    "stevearc/dressing.nvim",
+    "nvim-lua/plenary.nvim",
+    "MunifTanjim/nui.nvim",
+    --- The below dependencies are optional,
+    "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
+    "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
+    "zbirenbaum/copilot.lua", -- for providers='copilot'
+    {
+      -- support for image pasting
+      "HakonHarnes/img-clip.nvim",
+      event = "VeryLazy",
+      opts = {
+        -- recommended settings
+        default = {
+          embed_image_as_base64 = false,
+          prompt_for_file_name = false,
+          drag_and_drop = {
+            insert_mode = true,
+          },
+          -- required for Windows users
+          use_absolute_path = true,
+        },
+      },
+    },
+    {
+      -- Make sure to set this up properly if you have lazy=true
+      'MeanderingProgrammer/render-markdown.nvim',
+      opts = {
+        file_types = { "markdown", "Avante" },
+      },
+      ft = { "markdown", "Avante" },
+    },
+  },
+}

nvim/.config/nvim/lua/plugins/blink.lua

@@ -0,0 +1,49 @@
+return {
+  'saghen/blink.cmp',
+  lazy = false, -- lazy loading handled internally
+  -- optional: provides snippets for the snippet source
+  dependencies = {
+									'rafamadriz/friendly-snippets',
+									'L3MON4D3/LuaSnip',
+									},
+  version = 'v0.*',
+  opts = {
+		keymap = {
+      preset = "enter",
+
+      ["<Tab>"] = {
+        "select_next",
+        "snippet_forward",
+        "fallback",
+      },
+
+      ["<S-Tab>"] = {
+        "select_prev",
+        "snippet_backward",
+        "fallback",
+      },
+    },
+
+    highlight = {
+      use_nvim_cmp_as_default = true,
+					nerd_font_variant = 'normal',
+				}
+			},
+		trigger = {
+			completion = {
+							keyword_regex = '[%w_\\-]',
+							blocked_trigger_characters = { ' ', '\n', '\t' },
+							show_on_insert_on_trigger_character = true,
+        }
+						},
+		 sources = {
+						providers = {
+							{
+								{ 'blink.cmp.sources.lsp' },
+								{ 'blink.cmp.sources.path' },
+								{ 'blink.cmp.sources.snippets', score_offset = -1 },
+							},
+							{ { 'blink.cmp.sources.buffer' } },
+					}
+        },
+	}

nvim/.config/nvim/lua/plugins/gitsigns.lua

@@ -2,47 +2,49 @@ return   -- Signs for Git Status Information
   {
   'lewis6991/gitsigns.nvim',
   config = function()
-    require('gitsigns').setup {
+    require('gitsigns').setup ()
-      signs = {
+	end
-	add          = {hl = 'GitSignsAdd'   , text = '│', numhl='GitSignsAddNr'   , linehl='GitSignsAddLn'},
-	change       = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
-	delete       = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
-	topdelete    = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
-	changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
-      },
-      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 = {
-	interval = 1000,
-	follow_files = true
-      },
-      attach_to_untracked = true,
-      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,
-      },
-      current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
-      sign_priority = 1,
-      update_debounce = 100,
-      status_formatter = nil, -- Use default
-      max_file_length = 40000,
-      preview_config = {
-	-- Options passed to nvim_open_win
-	border = 'double',
-	style = 'normal',
-	relative = 'cursor',
-	row = 0,
-	col = 2
-      },
-      yadm = {
-	enable = false
-      },
-    }
-  end
 }
+      -- signs = {
+	-- add          = {hl = 'GitSignsAdd'   , text = '│', numhl='GitSignsAddNr'   , linehl='GitSignsAddLn'},
+	-- change       = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
+	-- delete       = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
+	-- topdelete    = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
+	-- changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
+      -- },
+--       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 = {
+-- 	interval = 1000,
+-- 	follow_files = true
+--       },
+--       attach_to_untracked = true,
+--       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,
+--       },
+--       current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
+--       sign_priority = 1,
+--       update_debounce = 100,
+--       status_formatter = nil, -- Use default
+--       max_file_length = 40000,
+--       preview_config = {
+-- 	-- Options passed to nvim_open_win
+-- 	border = 'double',
+-- 	style = 'normal',
+-- 	relative = 'cursor',
+-- 	row = 0,
+-- 	col = 2
+--       },
+-- 	--      yadm = {
+-- 	-- enable = false
+--       -- },
+--     }
+--   end
+-- }
 

nvim/.config/nvim/lua/plugins/headlines.lua

@@ -1,51 +0,0 @@
-return {
-      'lukas-reineke/headlines.nvim',
-	  dependencies = "nvim-treesitter/nvim-treesitter",
-	  config = function()
-	  require("headlines").setup {
-	  markdown = {
-        query = vim.treesitter.query.parse(
-            "markdown",
-            [[
-                (atx_heading [
-                    (atx_h1_marker)
-                    (atx_h2_marker)
-                    (atx_h3_marker)
-                    (atx_h4_marker)
-                    (atx_h5_marker)
-                    (atx_h6_marker)
-                ] @headline)
-
-                (thematic_break) @dash
-
-                (fenced_code_block) @codeblock
-
-                (block_quote_marker) @quote
-                (block_quote (paragraph (inline (block_continuation) @quote)))
-		  ]]
-        ),
-		headline_highlights = {
-				'Headline1',
-				'Headline2',
-				'Headline3',
-				'Headline4',
-				'Headline5',
-				'Headline6',
-			},
-        codeblock_highlight = "CodeBlock",
-        dash_highlight = "Dash",
-        dash_string = "-",
-        quote_highlight = "Quote",
-        quote_string = "┃",
-        fat_headlines = false,
-	},
-  }
-	  vim.api.nvim_set_hl(0, 'Headline1', { fg = '#ffffff', bg = '#6272A4', italic = false })
-      vim.api.nvim_set_hl(0, 'Headline2', { fg = '#000000', bg = '#8BE9FD', italic = false })
-      vim.api.nvim_set_hl(0, 'Headline3', { fg = '#000000', bg = '#BD93F9', italic = false })
-      vim.api.nvim_set_hl(0, 'Headline4', { fg = '#000000', bg = '#FFB86C', italic = false })
-      vim.api.nvim_set_hl(0, 'Headline5', { fg = '#000000', bg = '#FF79C6', italic = false })
-      vim.api.nvim_set_hl(0, 'Headline6', { fg = '#000000', bg = '#FF5555', italic = false })
-      vim.api.nvim_set_hl(0, 'CodeBlock', { bg = '#222221' })
-  end
-}

nvim/.config/nvim/lua/plugins/headlines.lua.backup

@@ -0,0 +1,51 @@
+-- return {
+--       'lukas-reineke/headlines.nvim',
+-- 	  dependencies = "nvim-treesitter/nvim-treesitter",
+-- 	  config = function()
+-- 	  require("headlines").setup {
+-- 	  markdown = {
+--         query = vim.treesitter.query.parse(
+--             "markdown",
+--             [[
+--                 (atx_heading [
+--                     (atx_h1_marker)
+--                     (atx_h2_marker)
+--                     (atx_h3_marker)
+--                     (atx_h4_marker)
+--                     (atx_h5_marker)
+--                     (atx_h6_marker)
+--                 ] @headline)
+--
+--                 (thematic_break) @dash
+--
+--                 (fenced_code_block) @codeblock
+--
+--                 (block_quote_marker) @quote
+--                 (block_quote (paragraph (inline (block_continuation) @quote)))
+-- 		  ]]
+--         ),
+-- 		headline_highlights = {
+-- 				'Headline1',
+-- 				'Headline2',
+-- 				'Headline3',
+-- 				'Headline4',
+-- 				'Headline5',
+-- 				'Headline6',
+-- 			},
+--         codeblock_highlight = "CodeBlock",
+--         dash_highlight = "Dash",
+--         dash_string = "-",
+--         quote_highlight = "Quote",
+--         quote_string = "┃",
+--         fat_headlines = false,
+-- 	},
+--   }
+-- 	  vim.api.nvim_set_hl(0, 'Headline1', { fg = '#ffffff', bg = '#6272A4', italic = false })
+--       vim.api.nvim_set_hl(0, 'Headline2', { fg = '#000000', bg = '#8BE9FD', italic = false })
+--       vim.api.nvim_set_hl(0, 'Headline3', { fg = '#000000', bg = '#BD93F9', italic = false })
+--       vim.api.nvim_set_hl(0, 'Headline4', { fg = '#000000', bg = '#FFB86C', italic = false })
+--       vim.api.nvim_set_hl(0, 'Headline5', { fg = '#000000', bg = '#FF79C6', italic = false })
+--       vim.api.nvim_set_hl(0, 'Headline6', { fg = '#000000', bg = '#FF5555', italic = false })
+--       vim.api.nvim_set_hl(0, 'CodeBlock', { bg = '#222221' })
+--   end
+-- }

nvim/.config/nvim/lua/plugins/init.lua

@@ -47,23 +47,30 @@ return {
 
   -- {"ellisonleao/glow.nvim", config = function() require("glow").setup() end },
 
-    'saadparwaiz1/cmp_luasnip',
+    -- 'saadparwaiz1/cmp_luasnip',
-    'hrsh7th/cmp-nvim-lsp-signature-help',
+    -- 'hrsh7th/cmp-nvim-lsp-signature-help',
-    'lukas-reineke/cmp-under-comparator',
+    -- 'lukas-reineke/cmp-under-comparator',
 
-  {
+  -- {
-    'asiryk/auto-hlsearch.nvim',
+  --   'asiryk/auto-hlsearch.nvim',
-    version = "1.1.0",
+  --   version = "1.1.0",
-    config = function() require("auto-hlsearch").setup{} end,
+  --   config = function() require("auto-hlsearch").setup{} end,
-  },
+  -- },
 
 ------------------------------------------------------------
 -- General Functionality
 ------------------------------------------------------------
 
+	{
+  'stevearc/oil.nvim',
+  opts = {},
+  dependencies = { { "echasnovski/mini.icons", opts = {} } },
+  -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons
+	},
   { 'kenn7/vim-arsync',
 	dependencies={'prabirshrestha/async.vim'},
   },
+  {'kevinhwang91/nvim-ufo', requires = 'kevinhwang91/promise-async'},
 
   { 'MaximilianLloyd/adjacent.nvim' },
   'BlackLight/nvim-http',
@@ -97,32 +104,32 @@ return {
 },
 
 -- Nvim Tree File Manager on the Left
-{
+-- {
-  "nvim-tree/nvim-tree.lua",
+--   "nvim-tree/nvim-tree.lua",
-  version = "*",
+--   version = "*",
-  lazy = false,
+--   lazy = false,
-  dependencies = {
+--   dependencies = {
-    "nvim-tree/nvim-web-devicons",
+--     "nvim-tree/nvim-web-devicons",
-  },
+--   },
-  config = function()
+--   config = function()
-    require("nvim-tree").setup({
+--     require("nvim-tree").setup({
-        sort_by = "case_sensitive",
+--         sort_by = "case_sensitive",
-	view = {
+-- 	view = {
-	  width = 30,
+-- 	  width = 30,
-	},
+-- 	},
-	renderer = {
+-- 	renderer = {
-	  group_empty = true,
+-- 	  group_empty = true,
-	},
+-- 	},
-	filters = {
+-- 	filters = {
-	  dotfiles = true,
+-- 	  dotfiles = true,
-	},
+-- 	},
-	diagnostics = {
+-- 	diagnostics = {
-	  enable = true,
+-- 	  enable = true,
-	},
+-- 	},
-      })
+--       })
-  end,
+--   end,
-},
+-- },
-
+--
   -- Tmux Navigation
   {
     "aserowy/tmux.nvim",
@@ -166,8 +173,7 @@ return {
       }
     end
   },
-  "hrsh7th/nvim-cmp",       -- optional, for completion
+  -- "hrsh7th/nvim-cmp",       -- optional, for completion
-  "ggandor/lightspeed.nvim",
 
 -- Top Right Notify Pop Up
 	 {
@@ -188,6 +194,12 @@ return {
 -- echasnovski's Minis get a section of their own...
 ------------------------------------------------------------
 
+
+{ 'echasnovski/mini.pick', version = '*',
+	config = function()
+			require('mini.pick').setup()
+		end
+	},
 {
     'echasnovski/mini.comment', version = '*',
     config = function()
@@ -263,23 +275,23 @@ return {
 -- Markdown Plugins
 ------------------------------------------------------------
 
-   {
+  --  {
-    "iamcco/markdown-preview.nvim",
+  --   "iamcco/markdown-preview.nvim",
-    build = "cd app && npm install",
+  --   build = "cd app && npm install",
-    ft = "markdown",
+  --   ft = "markdown",
-    lazy = true,
+  --   lazy = true,
-    keys = { { "gm", "<cmd>MarkdownPreviewToggle<cr>", desc = "Markdown Preview" } },
+  --   keys = { { "gm", "<cmd>MarkdownPreviewToggle<cr>", desc = "Markdown Preview" } },
-    init = function()
+  --   init = function()
-	  vim.g.mkdp_filetypes = { "markdown" }
+  --  vim.g.mkdp_filetypes = { "markdown" }
-      vim.g.mkdp_auto_close = true
+  --     vim.g.mkdp_auto_close = true
-      vim.g.mkdp_open_to_the_world = false
+  --     vim.g.mkdp_open_to_the_world = false
-      vim.g.mkdp_open_ip = "127.0.0.1"
+  --     vim.g.mkdp_open_ip = "127.0.0.1"
-      vim.g.mkdp_port = "8888"
+  --     vim.g.mkdp_port = "8888"
-      vim.g.mkdp_browser = ""
+  --     vim.g.mkdp_browser = ""
-      vim.g.mkdp_echo_preview_url = true
+  --     vim.g.mkdp_echo_preview_url = true
-      vim.g.mkdp_page_title = "${name}"
+  --     vim.g.mkdp_page_title = "${name}"
-    end,
+  --   end,
-  },
+  -- },
   { "jbyuki/venn.nvim" },
  --[[
   { 'toppair/peek.nvim',
@@ -292,14 +304,14 @@ return {
   -- DAP (Debug adaptor Protocol)
   'mfussenegger/nvim-dap',
 
- {
+ -- {
-   'mfussenegger/nvim-dap-python',
+ --   'mfussenegger/nvim-dap-python',
-   config = function()
+ --   config = function()
-     require('dap-python').setup(
+ --     require('dap-python').setup(
-     '~/.virtualenvs/debugpy/bin/python'
+ --     '~/.virtualenvs/debugpy/bin/python'
-     )
+ --     )
-    end
+ --    end
-  },
+ --  },
   {
 	'rcarriga/nvim-dap-ui', dependencies = {"mfussenegger/nvim-dap"}
   },
@@ -308,12 +320,12 @@ return {
 -- Text, Icons, Symbols
 ----------------------------------------------------------
 
-  {
+  -- {
-    'simrat39/symbols-outline.nvim',
+  --   'simrat39/symbols-outline.nvim',
-    config = function()
+  --   config = function()
-      require('symbols-outline').setup()
+  --     require('symbols-outline').setup()
-    end
+  --   end
-  },
+  -- },
   {
   "j-hui/fidget.nvim",
   opts = {
@@ -375,6 +387,7 @@ return {
 -----------------------------------------------------------
 
 
+	{'jaredgorski/spacecamp'},
   {
 	"eldritch-theme/eldritch.nvim",
 	lazy = false,

nvim/.config/nvim/lua/plugins/mini-deps.lua

@@ -0,0 +1,37 @@
+-- return {
+-- 	'echasnovski/mini.deps', version='*',
+-- 	config = function()
+-- 		require('mini.deps').setup({
+-- 			path = { package = path_package }
+-- 		})
+-- 	end
+--
+-- 		local add, later, now = MiniDeps.add, MiniDeps.later, MiniDeps.now
+--
+--
+-- 		add({
+-- 			source = 'yetone/avante.nvim',
+-- 			monitor = 'main',
+-- 			depends = {
+-- 				'stevearc/dressing.nvim',
+-- 				'nvim-lua/plenary.nvim',
+-- 				'MunifTanjim/nui.nvim',
+-- 				'echasnovski/mini.icons'
+-- 			},
+-- 			hooks = { post_checkout = function() vim.cmd('make') end }
+-- 		})
+-- 		--- optional
+-- 		add({ source = 'hrsh7th/nvim-cmp' })
+-- 		add({ source = 'zbirenbaum/copilot.lua' })
+-- 		add({ source = 'HakonHarnes/img-clip.nvim' })
+-- 		add({ source = 'MeanderingProgrammer/render-markdown.nvim' })
+--
+-- 		now(function() require('avante_lib').load() end)
+-- 		later(function() require('render-markdown').setup({...}) end)
+-- 		later(function()
+-- 			require('img-clip').setup({...}) -- config img-clip
+-- 			require("copilot").setup({...}) -- setup copilot to your liking
+-- 			require("avante").setup({...}) -- config for avante.nvim
+-- 		end)
+--
+-- }

nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua

@@ -1,22 +1,32 @@
 return {
    'neovim/nvim-lspconfig',
    config = function()
-      -- Setup language servers.
+	-- Setup language servers.
-	local lspconfig = require('lspconfig')
+		local lspconfig = require('lspconfig')
-	local configs = require('lspconfig.configs')
+		local configs = require('lspconfig.configs')
-	lspconfig.pylsp.setup{
+		local capabilities = vim.lsp.protocol.make_client_capabilities()
-	-- Server-specific settings. See `:help lspconfig-setup`
+		capabilities.textDocument.completion.completionItem.snippetSupport = true
-	settings = {
+		lspconfig.emmet_ls.setup{
-	    settings = {
+			on_attach = on_attach,
-	      pylsp = {
+			capabilities = capabilities,
-			configurationSources = {"pylint"},
+			filetypes = { "css", "eruby", "html", "javascript", "javascriptreact", "less", "sass", "scss", "svelte", "pug", "typescriptreact", "vue", "liquid" },
-			plugins = {
+			init_options = {
-		  pylint = { enabled = true },
+				html = {
-		    }
+					options = {
-		  }
+						["bem.enabled"] = true,
+					},
+				},
+			}
 		}
-	      }
+		lspconfig.ruff.setup{
-	}
+			on_attach = on_attach,
+			init_options = {
+				settings = {
+					args = {},
+				}
+			}
+		}
+
       -- Global mappings.
       -- See `:help vim.diagnostic.*` for documentation on any of the below functions
       vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
@@ -54,39 +64,5 @@ return {
 	  end, opts)
 	end,
       })
-
+	end,
-	 local capabilities = vim.lsp.protocol.make_client_capabilities()
+	}
-	capabilities.textDocument.completion.completionItem.snippetSupport = true
-
-	if not configs.ls_emmet then
-	  configs.ls_emmet = {
-		default_config = {
-		  cmd = { 'ls_emmet', '--stdio' };
-		  filetypes = {
-			'html',
-			'liquid',
-			'css',
-			'scss',
-			'javascriptreact',
-			'typescriptreact',
-			'haml',
-			'xml',
-			'xsl',
-			'pug',
-			'slim',
-			'sass',
-			'stylus',
-			'less',
-			'sss',
-			'handlebars',
-		  };
-		  root_dir = function(fname)
-			return vim.loop.cwd()
-		  end;
-		  settings = {};
-		};
-	  }
-	end
-	lspconfig.ls_emmet.setup { capabilities = capabilities }
-	  end
-}

nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua.backup

@@ -0,0 +1,107 @@
+--  return {
+--   'neovim/nvim-lspconfig',
+--   config = function()
+--      -- Setup language servers.
+--	local lspconfig = require('lspconfig')
+--	local configs = require('lspconfig/configs')
+--	local capabilities = vim.lsp.protocol.make_client_capabilities()
+--	capabilities.textDocument.completion.completionItem.snippetSupport = true
+--
+--	lspconfig.emmet_ls.setup{
+--			-- on_attach = on_attach,
+--			capabilities = capabilities,
+--			filetypes = { "css", "eruby", "html", "javascript", "javascriptreact", "less", "sass", "scss", "svelte", "pug", "typescriptreact", "vue","liquid" },
+--			init_options = {
+--				html = {
+--					options = {
+--						["bem.enabled"] = true,
+--					},
+--				},
+--			}
+--	}
+--	-- lspconfig.pylsp.setup{
+--	-- -- Server-specific settings. See `:help lspconfig-setup`
+--	-- settings = {
+--	--     settings = {
+--	--       pylsp = {
+--	-- 		configurationSources = {"pylint"},
+--	-- 		plugins = {
+--	-- 	  pylint = { enabled = true },
+--	-- 	    }
+--	-- 	  }
+--	-- 	}
+--	--       }
+--	-- }
+--      -- Global mappings.
+--      -- See `:help vim.diagnostic.*` for documentation on any of the below functions
+--      vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
+--      vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
+--      vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
+--      vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
+--
+--      -- Use LspAttach autocommand to only map the following keys
+--      -- after the language server attaches to the current buffer
+--      vim.api.nvim_create_autocmd('LspAttach', {
+--	group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+--	callback = function(ev)
+--	  -- Enable completion triggered by <c-x><c-o>
+--	  vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
+--
+--	  -- Buffer local mappings.
+--	  -- See `:help vim.lsp.*` for documentation on any of the below functions
+--	  local opts = { buffer = ev.buf }
+--	  vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+--	  vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+--	  vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+--	  vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+--	  vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+--	  vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
+--	  vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
+--	  vim.keymap.set('n', '<space>wl', function()
+--	    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+--	  end, opts)
+--	  vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
+--	  vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
+--	  vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
+--	  vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+--	  vim.keymap.set('n', '<space>f', function()
+--	    vim.lsp.buf.format { async = true }
+--	  end, opts)
+--	end,
+--      })
+--
+--	--  local capabilities = vim.lsp.protocol.make_client_capabilities()
+--	-- capabilities.textDocument.completion.completionItem.snippetSupport = true
+--	--
+--	-- if not configs.ls_emmet then
+--	--   configs.ls_emmet = {
+--	-- 	default_config = {
+--	-- 	  cmd = { 'ls_emmet', '--stdio' };
+--	-- 	  filetypes = {
+--	-- 		'html',
+--	-- 		'liquid',
+--	-- 		'css',
+--	-- 		'scss',
+--	-- 		'javascriptreact',
+--	-- 		'typescriptreact',
+--	-- 		'haml',
+--	-- 		'xml',
+--	-- 		'xsl',
+--	-- 		'pug',
+--	-- 		'slim',
+--	-- 		'sass',
+--	-- 		'stylus',
+--	-- 		'less',
+--	-- 		'sss',
+--	-- 		'handlebars',
+--	-- 	  };
+--	-- 	  root_dir = function(fname)
+--	-- 		return vim.loop.cwd()
+--	-- 	  end;
+--	-- 	  settings = {};
+--	-- 	};
+--	--   }
+--	-- end
+--	-- lspconfig.ls_emmet.setup { capabilities = capabilities }
+--	--   end
+--}

nvim/.config/nvim/lua/plugins/vim-dadbod-ui.lua

@@ -0,0 +1,17 @@
+return {
+  'kristijanhusak/vim-dadbod-ui',
+  dependencies = {
+    { 'tpope/vim-dadbod', lazy = true },
+    { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true }, -- Optional
+  },
+  cmd = {
+    'DBUI',
+    'DBUIToggle',
+    'DBUIAddConnection',
+    'DBUIFindBuffer',
+  },
+  init = function()
+    -- Your DBUI configuration
+    vim.g.db_ui_use_nerd_fonts = 1
+  end,
+}

nvim/.config/nvim/spell/en.utf-8.add

@@ -344,3 +344,6 @@ submodules
 Artera
 Qualtrics
 Discoverability
+programatically
+#ASEURL/!
+BASEURL/!

tmux-powerline/config.sh.default

@@ -1,228 +0,0 @@
-# Default configuration file for tmux-powerline.
-# Modeline {
-#	 vi: foldmarker={,} foldmethod=marker foldlevel=0 tabstop=4 filetype=sh
-# }
-
-# General {
-	# Show which segment fails and its exit code.
-	export TMUX_POWERLINE_DEBUG_MODE_ENABLED="false"
-	# Use patched font symbols.
-	export TMUX_POWERLINE_PATCHED_FONT_IN_USE="true"
-
-	# The theme to use.
-	export TMUX_POWERLINE_THEME="default"
-	# Overlay directory to look for themes. There you can put your own themes outside the repo. Fallback will still be the "themes" directory in the repo.
-	export TMUX_POWERLINE_DIR_USER_THEMES="${XDG_CONFIG_HOME:-$HOME/.config}/tmux-powerline/themes"
-	# Overlay directory to look for segments. There you can put your own segments outside the repo. Fallback will still be the "segments" directory in the repo.
-	export TMUX_POWERLINE_DIR_USER_SEGMENTS="${XDG_CONFIG_HOME:-$HOME/.config}/tmux-powerline/segments"
-
-	# The initial visibility of the status bar. Can be {"on, off"}.
-	export TMUX_POWERLINE_STATUS_VISIBILITY="on"
-	# The status bar refresh interval in seconds.
-	# Note that events that force-refresh the status bar (such as window renaming) will ignore this.
-	export TMUX_POWERLINE_STATUS_INTERVAL="1"
-	# The location of the window list. Can be {"absolute-centre, centre, left, right"}.
-	# Note that "absolute-centre" is only supported on `tmux -V` >= 3.2.
-	export TMUX_POWERLINE_STATUS_JUSTIFICATION="centre"
-
-	# The maximum length of the left status bar.
-	export TMUX_POWERLINE_STATUS_LEFT_LENGTH="60"
-	# The maximum length of the right status bar.
-	export TMUX_POWERLINE_STATUS_RIGHT_LENGTH="90"
-
-	# Uncomment these if you want to enable tmux bindings for muting (hiding) one of the status bars.
-	# E.g. this example binding would mute the left status bar when pressing <prefix> followed by Ctrl-[
-	#export TMUX_POWERLINE_MUTE_LEFT_KEYBINDING="C-["
-	#export TMUX_POWERLINE_MUTE_RIGHT_KEYBINDING="C-]"
-# }
-
-# battery.sh {
-	# How to display battery remaining. Can be {percentage, cute}.
-	export TMUX_POWERLINE_SEG_BATTERY_TYPE="percentage"
-	# How may hearts to show if cute indicators are used.
-	export TMUX_POWERLINE_SEG_BATTERY_NUM_HEARTS="5"
-# }
-
-# date.sh {
-	# date(1) format for the date. If you don't, for some reason, like ISO 8601 format you might want to have "%D" or "%m/%d/%Y".
-	export TMUX_POWERLINE_SEG_DATE_FORMAT="%F"
-# }
-
-# disk_usage.sh {
-	# Filesystem to retrieve disk space information. Any from the filesystems available (run "df | awk '{print }'" to check them).
-	export TMUX_POWERLINE_SEG_DISK_USAGE_FILESYSTEM="/"
-# }
-
-# earthquake.sh {
-	# The data provider to use. Currently only "goo" is supported.
-	export TMUX_POWERLINE_SEG_EARTHQUAKE_DATA_PROVIDER="goo"
-	# How often to update the earthquake data in seconds.
-	# Note: This is not an early warning detector, use this
-	# to be informed about recent earthquake magnitudes in your
-	# area. If this is too often, goo may decide to ban you form
-	# their server
-	export TMUX_POWERLINE_SEG_EARTHQUAKE_UPDATE_PERIOD="600"
-	# Only display information when earthquakes are within this many minutes
-	export TMUX_POWERLINE_SEG_EARTHQUAKE_ALERT_TIME_WINDOW="60"
-	# Display time with this format
-	export TMUX_POWERLINE_SEG_EARTHQUAKE_TIME_FORMAT='(%H:%M)'
-	# Display only if magnitude is greater or equal to this number
-	export TMUX_POWERLINE_SEG_EARTHQUAKE_MIN_MAGNITUDE="3"
-# }
-
-# gcalcli.sh {
-	# gcalcli uses 24hr time format by default - if you want to see 12hr time format, set TMUX_POWERLINE_SEG_GCALCLI_MILITARY_TIME_DEFAULT to 0
-	export TMUX_POWERLINE_SEG_GCALCLI_24HR_TIME_FORMAT="1"
-# }
-
-# hostname.sh {
-	# Use short or long format for the hostname. Can be {"short, long"}.
-	export TMUX_POWERLINE_SEG_HOSTNAME_FORMAT="short"
-# }
-
-# macos_notification_count.sh {
-	# App ids to query in notification center, separated by space
-	# To get the app id that is associated with a specific app run:
-	# sqlite3 -list "/var/folders/14/xy84d13x3091_xgcmy34gk8w0000gp/0//com.apple.notificationcenter/db/db" 'select * from app_info'
-	# The first column contains the app ids
-	# "5" is the app id of Messages.app
-	# Only "banner" notifications are supported (see settings in the notification center)
-	export TMUX_POWERLINE_SEG_MACOS_NOTIFICATION_COUNT_APPIDS="5"
-	# Notification symbol
-	export TMUX_POWERLINE_SEG_MACOS_NOTIFICATION_COUNT_CHAR="💬"
-# }
-
-# mailcount.sh {
-	# Mailbox type to use. Can be any of {apple_mail, gmail, maildir, mbox, mailcheck}
-	export TMUX_POWERLINE_SEG_MAILCOUNT_MAILBOX_TYPE=""
-	
-	## Gmail
-	# Enter your Gmail username here WITH OUT @gmail.com.( OR @domain)
-	export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_USERNAME=""
-	# Google password. Recomenned to use application specific password (https://accounts.google.com/b/0/IssuedAuthSubTokens) Leave this empty to get password from OS X keychain.
-	# For OSX users : MAKE SURE that you add a key to the keychain in the format as follows
-	# Keychain Item name : http://<value-you-fill-in-server-variable-below>
-	# Account name : <username-below>@<server-below>
-	# Password : Your password ( Once again, try to use 2 step-verification and application-specific password)
-	# See http://support.google.com/accounts/bin/answer.py?hl=en&answer=185833 for more info.
-	export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_PASSWORD=""
-	# Domain name that will complete your email. For normal GMail users it probably is "gmail.com but can be "foo.tld" for Google Apps users.
-	export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_SERVER="gmail.com"
-	# How often in minutes to check for new mails.
-	export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_INTERVAL="5"
-	
-	## Maildir
-	# Path to the maildir to check.
-	export TMUX_POWERLINE_SEG_MAILCOUNT_MAILDIR_INBOX="/Users/normrasmussen/.mail/inbox/new"
-	
-	## mbox
-	# Path to the mbox to check.
-	export TMUX_POWERLINE_SEG_MAILCOUNT_MBOX_INBOX=""
-	
-	## mailcheck
-	# Optional path to mailcheckrc
-	export TMUX_POWERLINE_SEG_MAILCOUNT_MAILCHECKRC="/Users/normrasmussen/.mailcheckrc"
-# }
-
-# now_playing.sh {
-	# Music player to use. Can be any of {audacious, banshee, cmus, apple_music, itunes, lastfm, plexamp, mocp, mpd, mpd_simple, pithos, playerctl, rdio, rhythmbox, spotify, spotify_wine, file}.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_MUSIC_PLAYER="spotify"
-	# File to be read in case the song is being read from a file
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_FILE_NAME=""
-	# Maximum output length.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_MAX_LEN="40"
-	# How to handle too long strings. Can be {trim, roll}.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_TRIM_METHOD="trim"
-	# Charcters per second to roll if rolling trim method is used.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_ROLL_SPEED="2"
-	
-	# Hostname for MPD server in the format "[password@]host"
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_HOST="localhost"
-	# Port the MPD server is running on.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_PORT="6600"
-	# Song display format for mpd_simple. See mpc(1) for delimiters.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_SIMPLE_FORMAT="%artist% - %title%"
-	# Song display format for playerctl. see "Format Strings" in playerctl(1).
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_FORMAT="{{ artist }} - {{ title }}"
-	# Song display format for rhythmbox. see "FORMATS" in rhythmbox-client(1).
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_RHYTHMBOX_FORMAT="%aa - %tt"
-	
-	# Last.fm
-	# Set up steps for Last.fm
-	# 1. Make sure jq(1) is installed on the system.
-	# 2. Create a new API application at https://www.last.fm/api/account/create (name it tmux-powerline) and copy the API key and insert it below in the setting TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_API_KEY
-	# 3. Make sure the API can access your recently played song by going to you user privacy settings https://www.last.fm/settings/privacy and make sure "Hide recent listening information" is UNCHECKED.
-	# Username for Last.fm if that music player is used.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_USERNAME=""
-	# API Key for the API.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_API_KEY=""
-	# How often in seconds to update the data from last.fm.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_UPDATE_PERIOD="30"
-	# Fancy char to display before now playing track
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_NOTE_CHAR="♫"
-	
-	# Plexamp 
-	# Set up steps for Plexamp
-	# 1. Make sure jq(1) is installed on the system.
-	# 2. Make sure you have an instance of Tautulli that is accessible by the computer running tmux-powerline.
-	# Username for Plexamp if that music player is used.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_PLEXAMP_USERNAME=""
-	# Hostname for Tautulli server in the format "[password@]host"
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_PLEXAMP_TAUTULLI_HOST=""
-	# API Key for Tautulli.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_PLEXAMP_TAUTULLI_API_KEY=""
-	# How often in seconds to update the data from Plexamp.
-	export TMUX_POWERLINE_SEG_NOW_PLAYING_PLEXAMP_UPDATE_PERIOD="30"
-# }
-
-# pwd.sh {
-	# Maximum length of output.
-	export TMUX_POWERLINE_SEG_PWD_MAX_LEN="40"
-# }
-
-# time.sh {
-	# date(1) format for the time. Americans might want to have "%I:%M %p".
-	export TMUX_POWERLINE_SEG_TIME_FORMAT="%H:%M"
-	# Change this to display a different timezone than the system default.
-	# Use TZ Identifier like "America/Los_Angeles"
-	export TMUX_POWERLINE_SEG_TIME_TZ=""
-# }
-
-# tmux_mem_cpu_load.sh {
-	# Arguments passed to tmux-mem-cpu-load.
-	# See https://github.com/thewtex/tmux-mem-cpu-load for all available options.
-	export TMUX_POWERLINE_SEG_TMUX_MEM_CPU_LOAD_ARGS="-v"
-# }
-
-# tmux_session_info.sh {
-	# Session info format to feed into the command: tmux display-message -p
-	# For example, if FORMAT is '[ #S ]', the command is: tmux display-message -p '[ #S ]'
-	export TMUX_POWERLINE_SEG_TMUX_SESSION_INFO_FORMAT="#S:#I.#P"
-# }
-
-# utc_time.sh {
-	# date(1) format for the UTC time.
-	export TMUX_POWERLINE_SEG_UTC_TIME_FORMAT="%H:%M %Z"
-# }
-
-# vcs_branch.sh {
-	# Max length of the branch name.
-	export TMUX_POWERLINE_SEG_VCS_BRANCH_MAX_LEN="24"
-# }
-
-# weather.sh {
-	# The data provider to use. Currently only "yahoo" is supported.
-	export TMUX_POWERLINE_SEG_WEATHER_DATA_PROVIDER="yrno"
-	# What unit to use. Can be any of {c,f,k}.
-	export TMUX_POWERLINE_SEG_WEATHER_UNIT="c"
-	# How often to update the weather in seconds.
-	export TMUX_POWERLINE_SEG_WEATHER_UPDATE_PERIOD="600"
-	# Name of GNU grep binary if in PATH, or path to it.
-	export TMUX_POWERLINE_SEG_WEATHER_GREP="grep"
-	# Location of the JSON parser, jq
-	export TMUX_POWERLINE_SEG_WEATHER_JSON="jq"
-	# Your location
-	# Latitude and Longtitude for use with yr.no
-	TMUX_POWERLINE_SEG_WEATHER_LAT=""
-	TMUX_POWERLINE_SEG_WEATHER_LON=""
-# }

wezterm/.wezterm.lua

@@ -0,0 +1,5 @@
+local wezterm = require 'wezterm'
+local config = wezterm.config_builder()
+config.window_background_opacity = 0.9
+config.color_scheme = 'Rapture'
+return config

zsh/.zshrc

@@ -36,23 +36,6 @@ function nvimvenv {
  fi
 }
 
-alias nvim=nvimvenv
-# alias nvim-minimal="NVIM_APPNAME=Minivim nvim"
-# alias nvim-arduino="NVIM_APPNAME=Arduino nvim"
-
-#function nvims() {
-#  items=("Main" "Minivim" "Arduinvim")
-#  config=$(printf "%s\n" "${items[@]}" | fzf --prompt=" Neovim Config  " --height=~50% --layout=reverse --border --exit-0)
-#  if [[ -z $config ]]; then
-#    echo "Nothing selected"
-#    return 0
-#  elif [[ $config == "Main" ]]; then
-#    config=""
-#  fi
-#  NVIM_APPNAME=$config nvim $@
-#}
-#bindkey -s ^a "nvims\n"
-
 export PATH="$PATH:$HOME/.rvm/bin"
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
@@ -67,3 +50,10 @@ source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme
 source ~/.dotfiles/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
 source ~/.dotfiles/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 . "$HOME/.cargo/env"
+export PATH="/usr/local/opt/openssl/bin:$PATH"
+echo 'eval "$(uv generate-shell-completion zsh)"' >> ~/.zshrc
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+eval "$(uv generate-shell-completion zsh)"

zsh_issues.md

@@ -1,15 +0,0 @@
----
-title: "Test"
-date: 2023-09-12T17:19:08Z
-draft: false
----
-
-Yesterday, I could not get my ZSH shell to work at all. As I kept trying things, I was getting all these weird errors. I started posting about this on Mastodon too.
-
-[Mastodon Thread](https://fosstodon.org/@notnorm/111047573608738701) where I kept asking myself - no responses!
-
-Finally, I realized the issue. And that was the [Starship](https://www.starship.rs) cross-shell prompt. Turns out, it was making everything really really slow.
-
-I finally got it fixed by doing the following:
-* Delete everything from `~/.zsh_sessions/` and `~/.zsh_history`.
-* Do not use `source ~/.zshrc` and definitely don't use it in your `zshrc` file! Instead of `source` use `exec zsh`