forked from snoweuph/Dotfiles_nvim
Fix Terminal and add Twig formatting
This commit is contained in:
parent
52934decf2
commit
7249dc0978
4 changed files with 18 additions and 4 deletions
|
@ -25,6 +25,7 @@ command -v phpcs &>/dev/null || composer global require "squizlabs/php_codesniff
|
||||||
command -v phpstan &>/dev/null || composer global require "phpstan/phpstan=*" -n
|
command -v phpstan &>/dev/null || composer global require "phpstan/phpstan=*" -n
|
||||||
command -v php-cs-fixer &>/dev/null || composer global require "friendsofphp/php-cs-fixer=*" -n
|
command -v php-cs-fixer &>/dev/null || composer global require "friendsofphp/php-cs-fixer=*" -n
|
||||||
command -v twigcs &>/dev/null || composer global require "friendsoftwig/twigcs=*" -n
|
command -v twigcs &>/dev/null || composer global require "friendsoftwig/twigcs=*" -n
|
||||||
|
command -v ludtwig &>/dev/null || cargo install ludtwig
|
||||||
|
|
||||||
# Rust
|
# Rust
|
||||||
command -v cargo-clippy &>/dev/null || rustup component add clippy
|
command -v cargo-clippy &>/dev/null || rustup component add clippy
|
||||||
|
|
|
@ -4,7 +4,7 @@ return {
|
||||||
'akinsho/toggleterm.nvim',
|
'akinsho/toggleterm.nvim',
|
||||||
config = function()
|
config = function()
|
||||||
local terminal = require('toggleterm')
|
local terminal = require('toggleterm')
|
||||||
terminal.setup()
|
terminal.setup({shell = '/usr/bin/zsh'})
|
||||||
|
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
K.TOGGLE_TERMINAL.mode,
|
K.TOGGLE_TERMINAL.mode,
|
||||||
|
|
|
@ -13,6 +13,21 @@ function M.setup()
|
||||||
prefer_local = 'vendor/bin/php-cs-fixer',
|
prefer_local = 'vendor/bin/php-cs-fixer',
|
||||||
args = { 'fix', '--allow-risky=yes', '$FILENAME' },
|
args = { 'fix', '--allow-risky=yes', '$FILENAME' },
|
||||||
}),
|
}),
|
||||||
|
{
|
||||||
|
name = 'ludtwig',
|
||||||
|
method = null_ls.methods.FORMATTING,
|
||||||
|
filetypes = { 'twig' },
|
||||||
|
generator = require('null-ls.helpers').formatter_factory({
|
||||||
|
command = 'ludtwig',
|
||||||
|
args = {
|
||||||
|
'--fix',
|
||||||
|
'$FILENAME',
|
||||||
|
},
|
||||||
|
to_temp_file = true,
|
||||||
|
from_temp_file = true,
|
||||||
|
to_stdin = false,
|
||||||
|
}),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
@ -15,9 +15,7 @@ function M.setup()
|
||||||
-- Diagnostics
|
-- Diagnostics
|
||||||
null_ls.builtins.diagnostics.stylelint,
|
null_ls.builtins.diagnostics.stylelint,
|
||||||
-- Formatter
|
-- Formatter
|
||||||
null_ls.builtins.formatting.prettier.with({
|
null_ls.builtins.formatting.prettierd,
|
||||||
command = 'prettierd',
|
|
||||||
}),
|
|
||||||
}
|
}
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue