Compare commits

..

No commits in common. "958e72129f8c15266cbaeb14f1c4c15c3c59b062" and "c829f44fed2c3029020a337d0d175264b30e706e" have entirely different histories.

16 changed files with 220 additions and 263 deletions

View file

@ -50,7 +50,6 @@ export DOCKER_HOST=unix:///run/user/1000/podman/podman.sock
alias nvim-conf="nvim ~/.config/nvim"
alias bash-conf="nvim #/.bashrc"
alias todo="nvim ~/Documents/Notes/Todo.md"
alias nano="nvim"
alias neofetch="fastfetch"

View file

@ -1,13 +1 @@
# 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
neovim lua gcc curl wget git unzip tar gzip ripgrep php composer go nodejs npm delve

View file

@ -4,6 +4,5 @@ return {
require("plugins.editor.editor_code_snippets"),
require("plugins.editor.editor_debugging"),
require("plugins.editor.editor_language_server"),
require("plugins.editor.editor_markdown_preview"),
require("plugins.editor.editor_nvim_dev")
}
require("plugins.editor.editor_markdown_preview")
}

View file

@ -39,7 +39,7 @@ return {
end
-- Keybinding --
vim.keymap.set("n", "<Leader>dt", dapui.toggle, { desc = "Toggle Debugger UI" })
vim.keymap.set("n", "<Leader>dt", dapui.toggle, { desc = "Toggle Debugger UI" })
vim.keymap.set("n", "<Leader>db", dap.toggle_breakpoint, { desc = "Toggle Breakpoint" })
vim.keymap.set("n", "<Leader>dc", dap.continue, { desc = "Debugger Continue" })
vim.keymap.set("n", "<Leader>dx", dap.terminate, { desc = "Debugger Terminate" })
@ -71,5 +71,5 @@ return {
)
end,
},
require("plugins.editor.debugging.debugging_go"),
require("plugins.editor.debugger.debugger_go"),
}

View file

@ -1,77 +1,5 @@
local lua_lsp = require("plugins.editor.language_server.language_server_lua")
local generic_lsp = require("plugins.editor.language_server.language_server_generic")
local go_lsp = require("plugins.editor.language_server.language_server_go")
local web_lsp = require("plugins.editor.language_server.language_server_web")
local php_lsp = require("plugins.editor.language_server.language_server_php")
return {
{
"williamboman/mason.nvim",
lazy = false,
config = function()
require("mason").setup()
end,
},
{
"williamboman/mason-lspconfig.nvim",
lazy = false,
opts = {
auto_install = true,
},
config = function()
require("mason-lspconfig").setup({
ensure_installed = {
table.unpack(lua_lsp.mason_requirements),
table.unpack(generic_lsp.mason_requirements),
table.unpack(go_lsp.mason_requirements),
table.unpack(web_lsp.mason_requirements),
table.unpack(php_lsp.mason_requirements)
},
})
end,
},
{
"neovim/nvim-lspconfig",
lazy = false,
config = function()
-- Setup --
local capabilities = require("cmp_nvim_lsp").default_capabilities()
local lspconfig = require("lspconfig")
lua_lsp.setup(lspconfig, capabilities)
generic_lsp.setup(lspconfig, capabilities)
go_lsp.setup(lspconfig, capabilities)
web_lsp.setup(lspconfig, capabilities)
php_lsp.setup(lspconfig, capabilities)
-- Keybinding --
vim.keymap.set("n", "<leader>cd", vim.lsp.buf.hover, { desc = "Show Code Definition" })
vim.keymap.set("n", "<leader>gd", vim.lsp.buf.definition, { desc = "Go to Definition" })
vim.keymap.set("n", "<leader>gr", vim.lsp.buf.references, { desc = "Go to References" })
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Do Code Actions" })
end,
},
{
"nvimtools/none-ls.nvim",
dependencies = {
"nvim-lua/plenary.nvim",
"nvimtools/none-ls-extras.nvim"
},
config = function()
-- Setup --
local null_ls = require("null-ls")
null_ls.setup({
sources = {
table.unpack(lua_lsp.formatter(null_ls)),
table.unpack(generic_lsp.formatter(null_ls)),
table.unpack(go_lsp.formatter(null_ls)),
table.unpack(web_lsp.formatter(null_ls)),
table.unpack(php_lsp.formatter(null_ls)),
},
})
-- Keybinding --
vim.keymap.set("n", "<leader>fc", vim.lsp.buf.format, { desc = "Format Code" })
end,
}
}
require("plugins.editor.language_server.language_server"),
require("plugins.editor.language_server.language_server_extra"),
require("plugins.editor.language_server.language_server_nvim_configuration"),
}

View file

@ -0,0 +1,170 @@
return {
{
"williamboman/mason.nvim",
lazy = false,
config = function()
require("mason").setup()
end,
},
{
"williamboman/mason-lspconfig.nvim",
lazy = false,
opts = {
auto_install = true,
},
config = function()
require("mason-lspconfig").setup({
ensure_installed = {
"lua_ls",
"bashls",
"dotls",
"jsonls",
"sqlls",
"lemminx",
"yamlls",
"marksman",
"html",
"emmet_ls",
"cssls",
"tailwindcss",
"tsserver",
"stimulus_ls",
"svelte",
"volar",
"eslint",
"phpactor",
"gopls",
"rust_analyzer",
"jdtls",
"kotlin_language_server",
"pylsp",
},
})
end,
},
{
"neovim/nvim-lspconfig",
lazy = false,
config = function()
-- Setup --
local capabilities = require("cmp_nvim_lsp").default_capabilities()
local lspconfig = require("lspconfig")
-- Lua support --
lspconfig.lua_ls.setup({
capabilities = capabilities,
settings = {
Lua = {
diagnostics = {
globals = { "vim" },
}
}
}
})
-- Bash support --
lspconfig.bashls.setup({
capabilities = capabilities,
})
-- Dotenv support --
lspconfig.dotls.setup({
capabilities = capabilities,
})
-- JSON support --
lspconfig.jsonls.setup({
capabilities = capabilities,
})
-- SQL support --
lspconfig.sqlls.setup({
capabilities = capabilities,
})
-- XML support --
lspconfig.lemminx.setup({
capabilities = capabilities,
})
-- YAML support --
lspconfig.yamlls.setup({
capabilities = capabilities,
})
-- Markdown support --
lspconfig.marksman.setup({
capabilities = capabilities,
})
-- HTML support --
lspconfig.html.setup({
capabilities = capabilities,
})
-- Emmet support --
lspconfig.emmet_ls.setup({
capabilities = capabilities,
})
-- PHP support --
lspconfig.phpactor.setup({
capabilities = capabilities,
})
-- CSS & SCSS support --$response
lspconfig.cssls.setup({
capabilities = capabilities,
})
-- Tailwind support --
lspconfig.tailwindcss.setup({
capabilities = capabilities,
})
-- JavaScript & TypeScript support --
lspconfig.tsserver.setup({
capabilities = capabilities,
})
-- Stimulus support --
lspconfig.stimulus_ls.setup({
capabilities = capabilities,
})
-- Svelte support --
lspconfig.svelte.setup({
capabilities = capabilities,
})
-- Vue support --
lspconfig.volar.setup({
capabilities = capabilities,
})
-- Go support --
lspconfig.gopls.setup({
capabilities = capabilities,
})
-- Rust support --
lspconfig.rust_analyzer.setup({
capabilities = capabilities,
})
-- Java support --
lspconfig.jdtls.setup({
capabilities = capabilities,
})
-- Kotlin support --
lspconfig.kotlin_language_server.setup({
capabilities = capabilities,
})
-- Python support --
lspconfig.pylsp.setup({
capabilities = capabilities,
})
-- Eslint support --
lspconfig.eslint.setup({
capabilities = capabilities,
})
-- Keybinding --
vim.keymap.set("n", "<leader>cd", vim.lsp.buf.hover, { desc = "Show Code Definition" })
vim.keymap.set("n", "<leader>gd", vim.lsp.buf.definition, { desc = "Go to Definition" })
vim.keymap.set("n", "<leader>gr", vim.lsp.buf.references, { desc = "Go to References" })
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Do Code Actions" })
end,
}
}

View file

@ -0,0 +1,40 @@
return {
"nvimtools/none-ls.nvim",
dependencies = {
"nvim-lua/plenary.nvim",
},
config = function()
-- Setup --
local null_ls = require("null-ls")
null_ls.setup({
sources = {
-- Prettier --
null_ls.builtins.formatting.prettier,
-- Php --
null_ls.builtins.diagnostics.phpstan,
null_ls.builtins.formatting.phpcsfixer.with({
prefer_local = "vendor/bin/php-cs-fixer",
args = { "fix", "--allow-risky=yes", "$FILENAME" }
}),
-- Twig --
null_ls.builtins.diagnostics.twigcs,
-- JavaScript & Typescript
--null_ls.builtins.formatting.eslint_d,
-- Lua --
null_ls.builtins.formatting.stylua,
-- Go --
null_ls.builtins.formatting.gofumpt,
null_ls.builtins.code_actions.gomodifytags,
null_ls.builtins.code_actions.impl
},
})
-- Keybinding --
vim.keymap.set("n", "<leader>fc", vim.lsp.buf.format, { desc = "Format Code" })
end,
}

View file

@ -1,43 +0,0 @@
local LSP = {}
LSP.mason_requirements = {
"bashls",
"jsonls",
"sqlls",
"lemminx",
"yamlls",
"marksman"
}
LSP.plugin_info = {
}
function LSP.setup(lspconfig, capabilities)
local config = { capabilities = capabilities }
lspconfig.bashls.setup(config)
lspconfig.jsonls.setup(config)
lspconfig.sqlls.setup(config)
lspconfig.lemminx.setup(config)
lspconfig.yamlls.setup(config)
lspconfig.marksman.setup(config)
end
function LSP.formatter(null_ls)
return {
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
return LSP

View file

@ -1,25 +0,0 @@
local LSP = {}
LSP.mason_requirements = {
"gopls"
}
LSP.plugin_info = {
}
function LSP.setup(lspconfig, capabilities)
lspconfig.gopls.setup({ capabilities = capabilities })
end
function LSP.formatter(null_ls)
return {
null_ls.builtins.formatting.gofumpt,
null_ls.builtins.code_actions.gomodifytags,
null_ls.builtins.code_actions.impl,
null_ls.builtins.diagnostics.golangci_lint,
null_ls.builtins.diagnostics.staticcheck
}
end
return LSP

View file

@ -1,31 +0,0 @@
local LSP = {}
LSP.mason_requirements = {
"lua_ls"
}
LSP.plugin_info = {
}
function LSP.setup(lspconfig, capabilities)
lspconfig.lua_ls.setup({
capabilities = capabilities,
settings = {
Lua = {
diagnostics = {
globals = { "vim" },
}
}
}
})
end
function LSP.formatter(null_ls)
return {
null_ls.builtins.formatting.stylua,
null_ls.builtins.diagnostics.selene
}
end
return LSP

View file

@ -1,30 +0,0 @@
local LSP = {}
LSP.mason_requirements = {
"phpactor",
"stimulus_ls"
}
LSP.plugin_info = {
}
function LSP.setup(lspconfig, capabilities)
local config = { capabilities = capabilities }
lspconfig.phpactor.setup(config)
lspconfig.stimulus_ls.setup(config)
end
function LSP.formatter(null_ls)
return {
null_ls.builtins.diagnostics.phpstan,
null_ls.builtins.formatting.phpcsfixer.with({
prefer_local = "vendor/bin/php-cs-fixer",
args = { "fix", "--allow-risky=yes", "$FILENAME" }
}),
null_ls.builtins.diagnostics.phpcs,
null_ls.builtins.diagnostics.twigcs,
}
end
return LSP

View file

@ -1,37 +0,0 @@
local LSP = {}
LSP.mason_requirements = {
"html",
"emmet_ls",
"cssls",
"tailwindcss",
"tsserver",
"svelte",
"volar",
"eslint",
}
LSP.plugin_info = {
}
function LSP.setup(lspconfig, capabilities)
local config = { capabilities = capabilities }
lspconfig.html.setup(config)
lspconfig.emmet_ls.setup(config)
lspconfig.cssls.setup(config)
lspconfig.tailwindcss.setup(config)
lspconfig.tsserver.setup(config)
lspconfig.svelte.setup(config)
lspconfig.volar.setup(config)
lspconfig.eslint.setup(config)
end
function LSP.formatter(null_ls)
return {
require("none-ls.formatting.eslint_d"),
null_ls.builtins.diagnostics.stylelint
}
end
return LSP

View file

@ -78,7 +78,7 @@ local function find_path_recursive(_dir, options)
-- Cleanup
options.current_depth = options.current_depth - 1
:: continue ::
::continue::
end
return nil
end

View file

@ -20,4 +20,3 @@
prunetags = true
[alias]
adog = log --all --decorate --oneline --graph
fl = push --force-with-lease