Skip to content

Commit

Permalink
fix based on updating for LazyVim
Browse files Browse the repository at this point in the history
cappyzawa committed Oct 14, 2023
1 parent fb58e0f commit c2419fc
Showing 5 changed files with 43 additions and 49 deletions.
9 changes: 9 additions & 0 deletions .config/nvim/lazyvim.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extras": [

],
"news": {
"NEWS.md": "2123"
},
"version": 2
}
21 changes: 21 additions & 0 deletions .config/nvim/lua/plugins/formatting.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
return {
{
"stevearc/conform.nvim",
opts = function()
return {
formatters_by_ft = {
css = { "prettier" },
go = { "goimports" },
html = { "prettier" },
javascript = { "prettier" },
json = { "prettier" },
lua = { "stylua" },
sh = { "shfmt" },
typescript = { "prettier" },
yaml = { "yamlfmt" },
zsh = { "beautysh" },
},
}
end,
},
}
12 changes: 12 additions & 0 deletions .config/nvim/lua/plugins/linting.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
return {
{
"mfussenegger/nvim-lint",
opts = {
linters_by_ft = {
sh = { "shellcheck" },
bash = { "shellcheck" },
zsh = { "shellcheck" },
},
},
},
}
44 changes: 0 additions & 44 deletions .config/nvim/lua/plugins/lsp.lua
Original file line number Diff line number Diff line change
@@ -178,50 +178,6 @@ return {
},
},
},
{
"jose-elias-alvarez/null-ls.nvim",
opts = function(_, opts)
local nls = require("null-ls")
opts.sources = vim.list_extend(opts.sources, {
nls.builtins.formatting.prettier.with({
filetypes = {
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"vue",
"css",
"scss",
"less",
"html",
"json",
"jsonc",
-- "yaml",
-- "markdown",
"markdown.mdx",
"graphql",
"handlebars",
},
}),
nls.builtins.diagnostics.opacheck,
nls.builtins.diagnostics.shellcheck,
nls.builtins.diagnostics.zsh,
nls.builtins.formatting.beautysh,
nls.builtins.formatting.cueimports,
nls.builtins.formatting.goimports,
nls.builtins.formatting.rego,
nls.builtins.formatting.shfmt,
nls.builtins.formatting.yamlfmt.with({
extra_args = {
"-quiet",
"-formatter",
"indentless_arrays=true,retain_line_breaks=true,max_line_length=100",
},
}),
})
return opts
end,
},
{
"williamboman/mason.nvim",
opts = {
6 changes: 1 addition & 5 deletions .config/nvim/lua/plugins/ui.lua
Original file line number Diff line number Diff line change
@@ -27,9 +27,8 @@ return {
end,
},
{
"goolord/alpha-nvim",
"glepnir/dashboard-nvim",
opts = function()
local dashboard = require("alpha.themes.dashboard")
local logo = [[
.d8888b. 8888888b.8888888888P888 888
d88P Y88b888 Y88b d88P 888 o 888
@@ -40,9 +39,6 @@ d88P Y88b888 Y88b d88P 888 o 888
Y88b d88P888 d88P 8888P Y8888
"Y8888P" 888 d8888888888888P Y888
]]

dashboard.section.header.val = vim.split(logo, "\n")
return dashboard
end,
},
{

0 comments on commit c2419fc

Please sign in to comment.