updates
This commit is contained in:
1 parent
34ffac5b30
commit
ca2368ee2b
14 files changed
+168
-43
No files matched your search
@@ -60,6 +60,18 @@ return {
|
||||
config = function(_, opts)
|
||||
require("ufo").setup(opts)
|
||||
end,
|
||||
keys = {
|
||||
{
|
||||
"zp",
|
||||
function()
|
||||
local winid = require("ufo").peekFoldedLinesUnderCursor()
|
||||
if not winid then
|
||||
vim.lsp.buf.hover()
|
||||
end
|
||||
end,
|
||||
desc = "Peek folded line",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"chrisgrieser/nvim-origami",
|
||||
|
||||
@@ -7,8 +7,8 @@ return {
|
||||
{ "<leader>Ts", "<cmd>FloatermNew --disposable --name=duaroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> dua i<CR>", desc = "Workspace Size (root dir)" },
|
||||
{ "<leader>TS", "<cmd>FloatermNew --disposable --name=duabuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> dua i<CR>", desc = "Workspace Size (cwd)" },
|
||||
{ "<A-e>", "<cmd>FloatermNew --disposable --name=yaziroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> yazi<CR>", desc = "File Explorer (root dir)" },
|
||||
{ "<leader>gg", "<cmd>FloatermNew --disposable --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> lazygit<CR>", desc = "Lazygit (root dir)" },
|
||||
{ "<leader>gG", "<cmd>FloatermNew --disposable --name=lazygitbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> lazygit<CR>", desc = "Lazygit (cwd)" },
|
||||
{ "<leader>gg", "<cmd>FloatermNew --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> lazygit<CR>", desc = "Lazygit (root dir)" },
|
||||
{ "<leader>gG", "<cmd>FloatermNew --name=lazygitbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> lazygit<CR>", desc = "Lazygit (cwd)" },
|
||||
{ "<leader>Td", "<cmd>FloatermNew --disposable --name=lazydocker --opener=edit --titleposition=center --height=0.85 --width=0.85 lazydocker<CR>", desc = "Lazydocker" },
|
||||
{ "<leader>Tb", "<cmd>FloatermNew --disposable --name=btop --opener=edit --titleposition=center --height=0.85 --width=0.85 btop<CR>", desc = "Btop" },
|
||||
{ "<leader>Tn", "<cmd>FloatermNew --disposable --name=navi --opener=edit --titleposition=center --height=0.85 --width=0.85 pages<CR>", desc = "Navi Pages" },
|
||||
|
||||
@@ -11,7 +11,7 @@ return {
|
||||
"neovim/nvim-lspconfig",
|
||||
opts = {
|
||||
servers = {
|
||||
vuels = {},
|
||||
volar = {},
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -19,7 +19,7 @@ return {
|
||||
"williamboman/mason.nvim",
|
||||
opts = function(_, opts)
|
||||
opts.ensure_installed = opts.ensure_installed or {}
|
||||
vim.list_extend(opts.ensure_installed, { "vetur-vls" })
|
||||
vim.list_extend(opts.ensure_installed, { "vue-language-server" })
|
||||
end,
|
||||
},
|
||||
{
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
return {
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = function(_, opts)
|
||||
if type(opts.ensure_installed) == "table" then
|
||||
vim.list_extend(opts.ensure_installed, { "zig" })
|
||||
end
|
||||
end,
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
opts = {
|
||||
servers = {
|
||||
zls = {},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
opts = function(_, opts)
|
||||
opts.ensure_installed = opts.ensure_installed or {}
|
||||
vim.list_extend(opts.ensure_installed, { "zls", "codelldb" })
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvim-neotest/neotest",
|
||||
optional = true,
|
||||
dependencies = {
|
||||
"lawrence-laz/neotest-zig",
|
||||
},
|
||||
opts = {
|
||||
adapters = {
|
||||
["neotest-zig"] = {},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"mfussenegger/nvim-dap",
|
||||
optional = true,
|
||||
opts = function()
|
||||
local dap = require("dap")
|
||||
dap.configurations.zig = {
|
||||
{
|
||||
name = "Zig Run",
|
||||
type = "codelldb",
|
||||
request = "launch",
|
||||
program = function()
|
||||
os.execute("zig build")
|
||||
local command = "find ! -type d -path './zig-out/bin/*' | grep -v 'Test' | sed 's#.*/##'"
|
||||
local bin_location = io.popen(command, "r")
|
||||
if bin_location ~= nil then
|
||||
return "zig-out/bin/" .. bin_location:read("*a"):gsub("[\n\r]", "")
|
||||
else
|
||||
return ""
|
||||
end
|
||||
end,
|
||||
cwd = "${workspaceFolder}",
|
||||
stopOnEntry = false,
|
||||
args = function()
|
||||
local argv = {}
|
||||
arg = vim.fn.input(string.format("Arguments: "))
|
||||
for a in string.gmatch(arg, "%S+") do
|
||||
table.insert(argv, a)
|
||||
end
|
||||
return argv
|
||||
end,
|
||||
},
|
||||
}
|
||||
end,
|
||||
},
|
||||
{
|
||||
"stevearc/conform.nvim",
|
||||
opts = function(_, opts)
|
||||
opts.formatters_by_ft.python = opts.formatters_by_ft.python or {}
|
||||
table.insert(opts.formatters_by_ft.python, "zigfmt")
|
||||
return opts
|
||||
end,
|
||||
},
|
||||
}
|
||||
@@ -9,19 +9,17 @@ return {
|
||||
{
|
||||
"mfussenegger/nvim-lint",
|
||||
opts = function(_, opts)
|
||||
--- Extend the conform plugin config and add given formatters
|
||||
---@param tbl table<string, conform.FormatterUnit[]> Table of filetype to formatters mappings
|
||||
local function add_formatters(tbl)
|
||||
for ft, formatters in pairs(tbl) do
|
||||
if opts.formatters_by_ft[ft] == nil then
|
||||
opts.formatters_by_ft[ft] = formatters
|
||||
local function add_linters(tbl)
|
||||
for ft, linters in pairs(tbl) do
|
||||
if opts.linters_by_ft[ft] == nil then
|
||||
opts.linters_by_ft[ft] = linters
|
||||
else
|
||||
vim.list_extend(opts.formatters_by_ft[ft], formatters)
|
||||
vim.list_extend(opts.linters_by_ft[ft], linters)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
add_formatters({
|
||||
add_linters({
|
||||
["go"] = { "golangcilint" },
|
||||
["gomod"] = { "golangcilint" },
|
||||
["gowork"] = { "golangcilint" },
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
return {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
opts = function(_, opts)
|
||||
opts.ensure_installed = opts.ensure_installed or {}
|
||||
vim.list_extend(opts.ensure_installed, { "sqlfluff" })
|
||||
end,
|
||||
},
|
||||
{
|
||||
"mfussenegger/nvim-lint",
|
||||
opts = function(_, opts)
|
||||
local function add_linters(tbl)
|
||||
for ft, linters in pairs(tbl) do
|
||||
if opts.linters_by_ft[ft] == nil then
|
||||
opts.linters_by_ft[ft] = linters
|
||||
else
|
||||
vim.list_extend(opts.linters_by_ft[ft], linters)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
add_linters({
|
||||
["sql"] = { "sqlfluff" },
|
||||
["plsql"] = { "sqlfluff" },
|
||||
["mysql"] = { "sqlfluff" },
|
||||
})
|
||||
|
||||
return opts
|
||||
end,
|
||||
},
|
||||
}
|
||||
@@ -11,20 +11,24 @@ return {
|
||||
{
|
||||
"mfussenegger/nvim-lint",
|
||||
opts = function(_, opts)
|
||||
opts.linters_by_ft.html = opts.linters_by_ft.html or {}
|
||||
table.insert(opts.linters_by_ft.html, stylelint)
|
||||
local function add_linters(tbl)
|
||||
for ft, linters in pairs(tbl) do
|
||||
if opts.linters_by_ft[ft] == nil then
|
||||
opts.linters_by_ft[ft] = linters
|
||||
else
|
||||
vim.list_extend(opts.linters_by_ft[ft], linters)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
opts.linters_by_ft.css = opts.linters_by_ft.css or {}
|
||||
table.insert(opts.linters_by_ft.css, stylelint)
|
||||
add_linters({
|
||||
["html"] = { "stylelint" },
|
||||
["css"] = { "stylelint" },
|
||||
["scss"] = { "stylelint" },
|
||||
["sass"] = { "stylelint" },
|
||||
["less"] = { "stylelint" },
|
||||
})
|
||||
|
||||
opts.linters_by_ft.scss = opts.linters_by_ft.scss or {}
|
||||
table.insert(opts.linters_by_ft.scss, stylelint)
|
||||
|
||||
opts.linters_by_ft.sass = opts.linters_by_ft.sass or {}
|
||||
table.insert(opts.linters_by_ft.sass, stylelint)
|
||||
|
||||
opts.linters_by_ft.less = opts.linters_by_ft.less or {}
|
||||
table.insert(opts.linters_by_ft.less, stylelint)
|
||||
return opts
|
||||
end,
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user