Cleanup
This commit is contained in:
parent
1e89056dee
commit
564e6a0959
11 changed files with 50 additions and 14 deletions
7
.bashrc
7
.bashrc
|
@ -6,6 +6,13 @@ case $- in
|
||||||
*) return;;
|
*) return;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
#################################
|
||||||
|
## Toolbx ##
|
||||||
|
#################################
|
||||||
|
if [ -f "/run/.containerenv" ]; then
|
||||||
|
HOME="/var/home/$(whoami)"
|
||||||
|
fi
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
## Oh My Bash ##
|
## Oh My Bash ##
|
||||||
#################################
|
#################################
|
||||||
|
|
|
@ -1 +1,13 @@
|
||||||
neovim lua gcc curl wget git unzip tar gzip ripgrep php composer go nodejs npm delve
|
# Coprs
|
||||||
|
yorickpeterse/stylua
|
||||||
|
|
||||||
|
# YUM Repos
|
||||||
|
echo '[charm]
|
||||||
|
name=Charm
|
||||||
|
baseurl=https://repo.charm.sh/yum/
|
||||||
|
enabled=1
|
||||||
|
gpgcheck=1
|
||||||
|
gpgkey=https://repo.charm.sh/yum/gpg.key' | sudo tee /etc/yum.repos.d/charm.repo
|
||||||
|
|
||||||
|
# Packages
|
||||||
|
neovim lua gcc curl wget git unzip tar gzip ripgrep php composer go nodejs npm delve stylua
|
||||||
|
|
|
@ -71,5 +71,5 @@ return {
|
||||||
)
|
)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
require("plugins.editor.debugger.debugger_go"),
|
require("plugins.editor.debugging.debugging_go"),
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
lua_lsp = require("plugins.editor.language_server.language_server_lua")
|
local lua_lsp = require("plugins.editor.language_server.language_server_lua")
|
||||||
generic_lsp = require("plugins.editor.language_server.language_server_generic")
|
local generic_lsp = require("plugins.editor.language_server.language_server_generic")
|
||||||
go_lsp = require("plugins.editor.language_server.language_server_go")
|
local go_lsp = require("plugins.editor.language_server.language_server_go")
|
||||||
web_lsp = require("plugins.editor.language_server.language_server_web")
|
local web_lsp = require("plugins.editor.language_server.language_server_web")
|
||||||
php_lsp = require("plugins.editor.language_server.language_server_php")
|
local php_lsp = require("plugins.editor.language_server.language_server_php")
|
||||||
|
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
|
@ -55,6 +55,7 @@ return {
|
||||||
"nvimtools/none-ls.nvim",
|
"nvimtools/none-ls.nvim",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
|
"nvimtools/none-ls-extras.nvim"
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
-- Setup --
|
-- Setup --
|
||||||
|
|
|
@ -25,7 +25,18 @@ end
|
||||||
|
|
||||||
function LSP.formatter(null_ls)
|
function LSP.formatter(null_ls)
|
||||||
return {
|
return {
|
||||||
null_ls.builtins.formatting.prettier
|
null_ls.builtins.formatting.prettier,
|
||||||
|
null_ls.builtins.diagnostics.spectral,
|
||||||
|
null_ls.builtins.code_actions.refactoring,
|
||||||
|
null_ls.builtins.code_actions.proselint,
|
||||||
|
null_ls.builtins.diagnostics.actionlint,
|
||||||
|
null_ls.builtins.diagnostics.markdownlint,
|
||||||
|
null_ls.builtins.diagnostics.alex,
|
||||||
|
null_ls.builtins.diagnostics.checkmake,
|
||||||
|
null_ls.builtins.diagnostics.codespell,
|
||||||
|
null_ls.builtins.diagnostics.dotenv_linter,
|
||||||
|
null_ls.builtins.diagnostics.trail_space,
|
||||||
|
null_ls.builtins.diagnostics.vacuum
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,9 @@ function LSP.formatter(null_ls)
|
||||||
return {
|
return {
|
||||||
null_ls.builtins.formatting.gofumpt,
|
null_ls.builtins.formatting.gofumpt,
|
||||||
null_ls.builtins.code_actions.gomodifytags,
|
null_ls.builtins.code_actions.gomodifytags,
|
||||||
null_ls.builtins.code_actions.impl
|
null_ls.builtins.code_actions.impl,
|
||||||
|
null_ls.builtins.diagnostics.golangci_lint,
|
||||||
|
null_ls.builtins.diagnostics.staticcheck
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,8 @@ end
|
||||||
|
|
||||||
function LSP.formatter(null_ls)
|
function LSP.formatter(null_ls)
|
||||||
return {
|
return {
|
||||||
null_ls.builtins.formatting.stylua
|
null_ls.builtins.formatting.stylua,
|
||||||
|
null_ls.builtins.diagnostics.selene
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ function LSP.formatter(null_ls)
|
||||||
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" }
|
||||||
}),
|
}),
|
||||||
|
null_ls.builtins.diagnostics.phpcs,
|
||||||
null_ls.builtins.diagnostics.twigcs,
|
null_ls.builtins.diagnostics.twigcs,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -15,7 +15,7 @@ LSP.plugin_info = {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function LSP.setup(lspconfig)
|
function LSP.setup(lspconfig, capabilities)
|
||||||
local config = { capabilities = capabilities }
|
local config = { capabilities = capabilities }
|
||||||
lspconfig.html.setup(config)
|
lspconfig.html.setup(config)
|
||||||
lspconfig.emmet_ls.setup(config)
|
lspconfig.emmet_ls.setup(config)
|
||||||
|
@ -29,7 +29,8 @@ end
|
||||||
|
|
||||||
function LSP.formatter(null_ls)
|
function LSP.formatter(null_ls)
|
||||||
return {
|
return {
|
||||||
null_ls.builtins.formatting.eslint_d,
|
require("none-ls.formatting.eslint_d"),
|
||||||
|
null_ls.builtins.diagnostics.stylelint
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue