From e75b06b9711f863777843136cba1f125cf9c6cde Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Thu, 9 Jan 2025 22:38:25 +0200 Subject: [PATCH] chore: update blink --- ftdetect/jinja.lua | 7 +++++++ lazy-lock.json | 37 +++++++++++++++++++------------------ lua/plugins/blink.lua | 30 ++++++++++++++++++++++++++---- lua/solo/autocmds.lua | 2 +- lua/solo/lspconfig-opts.lua | 20 +++++++++----------- 5 files changed, 62 insertions(+), 34 deletions(-) create mode 100644 ftdetect/jinja.lua diff --git a/ftdetect/jinja.lua b/ftdetect/jinja.lua new file mode 100644 index 0000000..1693f59 --- /dev/null +++ b/ftdetect/jinja.lua @@ -0,0 +1,7 @@ +vim.filetype.add({ + extension = { + jinja = "jinja", + jinja2 = "jinja", + j2 = "jinja", + }, +}) diff --git a/lazy-lock.json b/lazy-lock.json index d450de8..09af783 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,8 +3,9 @@ "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "blink-ripgrep.nvim": { "branch": "main", "commit": "182da8e98da4453e6f6282643839a9dfa2025c69" }, - "blink.cmp": { "branch": "main", "commit": "5b0f52d42ecbb374695da1a93fa40eca4dc7a7ff" }, + "blink-emoji.nvim": { "branch": "master", "commit": "81e6c080d1e64c9ef548534c51147fd8063481c8" }, + "blink-ripgrep.nvim": { "branch": "main", "commit": "705069a57566a5e7427025264451c581f0bfb9c4" }, + "blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" }, "blink.compat": { "branch": "main", "commit": "5ca8848c8cc32abdc980e5db4f0eb7bb8fbf84dc" }, "catppuccin.nvim": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, "ccc.nvim": { "branch": "main", "commit": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed" }, @@ -23,7 +24,7 @@ "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" }, "darkvoid.nvim": { "branch": "master", "commit": "45be993a5617e05811b6b293c05e6aded7003cc9" }, "decisive.nvim": { "branch": "main", "commit": "a7251adebccbc9c899cff39a524b20d06e2b78b5" }, - "demicolon.nvim": { "branch": "main", "commit": "b9732a10dd12f2c5dfa779ec651f8b0852a462a9" }, + "demicolon.nvim": { "branch": "main", "commit": "eedf66170d4f1ea1446ba73db2947c11d410d419" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "515acae4fd294fcefa5b15237a333c2606e958d1" }, "flow.nvim": { "branch": "main", "commit": "d8b2bc1a76325361fdbb2cdadbfe242d24370edd" }, @@ -32,7 +33,7 @@ "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, "gitignore.nvim": { "branch": "master", "commit": "2455191ec94da8ed222806a4fe3aa358eac1e558" }, "gitpad.nvim": { "branch": "main", "commit": "1e0f6fa335c72c05d1d3635120c572e198e5ae0d" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "gitsigns.nvim": { "branch": "main", "commit": "68114837e81ca16d06514c3a997c9102d1b25c15" }, "gruvbox.nvim": { "branch": "main", "commit": "68c3460a5d1d1a362318960035c9f3466d5011f5" }, "hardtime.nvim": { "branch": "main", "commit": "5d9adcbe2f12741de79e435c8b85dca69a3b22e4" }, "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" }, @@ -46,7 +47,7 @@ "inlay-hint.nvim": { "branch": "main", "commit": "eb5f0579537db271dfedd7f38460cdacb238176f" }, "inlay-hints.nvim": { "branch": "master", "commit": "3259b54f3b954b4d8260f3ee49ceabe978ea5636" }, "jq.nvim": { "branch": "main", "commit": "3a736044a9ff4d2b39919c43e66c8148ce85b6a5" }, - "kanagawa.nvim": { "branch": "master", "commit": "18ae5771b22d8f913ef541c827a8180b4cb12c8a" }, + "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" }, "lackluster.nvim": { "branch": "main", "commit": "662fba7e6719b7afc155076385c00d79290bc347" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" }, @@ -64,7 +65,7 @@ "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "melange.nvim": { "branch": "master", "commit": "09f64d1d2c78198116c405fc21515718bb61d7eb" }, "mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" }, - "neoconf.nvim": { "branch": "main", "commit": "1e6c856d062b92ef201b35e0a4fc798331750118" }, + "neoconf.nvim": { "branch": "main", "commit": "c2ea8f71098add9e56771c318fa8423f89bfb6c1" }, "neocord": { "branch": "main", "commit": "4d55d8dab2d5f2f272192add7a2c21982039c699" }, "neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" }, "neogit": { "branch": "master", "commit": "43fa47fb61773b0d90a78ebc2521ea8faaeebd86" }, @@ -78,21 +79,21 @@ "nightfox.nvim": { "branch": "main", "commit": "595ffb8f291fc4a9bef3201a28b7c0379a41cdee" }, "nui-components.nvim": { "branch": "main", "commit": "caecfe2089e5ffbe99c2b0e0468da91990263a90" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "8a65c448122fc8fac9c67b2e857b6e830a4afd0b" }, - "nvim-dap": { "branch": "master", "commit": "0e673accbb512e1e191dfb4fecea89cc38c1bcdd" }, + "nvim-autopairs": { "branch": "master", "commit": "d2f791ceeb26d04d87aa54343bc94e8ad8d7be1c" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "359d4560d372486a787826216c33ed2ec5e88b00" }, + "nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" }, "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" }, - "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, + "nvim-dap-ui": { "branch": "master", "commit": "727c032a8f63899baccb42a1c26f27687e62fc5e" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, "nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" }, "nvim-justice": { "branch": "main", "commit": "8a310b655b887d6e07f015b687fff09a16ef177e" }, "nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" }, - "nvim-lspconfig": { "branch": "master", "commit": "8121483b8132b7053120fafd83728178fb3febf6" }, + "nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-silicon": { "branch": "main", "commit": "5551498f321cae9757f02807066bb9c9c9047dec" }, + "nvim-silicon": { "branch": "main", "commit": "8f9b3580522ae3d4b36b4a66ab995e633a8890c8" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, - "nvim-treesitter": { "branch": "master", "commit": "958af94dd8d74071c72c9d6840b41d06ea436b2f" }, - "nvim-treesitter-context": { "branch": "master", "commit": "18d28f00e1c9c4d719fbd77812b195d59e29db2b" }, + "nvim-treesitter": { "branch": "master", "commit": "6df6e80417b58abe377c90f5e3f7fe94cf7dfc55" }, + "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, @@ -110,9 +111,9 @@ "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "py-requirements.nvim": { "branch": "main", "commit": "24d870e57da1e4701e952006b8d3210d95549e20" }, "pymple.nvim": { "branch": "main", "commit": "110cc9499b89f2b7230a0c3a7332b3e4b1ac5b7b" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "63b2dde621d5a749080ae83d2df8b12caaca34d9" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "5578ca6709e0e9a0c76fc7c484b9951b428cbb71" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, - "rose-pine.nvim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, + "rose-pine.nvim": { "branch": "main", "commit": "106f05aeab8277e97eda9649271b33f9f12d8db4" }, "runner.nvim": { "branch": "main", "commit": "eb089f54a675d7cf5e5b3c4fd6700971e61a095c" }, "rustaceanvim": { "branch": "master", "commit": "0a1876b970ab946be3f4d341e9d743a5d62d646a" }, "spellwarn.nvim": { "branch": "main", "commit": "12734b47b008d912b4925c0bc2c1248eb534409d" }, @@ -120,7 +121,7 @@ "tagbar": { "branch": "master", "commit": "8de7694c0aeda253073098bbc9fb890b2902ddb8" }, "tailwind-fold.nvim": { "branch": "main", "commit": "30b8c04eec28628fbe554fb4f3a26984c4455176" }, "telescope-bibtex.nvim": { "branch": "master", "commit": "289a6f86ebec06e8ae1590533b732b9981d84900" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "4badec31fe2351fafc6f85af5e8e79408a80e914" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "0c43bc7ea4bcd3941f14974a39f2d7f6058b55a5" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, "telescope-git-diffs.nvim": { "branch": "main", "commit": "b8e5c9e13b9e27f8ccfd14430d04739b9996ae76" }, "telescope-heading.nvim": { "branch": "main", "commit": "e85c0f69cb64048f56e76548dcb2f10277576df9" }, @@ -148,7 +149,7 @@ "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" }, "vim-tmux-navigator": { "branch": "master", "commit": "d847ea942a5bb4d4fab6efebc9f30d787fd96e65" }, - "vimtex": { "branch": "master", "commit": "99c56940cefe6adead7500f7657cd6721ff38d05" }, + "vimtex": { "branch": "master", "commit": "adce3d38349925a0a891857c74bd4e8d1b8f80ab" }, "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }, "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua index 77c9001..7250a30 100644 --- a/lua/plugins/blink.lua +++ b/lua/plugins/blink.lua @@ -9,6 +9,7 @@ return { "davidsierradz/cmp-conventionalcommits", "petertriho/cmp-git", -- TODO: make this work "mikavilpas/blink-ripgrep.nvim", + "moyiz/blink-emoji.nvim", { "MattiasMTS/cmp-dbee", dependencies = { @@ -62,7 +63,16 @@ return { -- Default list of enabled providers defined so that you can extend it -- elsewhere in your config, without redefining it, due to `opts_extend` sources = { - default = { "lazydev", "crates", "lsp", "path", "luasnip", "buffer", "git", "dbee" }, + default = { + "lazydev", + "crates", + "lsp", + "path", + "buffer", + "git", + "dbee", + "emoji", + }, providers = { lazydev = { name = "LazyDev", @@ -97,6 +107,12 @@ return { fallback_to_regex_highlighting = true, }, }, + emoji = { + module = "blink-emoji", + name = "Emoji", + score_offset = 15, + opts = { insert = true }, + }, }, }, completion = { @@ -111,9 +127,14 @@ return { -- list = { selection = "auto_insert" }, list = { - selection = function(ctx) - return ctx.mode == "cmdline" and "auto_insert" or "preselect" - end, + selection = { + preselect = function(ctx) + return ctx.mode ~= "cmdline" + end, + auto_insert = function(ctx) + return ctx.mode ~= "cmdline" + end, + }, }, menu = { auto_show = function(ctx) @@ -143,6 +164,7 @@ return { }, signature = { enabled = true, window = { border = "single" } }, snippets = { + preset = "luasnip", expand = function(snippet) require("luasnip").lsp_expand(snippet) end, diff --git a/lua/solo/autocmds.lua b/lua/solo/autocmds.lua index 6fe9e65..596a8df 100644 --- a/lua/solo/autocmds.lua +++ b/lua/solo/autocmds.lua @@ -51,7 +51,7 @@ vim.api.nvim_create_autocmd({ "InsertEnter" }, { vim.api.nvim_create_autocmd({ "BufWinEnter" }, { pattern = "**/Codnity/**", callback = function() - vim.opt.colorcolumn = "92" + vim.opt.colorcolumn = "79" end, }) diff --git a/lua/solo/lspconfig-opts.lua b/lua/solo/lspconfig-opts.lua index 06ea908..b8e833f 100644 --- a/lua/solo/lspconfig-opts.lua +++ b/lua/solo/lspconfig-opts.lua @@ -116,24 +116,22 @@ return { filetypes = { "html", "htmldjango", "templ" }, }, --[[ pylyzer = { - settings = { - python = { - diagnostics = true, - inlayHints = true, - smartCompletion = true, - checkOnType = true, + settings = { + python = { + diagnostics = true, + inlayHints = true, + smartCompletion = true, + checkOnType = true, + }, }, - }, - }, ]] + }, ]] --[[ basedpyright = { - basedpyright = { analysis = { autoSearchPaths = true, diagnosticMode = "openFilesOnly", useLibraryCodeForTypes = true, }, - }, - }, ]] + }, ]] --[[ pylsp = { settings = { pylsp = {