diff --git a/lazy-lock.json b/lazy-lock.json index 09af783..7aca9a0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -27,6 +27,7 @@ "demicolon.nvim": { "branch": "main", "commit": "eedf66170d4f1ea1446ba73db2947c11d410d419" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "515acae4fd294fcefa5b15237a333c2606e958d1" }, + "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, "flow.nvim": { "branch": "main", "commit": "d8b2bc1a76325361fdbb2cdadbfe242d24370edd" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gh.nvim": { "branch": "main", "commit": "ebbaac254ef7dd6f85b439825fbce82d0dc84515" }, @@ -47,6 +48,7 @@ "inlay-hint.nvim": { "branch": "main", "commit": "eb5f0579537db271dfedd7f38460cdacb238176f" }, "inlay-hints.nvim": { "branch": "master", "commit": "3259b54f3b954b4d8260f3ee49ceabe978ea5636" }, "jq.nvim": { "branch": "main", "commit": "3a736044a9ff4d2b39919c43e66c8148ce85b6a5" }, + "jupynium.nvim": { "branch": "master", "commit": "b0b71577c6e4a613b6a4180068dd0b2de0659e52" }, "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" }, "lackluster.nvim": { "branch": "main", "commit": "662fba7e6719b7afc155076385c00d79290bc347" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, @@ -65,7 +67,7 @@ "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "melange.nvim": { "branch": "master", "commit": "09f64d1d2c78198116c405fc21515718bb61d7eb" }, "mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" }, - "neoconf.nvim": { "branch": "main", "commit": "c2ea8f71098add9e56771c318fa8423f89bfb6c1" }, + "neoconf.nvim": { "branch": "main", "commit": "623beb6fc221c04b7740c063e7246aa61f52d32f" }, "neocord": { "branch": "main", "commit": "4d55d8dab2d5f2f272192add7a2c21982039c699" }, "neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" }, "neogit": { "branch": "master", "commit": "43fa47fb61773b0d90a78ebc2521ea8faaeebd86" }, @@ -90,7 +92,8 @@ "nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" }, "nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-silicon": { "branch": "main", "commit": "8f9b3580522ae3d4b36b4a66ab995e633a8890c8" }, + "nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" }, + "nvim-silicon": { "branch": "main", "commit": "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "6df6e80417b58abe377c90f5e3f7fe94cf7dfc55" }, "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" }, @@ -98,7 +101,7 @@ "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" }, - "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" }, + "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, "ohne-accidents": { "branch": "main", "commit": "832b942a928e74b537a2526eacc6285e26af9589" }, "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" }, "onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" }, diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua index 7250a30..f3c6601 100644 --- a/lua/plugins/blink.lua +++ b/lua/plugins/blink.lua @@ -4,7 +4,7 @@ return { dependencies = { "folke/lazydev.nvim", "echasnovski/mini.icons", - "L3MON4D3/LuaSnip", + { "L3MON4D3/LuaSnip", version = "v2.*" }, "Saecki/crates.nvim", "davidsierradz/cmp-conventionalcommits", "petertriho/cmp-git", -- TODO: make this work @@ -71,7 +71,7 @@ return { "buffer", "git", "dbee", - "emoji", + "snippets", }, providers = { lazydev = { @@ -113,6 +113,11 @@ return { score_offset = 15, opts = { insert = true }, }, + jupynium = { + name = "jupynium", + module = "blink.compat.source", + score_offset = 100, + }, }, }, completion = { diff --git a/lua/plugins/luasnip.lua b/lua/plugins/luasnip.lua index e70ec96..85e6efc 100644 --- a/lua/plugins/luasnip.lua +++ b/lua/plugins/luasnip.lua @@ -2,12 +2,30 @@ return { { "L3MON4D3/LuaSnip", build = "make install_jsregexp", - version = "*", + version = "v2.*", dependencies = { "rafamadriz/friendly-snippets", -- a bunch of snippets to use - -- "saadparwaiz1/cmp_luasnip", }, - opts = {}, + opts = function() + local types = require("luasnip.util.types") + return { + -- This tells LuaSnip to remember to keep around the last snippet. + -- You can jump back into it even if you move outside of the selection + history = true, + -- This one is cool cause if you have dynamic snippets, it updates as you type! + updateevents = "TextChanged,TextChangedI", + -- Autosnippets: + enable_autosnippets = true, + -- Crazy highlights!! + ext_opts = { + [types.choiceNode] = { + active = { + virt_text = { { " « ", "NonTest" } }, + }, + }, + }, + } + end, config = function(_, opts) local ls = require("luasnip") @@ -61,30 +79,33 @@ return { end end, { silent = true }) - opts = { - -- This tells LuaSnip to remember to keep around the last snippet. - -- You can jump back into it even if you move outside of the selection - history = true, - -- This one is cool cause if you have dynamic snippets, it updates as you type! - updateevents = "TextChanged,TextChangedI", - -- Autosnippets: - enable_autosnippets = true, - -- Crazy highlights!! - ext_opts = { - [types.choiceNode] = { - active = { - virt_text = { { " « ", "NonTest" } }, - }, - }, - }, - } - ls.config.setup(opts) - -- require("luasnip.loaders.from_vscode").load({ exclude = { "python" } }) + require("luasnip.loaders.from_vscode").load({ + exclude = { + "rust", + rust = { + "modtest", + }, + }, + }) vim.tbl_map(function(type) require("luasnip.loaders.from_" .. type).lazy_load() end, { "vscode", "snipmate", "lua" }) + + ls.filetype_extend("typescript", { "tsdoc" }) + ls.filetype_extend("javascript", { "jsdoc" }) + ls.filetype_extend("lua", { "luadoc" }) + ls.filetype_extend("python", { "pydoc" }) + ls.filetype_extend("rust", { "rustdoc" }) + ls.filetype_extend("cs", { "csharpdoc" }) + ls.filetype_extend("java", { "javadoc" }) + ls.filetype_extend("c", { "cdoc" }) + ls.filetype_extend("cpp", { "cppdoc" }) + ls.filetype_extend("php", { "phpdoc" }) + ls.filetype_extend("kotlin", { "kdoc" }) + ls.filetype_extend("ruby", { "rdoc" }) + ls.filetype_extend("sh", { "shelldoc" }) end, }, }