diff --git a/.config/nvim/after/plugin/conform.lua b/.config/nvim/after/plugin/conform.lua new file mode 100644 index 00000000..5df888c2 --- /dev/null +++ b/.config/nvim/after/plugin/conform.lua @@ -0,0 +1,17 @@ +require("conform").setup({ + formatters_by_ft = { + python = { "isort" }, + lua = { "stylua" }, + css = { "stylelint" }, + javascript = { "prettierd", "prettier", stop_after_first = true }, + typescript = { "prettierd", "prettier", stop_after_first = true }, + html = { "prettierd", "prettier", stop_after_first = true }, + sql = { "sql_formatter" }, + sh = { "shfmt" }, + }, + format_on_save = { + -- These options will be passed to conform.format() + timeout_ms = 500, + lsp_format = "fallback", + }, +}) diff --git a/.config/nvim/after/plugin/neoformat.lua b/.config/nvim/after/plugin/neoformat.lua deleted file mode 100644 index 90bc8386..00000000 --- a/.config/nvim/after/plugin/neoformat.lua +++ /dev/null @@ -1 +0,0 @@ -vim.cmd([[let g:shfmt_opt="-ci"]]) diff --git a/.config/nvim/lua/neovim/packer.lua b/.config/nvim/lua/neovim/packer.lua index 17b490a2..06f0d6c7 100644 --- a/.config/nvim/lua/neovim/packer.lua +++ b/.config/nvim/lua/neovim/packer.lua @@ -29,7 +29,8 @@ return require("packer").startup(function(use) -- use({ "norcalli/nvim-colorizer.lua" }) use({ "windwp/nvim-autopairs" }) use({ "simeji/winresizer" }) - use({ "sbdchd/neoformat" }) + -- use({ "sbdchd/neoformat" }) + use({ "stevearc/conform.nvim" }) use({ "rhysd/vim-clang-format" }) use({ "sangdol/mintabline.vim" }) use({ "ThePrimeagen/harpoon" }) diff --git a/.config/nvim/lua/neovim/set.lua b/.config/nvim/lua/neovim/set.lua index be958225..9b2ad93c 100644 --- a/.config/nvim/lua/neovim/set.lua +++ b/.config/nvim/lua/neovim/set.lua @@ -46,17 +46,6 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, { command = [[%s/\s\+$//e]], }) --- formats on save --- vim.cmd([[autocmd BufWritePre * silent! :Neoformat]]) -vim.api.nvim_create_autocmd({ "BufWritePre" }, { - pattern = { "*", "silent!" }, - command = ":Neoformat", -}) --- disable poor neoformatting for .sql files -vim.cmd([[let g:neoformat_enabled_sql = [] ]]) - ---Saves vim session on save - -- Marks end of line, space, and trailing space characters vim.opt.listchars:append({ eol = "↵", trail = "·", space = "·" }) vim.opt.list = true diff --git a/updates.txt b/updates.txt index 0e784e07..5d5a6eba 100755 --- a/updates.txt +++ b/updates.txt @@ -558,3 +558,9 @@ doas pacman -S lftp 08/11/2024 Install cargo-leptos: cargo install cargo-leptos + +08/12/2024 +Install isort and stylelint +doas pacman -S python-isort stylelint +Install sql-formatter +paru sql-formatter