diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 8f06a2eb..ee318b6b 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -20,7 +20,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codeium.vim": { "branch": "main", "commit": "7b2f57ba35bbff7dabd5e3eaa6e60d0490516c78" }, + "codeium.vim": { "branch": "main", "commit": "78f32674d42dcf8e5626e105bc8fb93b6c27120b" }, "compiler.nvim": { "branch": "main", "commit": "6af2fc0720004b2ef28bad7f85f765715216f73a" }, "conform.nvim": { "branch": "master", "commit": "253878436e2b6d73dfd91ccf0ac12d04cc683d34" }, "crates.nvim": { "branch": "main", "commit": "aac57ef84cf4fecf7907114b22e875f84a6128ee" }, @@ -40,7 +40,7 @@ "highlight-undo.nvim": { "branch": "main", "commit": "50a6884a8476be04ecce8f1c4ed692c5000ef0a1" }, "hydra.nvim": { "branch": "master", "commit": "ceb1fb7e3b4916676674e8a4253deea5a19ab01f" }, "import-cost.nvim": { "branch": "main", "commit": "39ef36f438574db0b26e9c957316eb1cb22e970f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "046e2cf04e08ece927bacbfb87c5b35c0b636546" }, + "indent-blankline.nvim": { "branch": "master", "commit": "64fdadb3ada61c4297452f7662789b01ee82ffcb" }, "lazy.nvim": { "branch": "main", "commit": "16603c6917435d8446f7357cb61095138a417085" }, "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" }, "lsp-lens.nvim": { "branch": "main", "commit": "739c9cf3a8c72c913427ae953c01ebb7b1cc1c00" }, @@ -93,7 +93,7 @@ "nvim-regexplainer": { "branch": "main", "commit": "187f8666c2ba0fcba4ddb991e48d7229b0a58d96" }, "nvim-spectre": { "branch": "master", "commit": "696cff781a4a7ecc91549736835e2acbd00fe859" }, "nvim-treesitter": { "branch": "master", "commit": "bf0a96568a54618138ac42c84758945cdafef86b" }, - "nvim-treesitter-context": { "branch": "master", "commit": "e5c90f0f32e948b285ed2466e799a4b36f9a42d9" }, + "nvim-treesitter-context": { "branch": "master", "commit": "2806d83e3965017382ce08792ee527e708fa1bd4" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "e69a504baf2951d52e1f1fbb05145d43f236cbf1" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 31f27e3b..8d8cb468 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -28,7 +28,7 @@ "lazyvim.plugins.extras.vscode", "plugins.extras.ai.codeium", "plugins.extras.ai.gpt", - "plugins.extras.coding.cmp", + "plugins.extras.coding.package-info", "plugins.extras.coding.dial", "plugins.extras.coding.documentation", "plugins.extras.coding.refactoring", @@ -81,4 +81,4 @@ "NEWS.md": "2123" }, "version": 2 -} \ No newline at end of file +} diff --git a/.config/nvim/lua/plugins/extras/coding/cmp.lua b/.config/nvim/lua/plugins/cmp.lua similarity index 70% rename from .config/nvim/lua/plugins/extras/coding/cmp.lua rename to .config/nvim/lua/plugins/cmp.lua index 9ee85181..363b30bb 100644 --- a/.config/nvim/lua/plugins/extras/coding/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -4,41 +4,6 @@ return { { "hrsh7th/nvim-cmp", dependencies = { - { - "vuki656/package-info.nvim", - event = { - "BufRead package.json", - "BufRead package-lock.json", - }, - opts = {}, - keys = { - { - "cPs", - "lua require('package-info').show({ force = true })", - desc = "Show Package Versions", - }, - { - "cPu", - "lua require('package-info').update()", - desc = "Update Package", - }, - { - "cPr", - "lua require('package-info').delete()", - desc = "Remove Package", - }, - { - "cPv", - "lua require('package-info').change_version()", - desc = "Change Package Version", - }, - { - "cPn", - "lua require('package-info').install()", - desc = "Install New Dependency", - }, - }, - }, { "petertriho/cmp-git", }, @@ -111,12 +76,4 @@ return { } end, }, - { - "folke/which-key.nvim", - opts = { - defaults = { - ["cP"] = { name = "+packages" }, - }, - }, - }, } diff --git a/.config/nvim/lua/plugins/extras/ai/gpt.lua b/.config/nvim/lua/plugins/extras/ai/gpt.lua index 052cf702..efe609bd 100644 --- a/.config/nvim/lua/plugins/extras/ai/gpt.lua +++ b/.config/nvim/lua/plugins/extras/ai/gpt.lua @@ -91,6 +91,16 @@ return { }, }, }, + { + "voldikss/vim-floaterm", + keys = { + { + "CT", + "FloatermNew --name=gpt --opener=edit --titleposition=center --width=0.85 --height=0.85 gpt", + desc = "Terminal GPT", + }, + }, + }, { "folke/which-key.nvim", opts = { diff --git a/.config/nvim/lua/plugins/extras/coding/documentation.lua b/.config/nvim/lua/plugins/extras/coding/documentation.lua index b662308f..4c393b8b 100644 --- a/.config/nvim/lua/plugins/extras/coding/documentation.lua +++ b/.config/nvim/lua/plugins/extras/coding/documentation.lua @@ -63,4 +63,66 @@ return { }, }, }, + { + "luckasRanarison/nvim-devdocs", + cmd = { + "DevdocsFetch", + "DevdocsInstall", + "DevdocsUninstall", + "DevdocsOpen", + "DevdocsOpenFloat", + "DevdocsOpenCurrent", + "DevdocsOpenCurrentFloat", + "DevdocsUpdate", + "DevdocsUpdateAll", + }, + keys = { + { "sE", "DevdocsOpen", desc = "Devdocs" }, + { "se", "DevdocsOpenCurrent", desc = "Devdocs Current" }, + }, + opts = { + dir_path = vim.fn.stdpath("data") .. "/devdocs", -- installation directory + telescope = {}, -- passed to the telescope picker + float_win = { -- passed to nvim_open_win(), see :h api-floatwin + relative = "editor", + height = 25, + width = 100, + border = "rounded", + }, + wrap = false, -- text wrap, only applies to floating window + previewer_cmd = nil, -- for example: "glow" + cmd_args = {}, -- example using glow: { "-s", "dark", "-w", "80" } + cmd_ignore = {}, -- ignore cmd rendering for the listed docs + picker_cmd = false, -- use cmd previewer in picker preview + picker_cmd_args = {}, -- example using glow: { "-s", "dark", "-w", "50" } + after_open = function(bufnr) + vim.api.nvim_buf_set_keymap(bufnr, "n", "q", ":close", {}) + end, + ensure_installed = { + "css", + "html", + "javascript", + "lua-5.4", + "python-3.11", + "react", + "typescript", + "angular", + "bash", + "fish-3.6", + "git", + "go", + "rust", + "sass", + "vue-3", + "docker", + "markdown", + "svelte", + "tailwindcss", + "eslint", + "prettier", + "npm", + "node", + }, + }, + }, } diff --git a/.config/nvim/lua/plugins/extras/coding/package-info.lua b/.config/nvim/lua/plugins/extras/coding/package-info.lua new file mode 100644 index 00000000..1455cf50 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/coding/package-info.lua @@ -0,0 +1,55 @@ +return { + { + "vuki656/package-info.nvim", + event = { + "BufRead package.json", + "BufRead package-lock.json", + }, + opts = {}, + keys = { + { + "ps", + "lua require('package-info').show({ force = true })", + desc = "Show Package Versions", + }, + { + "pu", + "lua require('package-info').update()", + desc = "Update Package", + }, + { + "pr", + "lua require('package-info').delete()", + desc = "Remove Package", + }, + { + "pv", + "lua require('package-info').change_version()", + desc = "Change Package Version", + }, + { + "pn", + "lua require('package-info').install()", + desc = "Install New Dependency", + }, + }, + }, + { + "voldikss/vim-floaterm", + keys = { + { + "pp", + "FloatermNew --disposable --name=lazynpm --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd= lazynpm", + desc = "Lazynpm", + }, + }, + }, + { + "folke/which-key.nvim", + opts = { + defaults = { + ["p"] = { name = "+packages" }, + }, + }, + }, +} diff --git a/.config/nvim/lua/plugins/floaterm.lua b/.config/nvim/lua/plugins/floaterm.lua index f07345a8..b01c6f0c 100644 --- a/.config/nvim/lua/plugins/floaterm.lua +++ b/.config/nvim/lua/plugins/floaterm.lua @@ -10,7 +10,6 @@ return { { "gg", "FloatermNew --disposable --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd= lazygit", desc = "Lazygit (root dir)" }, { "gG", "FloatermNew --disposable --name=lazygitbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd= lazygit", desc = "Lazygit (cwd)" }, { "Td", "FloatermNew --disposable --name=lazydocker --opener=edit --titleposition=center --height=0.85 --width=0.85 lazydocker", desc = "Lazydocker" }, - { "cPp", "FloatermNew --disposable --name=lazynpm --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd= lazynpm", desc = "Lazynpm" }, { "Tb", "FloatermNew --disposable --name=btop --opener=edit --titleposition=center --height=0.85 --width=0.85 btop", desc = "Btop" }, { "fd", "FloatermNew --disposable --name=dots --opener=edit --titleposition=center --height=0.85 --width=0.85 dots", desc = "Dotfiles" }, { "Tn", "FloatermNew --disposable --name=navi --opener=edit --titleposition=center --height=0.85 --width=0.85 pages", desc = "Navi Pages" }, @@ -19,7 +18,6 @@ return { { "gF", "FloatermNew --disposable --name=forgit --opener=edit --titleposition=center --height=0.85 --width=0.85 fgit", desc = "Forgit" }, { "ci", "FloatermNew! --disposable --name=scc --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd= codeinfo", desc = "Code info/fetch" }, { "gf", "FloatermNew! --disposable --name=onefetch --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd= gfetch", desc = "Gitfetch" }, - { "CT", "FloatermNew --name=gpt --opener=edit --titleposition=center --width=0.85 --height=0.85 gpt", desc = "Terminal GPT" }, { "cen", "FloatermNew --name=node --opener=edit --titleposition=center --wintype=split --height=0.35 node", desc = "Node" }, { "cep", "FloatermNew --name=python --opener=edit --titleposition=center --wintype=split --height=0.35 python", desc = "Python" }, { "", "FloatermNext", mode = { "t" }, desc = "Next Terminal" }, diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 57efa258..227ea02b 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -22,68 +22,6 @@ return { end) end, }, - { - "luckasRanarison/nvim-devdocs", - cmd = { - "DevdocsFetch", - "DevdocsInstall", - "DevdocsUninstall", - "DevdocsOpen", - "DevdocsOpenFloat", - "DevdocsOpenCurrent", - "DevdocsOpenCurrentFloat", - "DevdocsUpdate", - "DevdocsUpdateAll", - }, - keys = { - { "sE", "DevdocsOpen", desc = "Devdocs" }, - { "se", "DevdocsOpenCurrent", desc = "Devdocs Current" }, - }, - opts = { - dir_path = vim.fn.stdpath("data") .. "/devdocs", -- installation directory - telescope = {}, -- passed to the telescope picker - float_win = { -- passed to nvim_open_win(), see :h api-floatwin - relative = "editor", - height = 25, - width = 100, - border = "rounded", - }, - wrap = false, -- text wrap, only applies to floating window - previewer_cmd = nil, -- for example: "glow" - cmd_args = {}, -- example using glow: { "-s", "dark", "-w", "80" } - cmd_ignore = {}, -- ignore cmd rendering for the listed docs - picker_cmd = false, -- use cmd previewer in picker preview - picker_cmd_args = {}, -- example using glow: { "-s", "dark", "-w", "50" } - after_open = function(bufnr) - vim.api.nvim_buf_set_keymap(bufnr, "n", "q", ":close", {}) - end, - ensure_installed = { - "css", - "html", - "javascript", - "lua-5.4", - "python-3.11", - "react", - "typescript", - "angular", - "bash", - "fish-3.6", - "git", - "go", - "rust", - "sass", - "vue-3", - "docker", - "markdown", - "svelte", - "tailwindcss", - "eslint", - "prettier", - "npm", - "node", - }, - }, - }, { "dawsers/telescope-floaterm.nvim", config = function()