diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 03b001a..809f312 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -3,14 +3,18 @@ "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, - "avante.nvim": { "branch": "main", "commit": "81e5f1937f47a7fc855e03a41f2af445f2777de9" }, + "avante.nvim": { "branch": "main", "commit": "01e05a538b4b7f20fb922016d72be8c42d400b0e" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, +<<<<<<< HEAD "blink.cmp": { "branch": "main", "commit": "d534f9e8bf39299c480e0c2e11dad21f51cfb2fe" }, "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, +======= + "blink.cmp": { "branch": "main", "commit": "ae5a4ce8f7e519e49de7ae6fcadd74547f820a52" }, +>>>>>>> parent of 2cafc91 (Breaking changes for blink.cmp, so that needed to be updated. Updated keymaps location based on that plugin as well.) "deadcolumn.nvim": { "branch": "master", "commit": "897c905aef1a268ce4cc507d5cce048ed808fa7a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "515acae4fd294fcefa5b15237a333c2606e958d1" }, - "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, + "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" }, "eldritch.nvim": { "branch": "master", "commit": "d3df98f58841bdbd88fbe1ca27c9eb76ccca6572" }, "f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" }, "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" }, @@ -19,18 +23,18 @@ "hover.nvim": { "branch": "main", "commit": "140c4d0ae9397b76baa46b87c574f5377de09309" }, "img-clip.nvim": { "branch": "main", "commit": "5ff183655ad98b5fc50c55c66540375bbd62438c" }, "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, - "kanagawa.nvim": { "branch": "master", "commit": "18ae5771b22d8f913ef541c827a8180b4cb12c8a" }, + "kanagawa.nvim": { "branch": "master", "commit": "ad3dddecd606746374ba4807324a08331dfca23c" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.comment": { "branch": "main", "commit": "03c13e37318bdb18481311c0ac1adc9ed731caf1" }, "mini.fuzzy": { "branch": "stable", "commit": "ea9d1380ad925c4d0e890f68dbf830d2b19bae5d" }, "mini.hipatterns": { "branch": "main", "commit": "f34975103a38b3f608219a1324cdfc58ea660b8b" }, - "mini.icons": { "branch": "main", "commit": "6787321f70d674a481776b7cc2c781fb7002c644" }, + "mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" }, "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" }, "mini.pairs": { "branch": "stable", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" }, "mini.pick": { "branch": "main", "commit": "b87f4d4e75673f6e7b918408017833424ecaa245" }, @@ -40,31 +44,39 @@ "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" }, "neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, "night-owl.nvim": { "branch": "main", "commit": "86ed124c2f7e118670649701288e024444bf91e5" }, - "nightfly": { "branch": "master", "commit": "3fe724c616f5285bafbc762dd1e9830ae1815a1e" }, - "nightfox.nvim": { "branch": "main", "commit": "595ffb8f291fc4a9bef3201a28b7c0379a41cdee" }, + "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": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, - "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, - "nvim-dap": { "branch": "master", "commit": "0e673accbb512e1e191dfb4fecea89cc38c1bcdd" }, - "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, + "nvim": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, + "nvim-cmp": { "branch": "main", "commit": "98e8b9d593a5547c126a39212d6f5e954a2d85dd" }, + "nvim-dap": { "branch": "master", "commit": "7e48a80551e0b8fd7e34436d74243de7ae1ec397" }, + "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-http": { "branch": "main", "commit": "9a0e97b639d34af17d06b3421fe633b416dd64ee" }, - "nvim-lspconfig": { "branch": "master", "commit": "a8ef5e6e497b3ebeaaf35b939c07c211563b2e05" }, - "nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" }, + "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, + "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, "nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" }, +<<<<<<< HEAD "nvim-treesitter": { "branch": "master", "commit": "cfbc1c0e0ff63e5b5e37b465b915b95fc2e98cef" }, "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" }, "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" }, "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" }, +>>>>>>> parent of 2cafc91 (Breaking changes for blink.cmp, so that needed to be updated. Updated keymaps location based on that plugin as well.) "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "77e5bad54227dcfe3878ffbda88ab1efdaacb475" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, - "render-markdown.nvim": { "branch": "main", "commit": "c00cc1e2cbd5a55ca0c6c2e27fcf4a02ff731434" }, - "solarized-osaka.nvim": { "branch": "main", "commit": "44d3b9d966a632ff42746cf326c5fa4e2b30bb92" }, - "sonokai": { "branch": "master", "commit": "0df1462da40e1473a61b80b7ce62497e0b59ff86" }, + "render-markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" }, + "solarized-osaka.nvim": { "branch": "main", "commit": "eebeb55b2bca73db287b5a6bf9b8c4b7d0317515" }, + "sonokai": { "branch": "master", "commit": "fd42b20963c34dfc1744ac31f6a6efe78f4edad2" }, "spacecamp": { "branch": "master", "commit": "8945b4a2bfaaa16fbcee9f1d7c00cb9c1256b591" }, "telescope-cmdline.nvim": { "branch": "main", "commit": "8b05928ac1b9f2b772cedde891faa6669b0ec59a" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, @@ -74,15 +86,15 @@ "thethethe.nvim": { "branch": "main", "commit": "357580127cd291c8a813564eeaff07c09303084e" }, "tmux.nvim": { "branch": "main", "commit": "307bad95a1274f7288aaee09694c25c8cbcd6f1a" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, + "toggleterm.nvim": { "branch": "main", "commit": "022ff5594acccc8d90d2e46dc43994f7722ebdf7" }, "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" }, "vim-arduino": { "branch": "master", "commit": "2ded67cdf09bb07c4805d9e93d478095ed3d8606" }, "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" }, "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" }, - "vim-dadbod-completion": { "branch": "master", "commit": "7f77c330df5f38b5ed11220c1f6622b61fd0149e" }, - "vim-dadbod-ui": { "branch": "master", "commit": "b4b95e04fcd71c7787673b2a165221d681d06171" }, + "vim-dadbod-completion": { "branch": "master", "commit": "9e354e86fcc67a5ec2c104f312e374ea2f89c799" }, + "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" } diff --git a/nvim/.config/nvim/lua/core/keymaps.lua b/nvim/.config/nvim/lua/core/keymaps.lua index f3ea47c..87322b5 100644 --- a/nvim/.config/nvim/lua/core/keymaps.lua +++ b/nvim/.config/nvim/lua/core/keymaps.lua @@ -2,8 +2,7 @@ -- Keymaps of Neovim and installed plugins ----------------------------------------------------------- --- local map = vim.api.nvim_set_keymap -local map = vim.keymap.set +local map = vim.api.nvim_set_keymap local default_opts = { noremap = true, silent = true } -- Fast saving with and s @@ -17,14 +16,13 @@ local default_opts = { noremap = true, silent = true } -- Close and save all buffers and return to Dashboard map('n', 'ds', ':silent wa | %bd | Alpha', default_opts) --- Save and close current buffer -map('n', 'bd', ':w | bp | sp | bn | bd | Alpha', default_opts) - -- Neovim Tab Navgation via Vem-Tabline map('n', 't', ':tabnew', default_opts) map('n', 'e', ':bnext', default_opts) map('n', 'w', ':bprev', default_opts) map('n', 'd', ':bdelete', default_opts) +map('n', 'r', 'vem_move_buffer_right', default_opts) +map('n', 'q', 'vem_move_buffer_left', default_opts) -- Nvim-Tree map('n', 'v', ':NvimTreeToggle', default_opts) @@ -43,8 +41,6 @@ map('n', 'cb', ':Telescope current_buffer_fuzzy_find', default_opts) map('n', 'b', ':! black %', default_opts) map('n', 'm', ':! markdownlint -f %', default_opts) map('n', 'pj', ':!python -m json.tool', default_opts) - --- Forget what this one does below, but I think it's for CSV reformatting. map('n', 'cs', ':%s/\\s*\\([^|]\\{-}\\)\\s*|/"\1",/g', default_opts) -- Fold all comments @@ -54,5 +50,41 @@ map('n', 'fc', ':set foldmethod=expr foldexpr=getline(v:lnum)=~"^\\s*".& map('n', '', ':ToggleTerm direction=float', default_opts) map('t', '', '', default_opts) -- Exit Insert Mode Faster --- Cycle through the number line options -map('n', 'n', ":set relativenumber!", default_opts) +------------------------------------------------ +-- Old Keymaps from Nvim-Mapper (Sunsetted) +------------------------------------------------ +--[[ +-- Macros for Todo Trouble +M('n', '', "@t", default_opts, +"Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line" +) + +M('n', '', "@s", default_opts, +"Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line" +) + +M('n', '', "@f", default_opts, +"Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. " +) + +M( 'n', '', "@c", default_opts, +"Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line." +) + +M('n', '', "@w", default_opts, +"Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line." +) + +M('n', 'ce', ":TodoTrouble keywords=TODO", default_opts, +"Show Todo Tags", "show_todos", "Show Todo Tags." +) + +M('n', 'cf', ":TodoTrouble keywords=FEAT", default_opts, +"Show Feature Tags", "show_features", "Show Feature Requests." +) + +M('n', 'cq', ":TodoTrouble keywords=ERROR, WARN", default_opts, +"Show Warning Tags", "show_warnings", "Show Errors Tags." +) + +--]] diff --git a/nvim/.config/nvim/lua/custom_snippets-backup/markdown.json b/nvim/.config/nvim/lua/custom_snippets/markdown.json similarity index 84% rename from nvim/.config/nvim/lua/custom_snippets-backup/markdown.json rename to nvim/.config/nvim/lua/custom_snippets/markdown.json index 4cd0d81..b1f9485 100644 --- a/nvim/.config/nvim/lua/custom_snippets-backup/markdown.json +++ b/nvim/.config/nvim/lua/custom_snippets/markdown.json @@ -12,7 +12,7 @@ "box": { "prefix": "hugobox", "body": ["{{< box info >}} \n\n {{< /box >}}"], - "description": "Custom info box for hugo website. Info can also be warn, tip." + "description": "Cstom info box for hugo website. Info can also be warn, tip." } } diff --git a/nvim/.config/nvim/lua/custom_snippets-backup/package.json b/nvim/.config/nvim/lua/custom_snippets/package.json similarity index 100% rename from nvim/.config/nvim/lua/custom_snippets-backup/package.json rename to nvim/.config/nvim/lua/custom_snippets/package.json diff --git a/nvim/.config/nvim/lua/custom_snippets-backup/python.json b/nvim/.config/nvim/lua/custom_snippets/python.json similarity index 100% rename from nvim/.config/nvim/lua/custom_snippets-backup/python.json rename to nvim/.config/nvim/lua/custom_snippets/python.json diff --git a/nvim/.config/nvim/lua/plugins/blink.lua b/nvim/.config/nvim/lua/plugins/blink.lua index a3f55d7..dec4005 100644 --- a/nvim/.config/nvim/lua/plugins/blink.lua +++ b/nvim/.config/nvim/lua/plugins/blink.lua @@ -1,58 +1,49 @@ return { 'saghen/blink.cmp', lazy = false, -- lazy loading handled internally - version = '*', + -- optional: provides snippets for the snippet source dependencies = { 'rafamadriz/friendly-snippets', - 'L3MON4D3/LuaSnip', version = 'v2.*', + 'L3MON4D3/LuaSnip', }, + version = 'v0.*', opts = { keymap = { - preset = "default", - [''] = { 'show', 'show_documentation', 'hide_documentation' }, - [''] = { 'hide', 'fallback' }, - [''] = { - function(cmp) - if cmp.snippet_active() then return cmp.accept() - else return cmp.select_and_accept() end - end, - 'snippet_forward', - 'fallback' - }, - [''] = { 'snippet_backward', 'fallback' }, + preset = "enter", - [''] = { 'select_prev', 'fallback' }, - [''] = { 'select_next', 'fallback' }, - [''] = { 'select_prev', 'fallback' }, - [''] = { 'select_next', 'fallback' }, + [""] = { + "select_next", + "snippet_forward", + "fallback", + }, - [''] = { 'scroll_documentation_up', 'fallback' }, - [''] = { 'scroll_documentation_down', 'fallback' }, - }, - appearance = { - use_nvim_cmp_as_default = true, - nerd_font_variant = 'normal', - }, - completion = { - menu = { auto_show = function(ctx) return ctx.mode ~= 'cmdline' end }, - -- keyword = { range = 'prefix', regex = '[%w_\\-]'}, - -- trigger = { show_on_blocked_trigger_characters = function() - -- if vim.api.nvim_get_mode().mode == 'c' then return {} end - -- return { ' ', '\n', '\t' } - -- end }, - }, - snippets = { - expand = function(snippet) require('luasnip').lsp_expand(snippet) end, - active = function(filter) - if filter and filter.direction then - return require('luasnip').jumpable(filter.direction) - end - return require('luasnip').in_snippet() - end, - jump = function(direction) require('luasnip').jump(direction) end, + [""] = { + "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 = { - default = {'lsp', 'path', 'snippets', 'buffer'}, - }, + providers = { + { + { 'blink.cmp.sources.lsp' }, + { 'blink.cmp.sources.path' }, + { 'blink.cmp.sources.snippets', score_offset = -1 }, + }, + { { 'blink.cmp.sources.buffer' } }, + } + }, } -} diff --git a/nvim/.config/nvim/snippets/markdown.json b/nvim/.config/nvim/snippets/markdown.json deleted file mode 100644 index 4cd0d81..0000000 --- a/nvim/.config/nvim/snippets/markdown.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "today-date": { - "prefix": "today", - "body": ["${CURRENT_MONTH}-${CURRENT_DATE}-${CURRENT_YEAR}"], - "description": "Puts the date in (Y-m-D) format" - }, - "today-tasks": { - "prefix": "todaytask", - "body": ["## ${CURRENT_MONTH}-${CURRENT_DATE}-${CURRENT_YEAR} \n\n- [ ] "], - "description": "Today's date plus a markdown task for easy addition." - }, - "box": { - "prefix": "hugobox", - "body": ["{{< box info >}} \n\n {{< /box >}}"], - "description": "Custom info box for hugo website. Info can also be warn, tip." - - } -} diff --git a/nvim/.config/nvim/snippets/package.json b/nvim/.config/nvim/snippets/package.json deleted file mode 100644 index 4594a47..0000000 --- a/nvim/.config/nvim/snippets/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "personal-snippets", - "contributes": { - "snippets": [ - { - "language": "markdown", - "path": "./markdown.json" - }, - { - "language": "python", - "path": "./python.json" - } - ] - } -} diff --git a/nvim/.config/nvim/snippets/python.json b/nvim/.config/nvim/snippets/python.json deleted file mode 100644 index e5a22d4..0000000 --- a/nvim/.config/nvim/snippets/python.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "importpretty": { - "prefix": "importpretty", - "body": [ - "import pprint", - "pp=pprint.PrettyPrinter(indent=4)", - "pp.pprint(VARIABLE)" - ] - } -} diff --git a/zsh/.zshrc b/zsh/.zshrc index c6b87d0..8f5e3ba 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -44,10 +44,6 @@ export PATH="/opt/homebrew/sbin:$PATH" export PATH="/opt/homebrew/bin:$PATH" export PATH="$NPM_PACKAGES/bin:$PATH" source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme -<<<<<<< HEAD - -======= ->>>>>>> parent of 45eca45 (Updated settings for avante. Removed mini.deps config.) # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh @@ -61,6 +57,3 @@ 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)" -<<<<<<< HEAD -======= -eval "$(uv generate-shell-completion zsh)"