From dbc8995622b84ed9891ad63a1021e3254ed04c40 Mon Sep 17 00:00:00 2001 From: zwergius Date: Tue, 23 Jan 2024 14:59:01 +0100 Subject: [PATCH] Fixes indentation --- lua/custom/plugins/conform.lua | 72 +++++++++++++++++---------------- lua/custom/plugins/filetree.lua | 48 +++++++++++----------- 2 files changed, 61 insertions(+), 59 deletions(-) diff --git a/lua/custom/plugins/conform.lua b/lua/custom/plugins/conform.lua index 81f20af5..1969402d 100644 --- a/lua/custom/plugins/conform.lua +++ b/lua/custom/plugins/conform.lua @@ -1,39 +1,41 @@ return { - "stevearc/conform.nvim", - lazy = true, - -- event = { "BufReadPre", "BufNewFile" }, -- to disable comment this out - config = function() - local conform = require("conform") + "stevearc/conform.nvim", + lazy = true, + -- event = { "BufReadPre", "BufNewFile" }, -- to disable comment this out + config = function() + local conform = require("conform") - 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 - } - }) + conform.setup({ - vim.keymap.set({ "n", "v" }, "f", function() - conform.format({ - lsp_fallback = true, - async = false, - timeout_ms = 1000, - }) - end, { desc = "Format file or range (in visual mode)" }) - end + 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" }, "f", function() + conform.format({ + lsp_fallback = true, + async = false, + timeout_ms = 1000, + }) + end, { desc = "Format file or range (in visual mode)" }) + end } diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua index 18169c83..be53624f 100644 --- a/lua/custom/plugins/filetree.lua +++ b/lua/custom/plugins/filetree.lua @@ -1,26 +1,26 @@ return { - "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", - }, - config = function() - require('neo-tree').setup { - filesystem = { - filtered_items = { - visible = true, - hide_dotfiles = false, - hide_gitignored = true, - hide_by_name = { - -- '.git', - -- '.DS_Store', - -- 'thumbs.db', - } - } - } - } - vim.keymap.set('n', 'e', 'Neotree toggle', { desc = 'Open filetree explorer' }) - end, + "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", + }, + config = function() + require('neo-tree').setup { + filesystem = { + filtered_items = { + visible = true, + hide_dotfiles = false, + hide_gitignored = true, + hide_by_name = { + -- '.git', + -- '.DS_Store', + -- 'thumbs.db', + } + } + } + } + vim.keymap.set('n', 'e', 'Neotree toggle', { desc = 'Open filetree explorer' }) + end, }