nvim: new formatters and less treesitter mappings
This commit is contained in:
@ -1,7 +1,6 @@
|
|||||||
return {
|
return {
|
||||||
"windwp/nvim-autopairs",
|
"windwp/nvim-autopairs",
|
||||||
config = function()
|
config = function()
|
||||||
-- autopairs
|
|
||||||
require("nvim-autopairs").setup({})
|
require("nvim-autopairs").setup({})
|
||||||
-- insert () after selecting functions
|
-- insert () after selecting functions
|
||||||
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
|
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
|
||||||
|
|||||||
@ -17,7 +17,7 @@ return {
|
|||||||
require("formatter.filetypes.json").jq,
|
require("formatter.filetypes.json").jq,
|
||||||
},
|
},
|
||||||
python = {
|
python = {
|
||||||
require("formatter.filetypes.python").black,
|
require("formatter.filetypes.python").ruff,
|
||||||
},
|
},
|
||||||
rust = {
|
rust = {
|
||||||
require("formatter.filetypes.rust").rustfmt,
|
require("formatter.filetypes.rust").rustfmt,
|
||||||
@ -34,9 +34,6 @@ return {
|
|||||||
javascript = {
|
javascript = {
|
||||||
require("formatter.filetypes.javascript").prettier,
|
require("formatter.filetypes.javascript").prettier,
|
||||||
},
|
},
|
||||||
terraform = {
|
|
||||||
require("formatter.filetypes.terraform").terraformfmt,
|
|
||||||
},
|
|
||||||
yaml = {
|
yaml = {
|
||||||
require("formatter.filetypes.yaml").yamlfmt,
|
require("formatter.filetypes.yaml").yamlfmt,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -3,7 +3,6 @@ return {
|
|||||||
config = function()
|
config = function()
|
||||||
require("lint").linters_by_ft = {
|
require("lint").linters_by_ft = {
|
||||||
python = { "mypy" },
|
python = { "mypy" },
|
||||||
rust = { "ruff" },
|
|
||||||
go = { "golangcilint" },
|
go = { "golangcilint" },
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -52,44 +52,44 @@ return {
|
|||||||
["<leader>rh"] = "@parameter.inner",
|
["<leader>rh"] = "@parameter.inner",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
move = {
|
-- move = {
|
||||||
enable = true,
|
-- enable = true,
|
||||||
set_jumps = true, -- whether to set jumps in the jumplist
|
-- set_jumps = true, -- whether to set jumps in the jumplist
|
||||||
goto_next_start = {
|
-- goto_next_start = {
|
||||||
["]m"] = "@function.outer",
|
-- ["]m"] = "@function.outer",
|
||||||
["]]"] = { query = "@class.outer", desc = "Next class start" },
|
-- ["]]"] = { query = "@class.outer", desc = "Next class start" },
|
||||||
--
|
-- --
|
||||||
-- You can use regex matching (i.e. lua pattern) and/or pass a list in a "query" key to group multiple queires.
|
-- -- You can use regex matching (i.e. lua pattern) and/or pass a list in a "query" key to group multiple queires.
|
||||||
["]o"] = "@loop.*",
|
-- ["]o"] = "@loop.*",
|
||||||
-- ["]o"] = { query = { "@loop.inner", "@loop.outer" } }
|
-- -- ["]o"] = { query = { "@loop.inner", "@loop.outer" } }
|
||||||
--
|
-- --
|
||||||
-- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
|
-- -- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
|
||||||
-- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
|
-- -- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
|
||||||
["]s"] = { query = "@scope", query_group = "locals", desc = "Next scope" },
|
-- ["]s"] = { query = "@scope", query_group = "locals", desc = "Next scope" },
|
||||||
["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
|
-- ["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
|
||||||
},
|
-- },
|
||||||
goto_next_end = {
|
-- goto_next_end = {
|
||||||
["]M"] = "@function.outer",
|
-- ["]M"] = "@function.outer",
|
||||||
["]["] = "@class.outer",
|
-- ["]["] = "@class.outer",
|
||||||
},
|
-- },
|
||||||
goto_previous_start = {
|
-- goto_previous_start = {
|
||||||
["[m"] = "@function.outer",
|
-- ["[m"] = "@function.outer",
|
||||||
["[["] = "@class.outer",
|
-- ["[["] = "@class.outer",
|
||||||
},
|
-- },
|
||||||
goto_previous_end = {
|
-- goto_previous_end = {
|
||||||
["[M"] = "@function.outer",
|
-- ["[M"] = "@function.outer",
|
||||||
["[]"] = "@class.outer",
|
-- ["[]"] = "@class.outer",
|
||||||
},
|
-- },
|
||||||
-- Below will go to either the start or the end, whichever is closer.
|
-- -- Below will go to either the start or the end, whichever is closer.
|
||||||
-- Use if you want more granular movements
|
-- -- Use if you want more granular movements
|
||||||
-- Make it even more gradual by adding multiple queries and regex.
|
-- -- Make it even more gradual by adding multiple queries and regex.
|
||||||
goto_next = {
|
-- goto_next = {
|
||||||
["]d"] = "@conditional.outer",
|
-- ["]d"] = "@conditional.outer",
|
||||||
},
|
-- },
|
||||||
goto_previous = {
|
-- goto_previous = {
|
||||||
["[d"] = "@conditional.outer",
|
-- ["[d"] = "@conditional.outer",
|
||||||
},
|
-- },
|
||||||
},
|
-- },
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
|
|||||||
Reference in New Issue
Block a user