Format with stylua

This commit is contained in:
zwergius 2024-01-24 11:57:14 +01:00
parent dbc8995622
commit 6a8f6a9bb8
6 changed files with 283 additions and 68 deletions

View file

@ -1,15 +1,12 @@
return {
"windwp/nvim-autopairs",
'windwp/nvim-autopairs',
-- Optional dependency
dependencies = { 'hrsh7th/nvim-cmp' },
config = function()
require("nvim-autopairs").setup {}
require('nvim-autopairs').setup {}
-- If you want to automatically add `(` after selecting a function or method
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
local cmp = require('cmp')
cmp.event:on(
'confirm_done',
cmp_autopairs.on_confirm_done()
)
local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
local cmp = require 'cmp'
cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
end,
}

View file

@ -1,41 +1,93 @@
return {
"stevearc/conform.nvim",
'stevearc/conform.nvim',
lazy = true,
-- event = { "BufReadPre", "BufNewFile" }, -- to disable comment this out
config = function()
local conform = require("conform")
local conform = require 'conform'
conform.setup({
conform.setup {
formatters_by_ft = {
css = { { --[[ "prettierd", ]] "prettier" } },
graphql = { { --[[ "prettierd", ]] "prettier" } },
html = { { --[[ "prettierd", ]] "prettier" } },
javascript = { { --[[ "prettierd", ]] "prettier" } },
javascriptreact = { { --[[ "prettierd", ]] "prettier" } },
json = { { --[[ "prettierd", ]] "prettier" } },
less = { { --[[ "prettierd", ]] "prettier" } },
markdown = { { --[[ "prettierd", ]] "prettier" } },
scss = { { --[[ "prettierd", ]] "prettier" } },
svelte = { { --[[ "prettierd", ]] "prettier" } },
typescript = { { --[[ "prettierd", ]] "prettier" } },
typescriptreact = { { --[[ "prettierd", ]] "prettier" } },
yaml = { { --[[ "prettierd", ]] "prettier" } },
css = {
{ --[[ "prettierd", ]]
'prettier',
},
},
graphql = {
{ --[[ "prettierd", ]]
'prettier',
},
},
html = {
{ --[[ "prettierd", ]]
'prettier',
},
},
javascript = {
{ --[[ "prettierd", ]]
'prettier',
},
},
javascriptreact = {
{ --[[ "prettierd", ]]
'prettier',
},
},
json = {
{ --[[ "prettierd", ]]
'prettier',
},
},
less = {
{ --[[ "prettierd", ]]
'prettier',
},
},
markdown = {
{ --[[ "prettierd", ]]
'prettier',
},
},
scss = {
{ --[[ "prettierd", ]]
'prettier',
},
},
svelte = {
{ --[[ "prettierd", ]]
'prettier',
},
},
typescript = {
{ --[[ "prettierd", ]]
'prettier',
},
},
typescriptreact = {
{ --[[ "prettierd", ]]
'prettier',
},
},
yaml = {
{ --[[ "prettierd", ]]
'prettier',
},
},
},
format_on_save = {
lsp_fallback = true,
async = false,
timeout_ms = 500
}
})
timeout_ms = 500,
},
}
vim.keymap.set({ "n", "v" }, "<leader>f", function()
conform.format({
vim.keymap.set({ 'n', 'v' }, '<leader>f', function()
conform.format {
lsp_fallback = true,
async = false,
timeout_ms = 1000,
})
end, { desc = "Format file or range (in visual mode)" })
end
}
end, { desc = 'Format file or range (in visual mode)' })
end,
}

View file

@ -1,10 +1,10 @@
return {
"nvim-neo-tree/neo-tree.nvim",
version = "*",
'nvim-neo-tree/neo-tree.nvim',
version = '*',
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
"MunifTanjim/nui.nvim",
'nvim-lua/plenary.nvim',
'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
'MunifTanjim/nui.nvim',
},
config = function()
require('neo-tree').setup {
@ -17,9 +17,9 @@ return {
-- '.git',
-- '.DS_Store',
-- 'thumbs.db',
}
}
}
},
},
},
}
vim.keymap.set('n', '<leader>e', '<Cmd>Neotree toggle<CR>', { desc = 'Open filetree explorer' })
end,

View file

@ -14,11 +14,11 @@ vim.o.hlsearch = false
vim.opt.incsearch = true
-- Filetype overrides
vim.filetype.add({
vim.filetype.add {
extension = {
postcss = 'css',
}
})
},
}
-- Autocommand create folder(s) for new file
vim.cmd 'source ~/.config/nvim/vim/auto-mkdir.vim'