From 2e6e11b86d0dd16d55d54f88e7dba07f6e39ac25 Mon Sep 17 00:00:00 2001 From: RafayAhmad7548 Date: Tue, 14 Apr 2026 05:48:42 +0500 Subject: [PATCH] neovim 0.12 update --- .config/nvim/lazy-lock.json | 13 ++-- .config/nvim/lua/config/keymaps.lua | 5 +- .config/nvim/lua/config/options.lua | 3 +- .../nvim/lua/config/plugins/languages/lsp.lua | 5 +- .../config/plugins/languages/treesitter.lua | 73 ++++++++----------- .config/nvim/lua/config/plugins/rest.lua | 13 +++- .config/nvim/lua/config/plugins/ui.lua | 37 +++++----- .config/nvim/snippets/http.snippets | 6 ++ 8 files changed, 83 insertions(+), 72 deletions(-) create mode 100644 .config/nvim/snippets/http.snippets diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index bbf4bc0..358f0c9 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -11,17 +11,18 @@ "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" }, - "lualine.nvim": { "branch": "master", "commit": "f5d2a8570f8b736ddb9bb4be504355bcd6e15ec8" }, + "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" }, "markview.nvim": { "branch": "main", "commit": "1861f959599ae03cfd59f56222a542035b0cd947" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "63a3c6a80538de1003373a619e29aeda27809ad3" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0a3b42c3e503df87aef6d6513e13148381495c3a" }, "mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" }, "mini.nvim": { "branch": "main", "commit": "a995fe9cd4193fb492b5df69175a351a74b3d36b" }, "molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" }, - "nvim-lspconfig": { "branch": "master", "commit": "c588db330592fa477a70d2fee6ba20a57194bdc3" }, - "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" }, - "nvim-web-devicons": { "branch": "master", "commit": "6e76c5e47e957fbf080b1fdac165c66dbd2e7cfb" }, + "nvim-lspconfig": { "branch": "master", "commit": "8a9378a822719346a0288fa004dab302ca3c0a8f" }, + "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, + "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" }, "otter.nvim": { "branch": "main", "commit": "a455e68a99d395889ab30a25ac3846a135e93c46" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "aab6caaffd79b8def22ec4320a5344f7c42f58d2" }, "rest.nvim": { "branch": "main", "commit": "714d5512aaec5565d55652480c16c26f8d95645d" }, "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 0ff649a..761627b 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -74,10 +74,13 @@ vim.keymap.set('n', 'sw', Snacks.picker.grep, { desc = 'grep' }) vim.keymap.set('n', 'sb', Snacks.picker.buffers, { desc = 'buffers' }) vim.keymap.set('n', 'sd', Snacks.picker.diagnostics_buffer, { desc = 'diagnostics' }) vim.keymap.set('n', 'sD', Snacks.picker.diagnostics, { desc = 'workspace diagnostics' }) +vim.keymap.set('n', 'sh', Snacks.picker.help, { desc = 'help' }) +vim.keymap.set('n', 'sg', Snacks.picker.git_log_file, { desc = 'git log of current file' }) +vim.keymap.set('n', 'sG', Snacks.picker.git_log, { desc = 'git log' }) + vim.keymap.set('n', 'st', function() Snacks.picker.todo_comments() end, { desc = 'search todos' }) -vim.keymap.set('n', 'sh', Snacks.picker.help, { desc = 'help' }) vim.keymap.set('n', '/', function() Snacks.picker.lines({ layout = 'select' }) diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index c1cb1eb..59d821b 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -47,8 +47,7 @@ vim.o.winborder = 'rounded' vim.opt.hlsearch = false vim.opt.wrap = false -vim.o.swapfile = false -vim.o.undofile = false +vim.opt.swapfile = false vim.o.sessionoptions='blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions' diff --git a/.config/nvim/lua/config/plugins/languages/lsp.lua b/.config/nvim/lua/config/plugins/languages/lsp.lua index aad46a1..dfbe74e 100644 --- a/.config/nvim/lua/config/plugins/languages/lsp.lua +++ b/.config/nvim/lua/config/plugins/languages/lsp.lua @@ -55,7 +55,10 @@ return { { 'L3MON4D3/LuaSnip', version = 'v2.*', - build = 'make install_jsregexp' + build = 'make install_jsregexp', + config = function () + require('luasnip.loaders.from_snipmate').lazy_load({ paths = '~/.config/nvim/snippets' }) + end }, 'folke/lazydev.nvim', }, diff --git a/.config/nvim/lua/config/plugins/languages/treesitter.lua b/.config/nvim/lua/config/plugins/languages/treesitter.lua index 62ec5ac..cf916ab 100644 --- a/.config/nvim/lua/config/plugins/languages/treesitter.lua +++ b/.config/nvim/lua/config/plugins/languages/treesitter.lua @@ -1,43 +1,34 @@ return { - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate', - main = 'nvim-treesitter.configs', -- Sets main module to use for opts - opts = { - ensure_installed = { - 'bash', - 'c', - 'cpp', - 'diff', - 'html', - 'css', - 'lua', - 'luadoc', - 'markdown', - 'markdown_inline', - 'query', - 'vim', - 'vimdoc', - 'rust', - 'python', - 'htmldjango', - 'r', - 'dart', - 'javascript', - 'typescript', - 'tsx', - 'prisma', - 'regex', - 'kotlin', - 'java', - }, - auto_install = false, - highlight = { enable = true, }, - indent = { enable = true }, - }, - -- There are additional nvim-treesitter modules that you can use to interact - -- with nvim-treesitter. You should go explore a few and see what interests you: - -- - -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` - -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context - -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate', + config = function() + require('nvim-treesitter').install({ + 'bash', + 'c', + 'cpp', + 'diff', + 'html', + 'css', + 'javascript', + 'typescript', + 'tsx', + 'lua', + 'luadoc', + 'markdown', + 'markdown_inline', + 'query', + 'vim', + 'vimdoc', + 'rust', + 'python', + 'htmldjango', + 'r', + 'dart', + 'prisma', + 'regex', + 'kotlin', + 'java', + 'http', + }) + end, } diff --git a/.config/nvim/lua/config/plugins/rest.lua b/.config/nvim/lua/config/plugins/rest.lua index 23808db..bab66c3 100644 --- a/.config/nvim/lua/config/plugins/rest.lua +++ b/.config/nvim/lua/config/plugins/rest.lua @@ -1,3 +1,10 @@ +vim.api.nvim_create_autocmd('FileType', { + pattern = { 'json' }, + callback = function() + vim.api.nvim_set_option_value('formatprg', 'jq', { scope = 'local' }) + end, +}) + vim.g.rest_nvim = { ui = { keybinds = { @@ -7,12 +14,12 @@ vim.g.rest_nvim = { }, } return { - "rest-nvim/rest.nvim", + 'rest-nvim/rest.nvim', dependencies = { - "nvim-treesitter/nvim-treesitter", + 'nvim-treesitter/nvim-treesitter', opts = function (_, opts) opts.ensure_installed = opts.ensure_installed or {} - table.insert(opts.ensure_installed, "http") + table.insert(opts.ensure_installed, 'http') end, }, } diff --git a/.config/nvim/lua/config/plugins/ui.lua b/.config/nvim/lua/config/plugins/ui.lua index f576ee9..7142134 100644 --- a/.config/nvim/lua/config/plugins/ui.lua +++ b/.config/nvim/lua/config/plugins/ui.lua @@ -1,24 +1,25 @@ return { { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - opts = { - options = { - globalstatus = true - } - } + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + opts = { + options = { + globalstatus = true + } + } }, { - 'catppuccin/nvim', - name = 'catppuccin', - priority = 1000, - opts = { - flavour = 'mocha', - no_italic = true, - }, - config = function() - vim.cmd('colorscheme catppuccin') - end - } + 'catppuccin/nvim', + name = 'catppuccin', + priority = 1000, + opts = { + flavour = 'mocha', + no_italic = true, + }, + config = function() + vim.cmd('colorscheme catppuccin') + end + }, + 'HiPhish/rainbow-delimiters.nvim', } diff --git a/.config/nvim/snippets/http.snippets b/.config/nvim/snippets/http.snippets new file mode 100644 index 0000000..2d670d7 --- /dev/null +++ b/.config/nvim/snippets/http.snippets @@ -0,0 +1,6 @@ +snippet req "new request" + # @name ${1:name} + ${2:GET} {{QA_BASE}}/${3:api} + $0 + + ###