mirror
/
kickstart.nvim
mirror of https://github.com/nvim-lua/kickstart.nvim.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fixes indentation

This commit is contained in:
zwergius 2024-01-23 14:59:01 +01:00
parent 1ea58a7cfc
commit dbc8995622
2 changed files with 61 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
lua/custom/plugins/conform.lua
View File

@ -1,39 +1,41 @@
return { return {
"stevearc/conform.nvim", "stevearc/conform.nvim",
lazy = true, lazy = true,
-- event = { "BufReadPre", "BufNewFile" }, -- to disable comment this out -- event = { "BufReadPre", "BufNewFile" }, -- to disable comment this out
config = function() 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" } },
},
format_on_save = {
lsp_fallback = true,
async = false,
timeout_ms = 500
}
})
vim.keymap.set({ "n", "v" }, "<leader>f", function() formatters_by_ft = {
conform.format({ css = { { --[[ "prettierd", ]] "prettier" } },
lsp_fallback = true, graphql = { { --[[ "prettierd", ]] "prettier" } },
async = false, html = { { --[[ "prettierd", ]] "prettier" } },
timeout_ms = 1000, javascript = { { --[[ "prettierd", ]] "prettier" } },
}) javascriptreact = { { --[[ "prettierd", ]] "prettier" } },
end, { desc = "Format file or range (in visual mode)" }) json = { { --[[ "prettierd", ]] "prettier" } },
end 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
}
})
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
} }

48
lua/custom/plugins/filetree.lua
View File

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