From 50031cba0eb1ad8181c70f8d94fb140f0e2c751b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Andr=C3=A9=20Damas?= Date: Thu, 11 Sep 2025 22:09:14 +0100 Subject: [PATCH] Add picker resume key and replace i18n plugin --- lazy-lock.json | 9 +++++---- lua/plugins/blink.lua | 10 ++++++++++ lua/plugins/i18n.nvim.lua | 16 ++++++++++++++++ lua/plugins/js-i18n.nvim.lua | 3 ++- lua/plugins/which-key.nvim.lua | 5 +++++ 5 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 lua/plugins/i18n.nvim.lua diff --git a/lazy-lock.json b/lazy-lock.json index 5377863..8ed2451 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,6 +8,7 @@ "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "glance.nvim": { "branch": "master", "commit": "bf86d8b79dce808e65fdb6e9269d0b4ed6d2eefc" }, "hurl.nvim": { "branch": "main", "commit": "33ff81c0027c1d0071174eb40257010c7ce61e62" }, + "i18n.nvim": { "branch": "main", "commit": "0004878584b878fc407b0966ed8b070302979436" }, "js-i18n.nvim": { "branch": "main", "commit": "5157a1c1a47b14aa77fa6e50626dc1add4d1a618" }, "kulala.nvim": { "branch": "main", "commit": "3e81123652a72a2717f9916d6f2b52c2ae6f7e96" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, @@ -17,13 +18,13 @@ "mini.statusline": { "branch": "main", "commit": "e331175f10d9f400b42523b3890841aba202ce16" }, "namu.nvim": { "branch": "main", "commit": "6759df3cddb1d6d11442b953f8b63e64350229f3" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" }, - "neogit": { "branch": "master", "commit": "4046f747739cf7e7b9aada447f3edc59c947b111" }, + "neogit": { "branch": "master", "commit": "6617978288d58eb121754b5dd890e893d9a7e8d6" }, "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" }, "none-ls.nvim": { "branch": "main", "commit": "df778107fd2f0503f5606363ce13437132056d54" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" }, - "nvim-lspconfig": { "branch": "master", "commit": "3e89e4973d784e1c966517e528b3a30395403fa7" }, + "nvim-lspconfig": { "branch": "master", "commit": "c8b90ae5cbe21d547b342b05c9266dcb8ca0de8f" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, "nvim-ufo": { "branch": "main", "commit": "d31e2a9fd572a25a4d5011776677223a8ccb7e35" }, @@ -33,8 +34,8 @@ "package-info.nvim": { "branch": "master", "commit": "5cb3483ec886ca23e2c57e5d4a63c958d9a98179" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "render-markdown.nvim": { "branch": "main", "commit": "e76eb2e4262f0f0a1a7bd7a454dd7d44f1299afd" }, - "schemastore.nvim": { "branch": "main", "commit": "2ae6d27897c60265d4ad3f33e286528d519098fd" }, + "render-markdown.nvim": { "branch": "main", "commit": "7fd911692e5bc705c5487ae1c390d0b6d9738d87" }, + "schemastore.nvim": { "branch": "main", "commit": "05924b7383fa17f13f7a7e7ecc8ce83b3c340ce2" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "f64efd33a51ea89bdb847fb3aaf716e96b83ba1a" }, diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua index 32f6127..95c5edb 100644 --- a/lua/plugins/blink.lua +++ b/lua/plugins/blink.lua @@ -6,6 +6,16 @@ return { ---@module 'blink.cmp' ---@type blink.cmp.Config opts = { + sources = { + default = { 'i18n', 'snippets', 'lsp', 'path', 'buffer' }, + providers = { + lsp = { fallbacks = {} }, + i18n = { + name = 'i18n', + module = 'i18n.integration.blink_source', + }, + }, + }, keymap = { preset = 'default' }, appearance = { use_nvim_cmp_as_default = true, diff --git a/lua/plugins/i18n.nvim.lua b/lua/plugins/i18n.nvim.lua new file mode 100644 index 0000000..ba80313 --- /dev/null +++ b/lua/plugins/i18n.nvim.lua @@ -0,0 +1,16 @@ +return { + 'yelog/i18n.nvim', + dependencies = { + 'nvim-treesitter/nvim-treesitter' + }, + config = function() + require('i18n').setup({ + locales = { 'en' }, + sources = { + 'src/locales/{locales}.json', + -- { pattern = "src/locales/lang/{locales}/{module}.ts", prefix = "{module}." }, + -- { pattern = "src/views/{bu}/locales/lang/{locales}/{module}.ts", prefix = "{bu}.{module}." }, + } + }) + end +} diff --git a/lua/plugins/js-i18n.nvim.lua b/lua/plugins/js-i18n.nvim.lua index 65c0c2f..5557448 100644 --- a/lua/plugins/js-i18n.nvim.lua +++ b/lua/plugins/js-i18n.nvim.lua @@ -6,5 +6,6 @@ return { "nvim-lua/plenary.nvim", }, event = { "BufReadPre", "BufNewFile" }, - opts = {} + opts = {}, + enabled = false } diff --git a/lua/plugins/which-key.nvim.lua b/lua/plugins/which-key.nvim.lua index a1029ef..fac97a0 100644 --- a/lua/plugins/which-key.nvim.lua +++ b/lua/plugins/which-key.nvim.lua @@ -50,6 +50,11 @@ return { ":lua Snacks.picker.grep()", desc = "Project search" }, + { + "pr", + ":lua Snacks.picker.resume()", + desc = "Picker: resume" + }, { "ds",