Skip to content

Commit

Permalink
chore: update neovim <c-p> and added neogit,neogen for nvim-astro
Browse files Browse the repository at this point in the history
  • Loading branch information
shubham-cpp committed Feb 19, 2025
1 parent b012c8c commit b6d7d54
Show file tree
Hide file tree
Showing 15 changed files with 266 additions and 115 deletions.
51 changes: 27 additions & 24 deletions .config/nvim-astro/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"AstroNvim": { "branch": "main", "commit": "56e5d8c4a73237c100a8271155c24760ec58d7f7" },
"AstroNvim": { "branch": "main", "commit": "030098cf85611fdd838c33ae60753471f991ea89" },
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
"SchemaStore.nvim": { "branch": "main", "commit": "97b08f928d355bd6d5dee595fdf667b5bfb6329f" },
"aerial.nvim": { "branch": "master", "commit": "1160fb7a15a34b03b7381d95d45560712b5f19d0" },
"SchemaStore.nvim": { "branch": "main", "commit": "6d840a01545b9be71c45843f2aabcc384d4fafbf" },
"aerial.nvim": { "branch": "master", "commit": "3284a2cb858ba009c79da87d5e010ccee3c99c4d" },
"age.nvim": { "branch": "main", "commit": "f1793e14123a7c5374a3744aacab9c283014fa1d" },
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"astrocommunity": { "branch": "main", "commit": "66ec9da83427d2c1a1fe6d545309abb22cf55320" },
"astrocore": { "branch": "main", "commit": "0fcaac66d115948605c14eaf45a41d3923eaafeb" },
"astrocommunity": { "branch": "main", "commit": "46c4afb3a00e1a03e43e5e2f29b8e3ed4a41605a" },
"astrocore": { "branch": "main", "commit": "8226d10be615ef3a0716e659b016bdadccbfd84d" },
"astrolsp": { "branch": "main", "commit": "2f6b0a4059775a1dac011d2944dd41fd4a8fe7a8" },
"astrotheme": { "branch": "main", "commit": "7aa05c0ada35ff127f151f70b0ba2d042953eeb4" },
"astrotheme": { "branch": "main", "commit": "f12dcf64b1f9a05839c3ac2146f550f43bae9dab" },
"astroui": { "branch": "main", "commit": "076766c1d422db486378354729f8fa7c1a68b745" },
"avante.nvim": { "branch": "main", "commit": "456f7ccdab6fa977fe10458e02d6226c7f8f33c0" },
"avante.nvim": { "branch": "main", "commit": "b20b2caf220cd988b026d5981475bf8928afa27e" },
"better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
"blade-nav.nvim": { "branch": "main", "commit": "56601aaf230698388ed687d1d9d468599d277ac2" },
"bullets.vim": { "branch": "master", "commit": "af7e7adfd0d9b349cd48eb730e337fe3628b12b2" },
"clangd_extensions.nvim": { "branch": "main", "commit": "db28f29be928d18cbfb86fbfb9f83f584f658feb" },
"cmake-tools.nvim": { "branch": "master", "commit": "83268ea6f969f1e6eaa85f72118a11acb6198bf0" },
"cmake-tools.nvim": { "branch": "master", "commit": "680a50111f6ebbbc0f126d07ad701bdbd4d1c599" },
"cmp-async-path": { "branch": "main", "commit": "d6d1ffa2075039632a2d71e8fa139818e15ac757" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "2c3bee4d1168670b7eb8f572378e309e8cdca79e" },
Expand All @@ -26,12 +26,13 @@
"cmp-rg": { "branch": "master", "commit": "70a43543f61b6083ba9c3b7deb9ccee671410ac6" },
"cmp-tailwind-colors": { "branch": "main", "commit": "4b200e280e9051a26ade776589c2ac246350f5dc" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"codecompanion.nvim": { "branch": "main", "commit": "b794f5d1b3bed02b95544e172841a25e2caf5166" },
"codecompanion.nvim": { "branch": "main", "commit": "3e71a1a7c0b3788bdb7bc72c6f3478d928d796da" },
"crates.nvim": { "branch": "main", "commit": "1d92a7f449a2a76d8f4c3459bd98f450e76d2ea3" },
"dial.nvim": { "branch": "master", "commit": "34bbd9c387c358190e61ce71017faad3dffa7a74" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
"emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" },
"flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" },
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" },
"gopher.nvim": { "branch": "main", "commit": "0ed14a40d9799ac8d92aaf9eb1cd9be22ffd6b14" },
Expand All @@ -40,50 +41,52 @@
"haskell-snippets.nvim": { "branch": "master", "commit": "bd893770dd7a0c1a473601c3c919e61670745b36" },
"haskell-tools.nvim": { "branch": "master", "commit": "1eba02f17a05ccb00f2dbfea7038b7658dc05dc0" },
"heirline.nvim": { "branch": "master", "commit": "cc359b628266cb9a84b2d71c883f2b99e16473a0" },
"img-clip.nvim": { "branch": "main", "commit": "5ded6f468d633ccfb315905fe8901d6c95ae8f29" },
"indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
"laravel-ide-helper.nvim": { "branch": "main", "commit": "d36ab889153cda9ce67ef3fbbf2b6c30e079d7c9" },
"laravel.nvim": { "branch": "main", "commit": "1740398fecc363821ab1bd5af452ab009d87cebc" },
"laravel.nvim": { "branch": "main", "commit": "d155d5e99328a531df86341b414ba85dd38389d9" },
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
"lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
"lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
"magazine.nvim": { "branch": "main", "commit": "cf8afed0f22f68e8cfdd28ed9ef86cbae8b36645" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "805c31ec6bfb557975143712ecff6956d3227141" },
"mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"mini.align": { "branch": "main", "commit": "3bdf6f0b91b31db5300a7b04f53f296a7fb150c1" },
"mini.bufremove": { "branch": "main", "commit": "1ee294a97e091d3cf967974df622c0d887890dc2" },
"mini.files": { "branch": "main", "commit": "0db8f49088bcefff23c5cb8498a6c94e46a45a8e" },
"mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
"mini.move": { "branch": "main", "commit": "c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d" },
"mini.operators": { "branch": "main", "commit": "81e5059268154f5a8b594c95748968febdd539e3" },
"minuet-ai.nvim": { "branch": "main", "commit": "b96c93b2f496f94603ff3c755540b17658d62408" },
"multicursor.nvim": { "branch": "1.0", "commit": "17942364aec9c2caeec5fe29ee5f229b2f00c4b1" },
"neo-tree.nvim": { "branch": "main", "commit": "5d172e8315444dbc32867d1c7b04d8e7e68ec4e1" },
"neoconf.nvim": { "branch": "main", "commit": "b8ea8a1fe16b9c24a4dd701c7a03f414aee2c9ff" },
"neoconf.nvim": { "branch": "main", "commit": "d0f2fc2c67f03100ddca63e20124b7d0b60ef30c" },
"neogen": { "branch": "main", "commit": "d633d2ef572479792f6a09665fe5e897ed49f85c" },
"neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" },
"neotest": { "branch": "master", "commit": "d66cf4e05a116957f0d3a7755a24291c7d1e1f72" },
"neotest-go": { "branch": "main", "commit": "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6" },
"neotest-haskell": { "branch": "master", "commit": "0a487915ef5fa317e620766f3505d900d2bdd07f" },
"neotest-haskell": { "branch": "master", "commit": "93dc46a2e7083a4e853cbc4271d91c2ef2f416eb" },
"neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" },
"neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" },
"none-ls.nvim": { "branch": "main", "commit": "ed8f80849ef1ad31c2f74679fafdef7801091247" },
"nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
"nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" },
"nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
"nvim-colorizer.lua": { "branch": "master", "commit": "9b5fe0450bfb2521c6cea29391e5ec571f129136" },
"nvim-dap": { "branch": "master", "commit": "b4f27d451c187de912fa8d3229025a952917eb9e" },
"nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" },
"nvim-dap-go": { "branch": "main", "commit": "07739481317d36ddb3e3e8fbdfcd8f90b4167d73" },
"nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
"nvim-dap-repl-highlights": { "branch": "master", "commit": "a7512fc0a0de0c0be8d58983939856dda6f72451" },
"nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
"nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" },
"nvim-lspconfig": { "branch": "master", "commit": "66bc018936c6ff76beb75f89d986af6442db4001" },
"nvim-lspconfig": { "branch": "master", "commit": "6c17f8656f667727b27f5f598463afedb7791b18" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" },
"nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
"nvim-treesitter": { "branch": "master", "commit": "53a6b3993f5803378d4d031bf114c0b125a52ba8" },
"nvim-treesitter-context": { "branch": "master", "commit": "03f382ef224c27a8508cdab2d0b463dcb8ca12a6" },
"nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
Expand All @@ -96,13 +99,13 @@
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
"promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
"quick-scope": { "branch": "master", "commit": "f2b6043e04d9ef05205c8953e389304a4c1946f2" },
"quicker.nvim": { "branch": "master", "commit": "5e272a7b88892c4313f25b09a11e2ae5ebc68ba5" },
"refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" },
"render-markdown.nvim": { "branch": "main", "commit": "17a77463f945c4b9e4f371c752efd90e3e1bf604" },
"quicker.nvim": { "branch": "master", "commit": "76bfadd8f29895e79429fe0d30f0b3df82cd466a" },
"refactoring.nvim": { "branch": "master", "commit": "07e99021f66cad7eb7a6b45921798b0555f00bc3" },
"render-markdown.nvim": { "branch": "main", "commit": "e05a9f22f31c088ece3fa5928daf546a015b66ee" },
"resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
"rustaceanvim": { "branch": "master", "commit": "f03035fa03ccb36cd26d0792c946fbacba1d1a39" },
"smart-splits.nvim": { "branch": "master", "commit": "4a231987665d3c6e02ca88833d050e918afe3e1e" },
"snacks.nvim": { "branch": "main", "commit": "a7e442b5ab1c62d97f171b367ea53fa1492fa210" },
"snacks.nvim": { "branch": "main", "commit": "acedb16ad76ba0b5d4761372ca71057aa9486adb" },
"sqls.nvim": { "branch": "main", "commit": "a514379f5f89bf72955ed3bf5c1c31a40b8a1472" },
"telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
"template-string.nvim": { "branch": "main", "commit": "da5f326b65fb74fd068aa1d8b55461b64c8fb23b" },
Expand All @@ -117,7 +120,7 @@
"vim-dadbod-completion": { "branch": "master", "commit": "c7f1be21a08b8fc9d927a19db89a4aa995402787" },
"vim-dadbod-ui": { "branch": "master", "commit": "f4d37b7312ae6489e5c04bee654ca521baac188a" },
"vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
"vim-illuminate": { "branch": "master", "commit": "b5713e6ca3f627b46968386d6d3f24d374d3cb17" },
"vim-matchup": { "branch": "master", "commit": "aca23ce53ebfe34e02c4fe07e29e9133a2026481" },
"which-key.nvim": { "branch": "main", "commit": "b74a3c85f03225bc91f4f5a9056518d3fa9a3470" }
}
1 change: 1 addition & 0 deletions .config/nvim-astro/lua/plugins/ai.lua
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ return {
},
{
"yetone/avante.nvim",
enabled = false,
version = false,
build = "make",
event = "InsertEnter",
Expand Down
1 change: 1 addition & 0 deletions .config/nvim-astro/lua/plugins/astroui.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ return {
},
{
"vague2k/vague.nvim",
enabled = true,
opts = { transparent = false },
},
}
1 change: 1 addition & 0 deletions .config/nvim-astro/lua/plugins/disabled.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---@type LazySpec
return {
{ "goolord/alpha-nvim", enabled = false },
{ "rcarriga/nvim-notify", enabled = false },
}
2 changes: 1 addition & 1 deletion .config/nvim-astro/lua/plugins/mini-nvim.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ return {
opts = {
mappings = {
n = {
["<Leader>e"] = { minifiles_toggle, desc = "Explorer" },
["<Leader>-"] = { minifiles_toggle, desc = "Explorer" },
["<Leader>E"] = {
function() minifiles_toggle(vim.api.nvim_buf_get_name(0), false) end,
desc = "Explorer(current file)",
Expand Down
29 changes: 29 additions & 0 deletions .config/nvim-astro/lua/plugins/neogen.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---@type LazySpec
return {
"danymat/neogen",
cmd = "Neogen",
opts = {
snippet_engine = "luasnip",
languages = {
lua = { template = { annotation_convention = "ldoc" } },
typescript = { template = { annotation_convention = "tsdoc" } },
typescriptreact = { template = { annotation_convention = "tsdoc" } },
},
},
dependencies = {
{ "AstroNvim/astroui", opts = { icons = { Neogen = "󰷉" } } },
{
"AstroNvim/astrocore",
opts = function(_, opts)
local maps = opts.mappings
local prefix = "<Leader>n"
maps.n[prefix] = { desc = require("astroui").get_icon("Neogen", 1, true) .. "Annotation" }
maps.n[prefix .. "<CR>"] = { function() require("neogen").generate { type = "any" } end, desc = "Current" }
maps.n[prefix .. "c"] = { function() require("neogen").generate { type = "class" } end, desc = "Class" }
maps.n[prefix .. "f"] = { function() require("neogen").generate { type = "func" } end, desc = "Function" }
maps.n[prefix .. "t"] = { function() require("neogen").generate { type = "type" } end, desc = "Type" }
maps.n[prefix .. "F"] = { function() require("neogen").generate { type = "file" } end, desc = "File" }
end,
},
},
}
13 changes: 13 additions & 0 deletions .config/nvim-astro/lua/plugins/neogit.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---@type LazySpec
return {
"NeogitOrg/neogit",
cmd = "Neogit",
dependencies = {
"nvim-lua/plenary.nvim",
{ "sindrets/diffview.nvim", cmd = "DiffviewOpen", opts = {} }, -- optional - Diff integration
},
keys = {
{ "<leader>gn", "<cmd>Neogit kind=floating<cr>", desc = "Neogit" },
},
opts = {},
}
49 changes: 43 additions & 6 deletions .config/nvim-astro/lua/plugins/nvim-cmp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ local function deprio(kind)
if e2:get_kind() == kind then return true end
end
end

---@type LazySpec
return {
-- {
Expand All @@ -26,8 +27,36 @@ return {
{ "iguanacucumber/mag-nvim-lsp", name = "cmp-nvim-lsp", opts = {} },
{ "iguanacucumber/mag-buffer", name = "cmp-buffer" },
{ "iguanacucumber/mag-cmdline", name = "cmp-cmdline" },
"lukas-reineke/cmp-rg",
"https://codeberg.org/FelipeLema/cmp-async-path",
"lukas-reineke/cmp-rg",
{
"milanglacier/minuet-ai.nvim",
enabled = false,
dependencies = { "nvim-lua/plenary.nvim" },
opts = {
provider = "openai_fim_compatible",
n_completions = 1, -- recommend for local model for resource saving
-- I recommend beginning with a small context window size and incrementally
-- expanding it, depending on your local computing power. A context window
-- of 512, serves as an good starting point to estimate your computing
-- power. Once you have a reliable estimate of your local computing power,
-- you should adjust the context window to a larger value.
context_window = 512,
provider_options = {
openai_fim_compatible = {
api_key = "TERM",
name = "Ollama",
end_point = "http://localhost:11434/v1/completions",
model = "starcoder2:latest",
optional = {
max_tokens = 256,
top_p = 0.9,
},
},
},
},
config = function(_, opts) require("minuet").setup(opts) end,
},
},
opts = function(_, opts)
local cmp = require "cmp"
Expand All @@ -45,6 +74,7 @@ return {
i = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace, select = true },
c = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace, select = false },
}
-- opts.mapping["<A-y>"] = require("minuet").make_cmp_map()
-- modify the sources part of the options table
opts.sources = cmp.config.sources {
{ name = "nvim_lsp", priority = 1000 },
Expand All @@ -58,7 +88,16 @@ return {
priority = 200,
option = { additional_arguments = "--smart-case" },
},
-- { name = "minuet" },
}
-- opts.performance = require("astrocore").extend_tbl(opts.performance or {}, {
-- -- It is recommended to increase the timeout duration due to
-- -- the typically slower response speed of LLMs compared to
-- -- other completion sources. This is not needed when you only
-- -- need manual completion.
-- fetching_timeout = 2000,
-- })

opts.sorting = {
priority_weight = defaults.sorting.priority_weight,
comparators = vim.tbl_extend("keep", {
Expand All @@ -68,10 +107,8 @@ return {
end,
config = function(_, opts)
local cmp = require "cmp"
-- run cmp setup
cmp.setup(opts)

-- configure `cmp-cmdline` as described in their repo: https://github.com/hrsh7th/cmp-cmdline#setup
cmp.setup.cmdline("/", {
mapping = cmp.mapping.preset.cmdline(),
sources = {
Expand Down Expand Up @@ -102,18 +139,18 @@ return {
end,
},
{
"Saghen/blink.cmp",
"blink.cmp",
optional = true,
dependencies = { "mikavilpas/blink-ripgrep.nvim" },
---@module 'blink.cmp'
---@type blink.cmp.Config
opts = {
sources = {
default = { "ripgrep" },
providers = {
ripgrep = {
module = "blink-ripgrep",
name = "Ripgrep",
---@module "blink-ripgrep"
---@type blink-ripgrep.Options
opts = {},
},
},
Expand Down
Loading

0 comments on commit b6d7d54

Please sign in to comment.