diff --git a/filesets/base/nvim/.config/nvim/lua/plugins/formatter-nvim.lua b/filesets/base/nvim/.config/nvim/lua/plugins/formatter-nvim.lua index 474b4a4..00b07d2 100644 --- a/filesets/base/nvim/.config/nvim/lua/plugins/formatter-nvim.lua +++ b/filesets/base/nvim/.config/nvim/lua/plugins/formatter-nvim.lua @@ -1,9 +1,14 @@ +local get_buffer_name = function() + -- Prevent glob expansion on weird filenames + return "'" .. vim.api.nvim_buf_get_name(0) .. "'" +end + local prettier = function() return { exe = "prettier", args = { - "--stdin-filepath", vim.api.nvim_buf_get_name(0), '--single-quote', - '--no-semi' + "--stdin-filepath", get_buffer_name(), '--single-quote', + '--no-semi', '--prose-wrap', 'always' }, stdin = true } @@ -12,7 +17,7 @@ end local black = function() return { exe = "black", - args = {"-q", "--stdin-filename", vim.api.nvim_buf_get_name(0), "-"}, + args = {"-q", "--stdin-filename", get_buffer_name(), "-"}, stdin = true } end @@ -20,33 +25,19 @@ end local clang_format = function() return { exe = "clang-format", - args = {"--assume-filename", vim.api.nvim_buf_get_name(0)}, + args = {"--assume-filename", get_buffer_name()}, stdin = true, cwd = vim.fn.expand('%:p:h') } end -local gofmt = function() - return { - exe = "gofmt", - stdin = true - } -end +local gofmt = function() return {exe = "gofmt", stdin = true} end local blade_formatter = function() - return { - exe = "blade-formatter", - args = {"--stdin"}, - stdin = true - } + return {exe = "blade-formatter", args = {"--stdin"}, stdin = true} end -local lua_formatter = function() - return { - exe = "lua-format", - stdin = true - } -end +local lua_formatter = function() return {exe = "lua-format", stdin = true} end require('formatter').setup({ logging = false, @@ -62,6 +53,7 @@ require('formatter').setup({ php = {prettier}, css = {prettier}, html = {prettier}, + yaml = {prettier}, python = {black}, lua = {lua_formatter} } @@ -70,6 +62,6 @@ require('formatter').setup({ vim.api.nvim_exec([[ augroup FormatAutogroup autocmd! -autocmd BufWritePost *.c,*.h,*.cpp,*.go,*.html,*.css,*.js,*.ts,*.jsx,*.tsx,*.py,*.blade.php,*.php,*.lua FormatWrite +autocmd BufWritePost *.c,*.h,*.cpp,*.go,*.html,*.css,*.js,*.ts,*.jsx,*.tsx,*.py,*.blade.php,*.php,*.lua,*.yaml,*.yml FormatWrite augroup END ]], true) diff --git a/filesets/base/nvim/.config/nvim/lua/plugins/init.lua b/filesets/base/nvim/.config/nvim/lua/plugins/init.lua index c950df8..c754f66 100644 --- a/filesets/base/nvim/.config/nvim/lua/plugins/init.lua +++ b/filesets/base/nvim/.config/nvim/lua/plugins/init.lua @@ -12,21 +12,13 @@ return require('packer').startup(function() } -- File explorer - use { - 'kevinhwang91/rnvimr', - config = [[require('plugins.rnvimr')]] - } + use {'kevinhwang91/rnvimr', config = [[require('plugins.rnvimr')]]} - use { - 'kyazdani42/nvim-tree.lua', - config = [[require('plugins.nvim-tree')]] - } + use {'kyazdani42/nvim-tree.lua', config = [[require('plugins.nvim-tree')]]} -- LSP config - use { - 'neovim/nvim-lspconfig', - config = [[require('plugins.lsp')]] - } + use {'neovim/nvim-lspconfig', config = [[require('plugins.lsp')]]} + use {'williamboman/nvim-lsp-installer'} -- Langugage specific LSP plugins use {'tjdevries/nlua.nvim'} @@ -46,10 +38,7 @@ return require('packer').startup(function() use {'stevearc/aerial.nvim'} -- Diagnostics - use { - 'folke/trouble.nvim', - config = [[require('plugins.trouble-nvim')]] - } + use {'folke/trouble.nvim', config = [[require('plugins.trouble-nvim')]]} -- Tree-sitter use { @@ -69,10 +58,7 @@ return require('packer').startup(function() } -- Completion - use { - 'hrsh7th/nvim-compe', - config = [[require('plugins.nvim-compe')]] - } + use {'hrsh7th/nvim-compe', config = [[require('plugins.nvim-compe')]]} -- Snippets use {'hrsh7th/vim-vsnip'} @@ -91,10 +77,7 @@ return require('packer').startup(function() config = [[require('plugins.gitsigns-nvim')]] } use {'tpope/vim-fugitive'} - use { - 'kdheepak/lazygit.nvim', - config = [[require('plugins.lazygit-nvim')]] - } + use {'kdheepak/lazygit.nvim', config = [[require('plugins.lazygit-nvim')]]} -- Indent lines use { @@ -118,10 +101,7 @@ return require('packer').startup(function() use { 'hoob3rt/lualine.nvim', - requires = { - 'kyazdani42/nvim-web-devicons', - opt = true - }, + requires = {'kyazdani42/nvim-web-devicons', opt = true}, config = [[require('plugins.lualine')]] } @@ -132,10 +112,7 @@ return require('packer').startup(function() use {'norcalli/nvim-colorizer.lua'} -- Colorschemes - use { - 'Th3Whit3Wolf/onebuddy', - requires = {'tjdevries/colorbuddy.vim'} - } + use {'Th3Whit3Wolf/onebuddy', requires = {'tjdevries/colorbuddy.vim'}} use {'RRethy/nvim-base16'} use {'NTBBloodbath/doom-one.nvim'} use {'folke/tokyonight.nvim'} @@ -151,10 +128,7 @@ return require('packer').startup(function() } -- Python - use { - 'petobens/poet-v', - config = [[require('plugins.poet-v')]] - } + use {'petobens/poet-v', config = [[require('plugins.poet-v')]]} -- Blade use {'Eduruiz/vim-blade'} diff --git a/filesets/base/nvim/.config/nvim/lua/plugins/lsp.lua b/filesets/base/nvim/.config/nvim/lua/plugins/lsp.lua index 99c572b..6060212 100644 --- a/filesets/base/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/filesets/base/nvim/.config/nvim/lua/plugins/lsp.lua @@ -2,18 +2,12 @@ local lsp = require("lspconfig") local aerial = require("aerial") vim.lsp.handlers["textDocument/publishDiagnostics"] = - vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { - signs = true, - virtual_text = true, - underline = true - }) + vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, + {signs = true, virtual_text = true, underline = true}) local noremap = function(lhs, rhs, mode) mode = mode or 'n' - local opts = { - noremap = true, - silent = true - } + local opts = {noremap = true, silent = true} vim.api.nvim_buf_set_keymap(0, mode, lhs, rhs, opts) end @@ -23,9 +17,7 @@ local set_lsp_config = function(client, bufnr) aerial.on_attach(client) local mappings = { - v = { - ['ca'] = 'Lspsaga range_code_actionca'] = 'Lspsaga range_code_action', [[]], opts) end -vim.cmd('autocmd! TermOpen term://(*toggleterm#* lua set_terminal_keymaps()') +vim.cmd('autocmd! TermOpen term://*toggleterm#* lua set_terminal_keymaps()')