neovim 0.12 update
This commit is contained in:
parent
d776924ffc
commit
2e6e11b86d
8 changed files with 83 additions and 72 deletions
|
|
@ -11,17 +11,18 @@
|
||||||
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
|
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
|
"lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "f5d2a8570f8b736ddb9bb4be504355bcd6e15ec8" },
|
"lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" },
|
||||||
"markview.nvim": { "branch": "main", "commit": "1861f959599ae03cfd59f56222a542035b0cd947" },
|
"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" },
|
"mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" },
|
||||||
"mini.nvim": { "branch": "main", "commit": "a995fe9cd4193fb492b5df69175a351a74b3d36b" },
|
"mini.nvim": { "branch": "main", "commit": "a995fe9cd4193fb492b5df69175a351a74b3d36b" },
|
||||||
"molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
|
"molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "c588db330592fa477a70d2fee6ba20a57194bdc3" },
|
"nvim-lspconfig": { "branch": "master", "commit": "8a9378a822719346a0288fa004dab302ca3c0a8f" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
|
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "6e76c5e47e957fbf080b1fdac165c66dbd2e7cfb" },
|
"nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
|
||||||
"otter.nvim": { "branch": "main", "commit": "a455e68a99d395889ab30a25ac3846a135e93c46" },
|
"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" },
|
"rest.nvim": { "branch": "main", "commit": "714d5512aaec5565d55652480c16c26f8d95645d" },
|
||||||
"snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
|
"snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
||||||
|
|
|
||||||
|
|
@ -74,10 +74,13 @@ vim.keymap.set('n', '<leader>sw', Snacks.picker.grep, { desc = 'grep' })
|
||||||
vim.keymap.set('n', '<leader>sb', Snacks.picker.buffers, { desc = 'buffers' })
|
vim.keymap.set('n', '<leader>sb', Snacks.picker.buffers, { desc = 'buffers' })
|
||||||
vim.keymap.set('n', '<leader>sd', Snacks.picker.diagnostics_buffer, { desc = 'diagnostics' })
|
vim.keymap.set('n', '<leader>sd', Snacks.picker.diagnostics_buffer, { desc = 'diagnostics' })
|
||||||
vim.keymap.set('n', '<leader>sD', Snacks.picker.diagnostics, { desc = 'workspace diagnostics' })
|
vim.keymap.set('n', '<leader>sD', Snacks.picker.diagnostics, { desc = 'workspace diagnostics' })
|
||||||
|
vim.keymap.set('n', '<leader>sh', Snacks.picker.help, { desc = 'help' })
|
||||||
|
vim.keymap.set('n', '<leader>sg', Snacks.picker.git_log_file, { desc = 'git log of current file' })
|
||||||
|
vim.keymap.set('n', '<leader>sG', Snacks.picker.git_log, { desc = 'git log' })
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>st', function()
|
vim.keymap.set('n', '<leader>st', function()
|
||||||
Snacks.picker.todo_comments()
|
Snacks.picker.todo_comments()
|
||||||
end, { desc = 'search todos' })
|
end, { desc = 'search todos' })
|
||||||
vim.keymap.set('n', '<leader>sh', Snacks.picker.help, { desc = 'help' })
|
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>/', function()
|
vim.keymap.set('n', '<leader>/', function()
|
||||||
Snacks.picker.lines({ layout = 'select' })
|
Snacks.picker.lines({ layout = 'select' })
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,7 @@ vim.o.winborder = 'rounded'
|
||||||
vim.opt.hlsearch = false
|
vim.opt.hlsearch = false
|
||||||
vim.opt.wrap = false
|
vim.opt.wrap = false
|
||||||
|
|
||||||
vim.o.swapfile = false
|
vim.opt.swapfile = false
|
||||||
vim.o.undofile = false
|
|
||||||
|
|
||||||
vim.o.sessionoptions='blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions'
|
vim.o.sessionoptions='blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,10 @@ return {
|
||||||
{
|
{
|
||||||
'L3MON4D3/LuaSnip',
|
'L3MON4D3/LuaSnip',
|
||||||
version = 'v2.*',
|
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',
|
'folke/lazydev.nvim',
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,43 +1,34 @@
|
||||||
return {
|
return {
|
||||||
'nvim-treesitter/nvim-treesitter',
|
'nvim-treesitter/nvim-treesitter',
|
||||||
build = ':TSUpdate',
|
build = ':TSUpdate',
|
||||||
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
|
config = function()
|
||||||
opts = {
|
require('nvim-treesitter').install({
|
||||||
ensure_installed = {
|
'bash',
|
||||||
'bash',
|
'c',
|
||||||
'c',
|
'cpp',
|
||||||
'cpp',
|
'diff',
|
||||||
'diff',
|
'html',
|
||||||
'html',
|
'css',
|
||||||
'css',
|
'javascript',
|
||||||
'lua',
|
'typescript',
|
||||||
'luadoc',
|
'tsx',
|
||||||
'markdown',
|
'lua',
|
||||||
'markdown_inline',
|
'luadoc',
|
||||||
'query',
|
'markdown',
|
||||||
'vim',
|
'markdown_inline',
|
||||||
'vimdoc',
|
'query',
|
||||||
'rust',
|
'vim',
|
||||||
'python',
|
'vimdoc',
|
||||||
'htmldjango',
|
'rust',
|
||||||
'r',
|
'python',
|
||||||
'dart',
|
'htmldjango',
|
||||||
'javascript',
|
'r',
|
||||||
'typescript',
|
'dart',
|
||||||
'tsx',
|
'prisma',
|
||||||
'prisma',
|
'regex',
|
||||||
'regex',
|
'kotlin',
|
||||||
'kotlin',
|
'java',
|
||||||
'java',
|
'http',
|
||||||
},
|
})
|
||||||
auto_install = false,
|
end,
|
||||||
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
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 = {
|
vim.g.rest_nvim = {
|
||||||
ui = {
|
ui = {
|
||||||
keybinds = {
|
keybinds = {
|
||||||
|
|
@ -7,12 +14,12 @@ vim.g.rest_nvim = {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
"rest-nvim/rest.nvim",
|
'rest-nvim/rest.nvim',
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-treesitter/nvim-treesitter",
|
'nvim-treesitter/nvim-treesitter',
|
||||||
opts = function (_, opts)
|
opts = function (_, opts)
|
||||||
opts.ensure_installed = opts.ensure_installed or {}
|
opts.ensure_installed = opts.ensure_installed or {}
|
||||||
table.insert(opts.ensure_installed, "http")
|
table.insert(opts.ensure_installed, 'http')
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,25 @@
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
'nvim-lualine/lualine.nvim',
|
'nvim-lualine/lualine.nvim',
|
||||||
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||||
opts = {
|
opts = {
|
||||||
options = {
|
options = {
|
||||||
globalstatus = true
|
globalstatus = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
'catppuccin/nvim',
|
'catppuccin/nvim',
|
||||||
name = 'catppuccin',
|
name = 'catppuccin',
|
||||||
priority = 1000,
|
priority = 1000,
|
||||||
opts = {
|
opts = {
|
||||||
flavour = 'mocha',
|
flavour = 'mocha',
|
||||||
no_italic = true,
|
no_italic = true,
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
vim.cmd('colorscheme catppuccin')
|
vim.cmd('colorscheme catppuccin')
|
||||||
end
|
end
|
||||||
}
|
},
|
||||||
|
'HiPhish/rainbow-delimiters.nvim',
|
||||||
}
|
}
|
||||||
|
|
|
||||||
6
.config/nvim/snippets/http.snippets
Normal file
6
.config/nvim/snippets/http.snippets
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
snippet req "new request"
|
||||||
|
# @name ${1:name}
|
||||||
|
${2:GET} {{QA_BASE}}/${3:api}
|
||||||
|
$0
|
||||||
|
|
||||||
|
###
|
||||||
Loading…
Add table
Add a link
Reference in a new issue