From 564e6a0959bb158fc9a8b555078fb42662209fd1 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Fri, 31 May 2024 19:00:10 +0200 Subject: [PATCH] Cleanup --- .bashrc | 7 +++++++ .config/nvim/dependencies.dnf.txt | 14 +++++++++++++- .../debugger_go.lua => debugging/debugging_go.lua} | 0 .../nvim/lua/plugins/editor/editor_debugging.lua | 4 ++-- .../lua/plugins/editor/editor_language_server.lua | 11 ++++++----- .../language_server/language_server_generic.lua | 13 ++++++++++++- .../editor/language_server/language_server_go.lua | 4 +++- .../editor/language_server/language_server_lua.lua | 3 ++- .../editor/language_server/language_server_php.lua | 1 + .../editor/language_server/language_server_web.lua | 5 +++-- .config/nvim/lua/utils/finder.lua | 2 +- 11 files changed, 50 insertions(+), 14 deletions(-) rename .config/nvim/lua/plugins/editor/{debugger/debugger_go.lua => debugging/debugging_go.lua} (100%) diff --git a/.bashrc b/.bashrc index 5154286..91a9d02 100644 --- a/.bashrc +++ b/.bashrc @@ -6,6 +6,13 @@ case $- in *) return;; esac +################################# +## Toolbx ## +################################# +if [ -f "/run/.containerenv" ]; then + HOME="/var/home/$(whoami)" +fi + ################################# ## Oh My Bash ## ################################# diff --git a/.config/nvim/dependencies.dnf.txt b/.config/nvim/dependencies.dnf.txt index 87ecbda..c10e926 100644 --- a/.config/nvim/dependencies.dnf.txt +++ b/.config/nvim/dependencies.dnf.txt @@ -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 diff --git a/.config/nvim/lua/plugins/editor/debugger/debugger_go.lua b/.config/nvim/lua/plugins/editor/debugging/debugging_go.lua similarity index 100% rename from .config/nvim/lua/plugins/editor/debugger/debugger_go.lua rename to .config/nvim/lua/plugins/editor/debugging/debugging_go.lua diff --git a/.config/nvim/lua/plugins/editor/editor_debugging.lua b/.config/nvim/lua/plugins/editor/editor_debugging.lua index 1ff515e..8a29b8c 100644 --- a/.config/nvim/lua/plugins/editor/editor_debugging.lua +++ b/.config/nvim/lua/plugins/editor/editor_debugging.lua @@ -39,7 +39,7 @@ return { end -- Keybinding -- - vim.keymap.set("n", "dt", dapui.toggle, { desc = "Toggle Debugger UI" }) + vim.keymap.set("n", "dt", dapui.toggle, { desc = "Toggle Debugger UI" }) vim.keymap.set("n", "db", dap.toggle_breakpoint, { desc = "Toggle Breakpoint" }) vim.keymap.set("n", "dc", dap.continue, { desc = "Debugger Continue" }) vim.keymap.set("n", "dx", dap.terminate, { desc = "Debugger Terminate" }) @@ -71,5 +71,5 @@ return { ) end, }, - require("plugins.editor.debugger.debugger_go"), + require("plugins.editor.debugging.debugging_go"), } diff --git a/.config/nvim/lua/plugins/editor/editor_language_server.lua b/.config/nvim/lua/plugins/editor/editor_language_server.lua index 250c011..118ea59 100644 --- a/.config/nvim/lua/plugins/editor/editor_language_server.lua +++ b/.config/nvim/lua/plugins/editor/editor_language_server.lua @@ -1,8 +1,8 @@ -lua_lsp = require("plugins.editor.language_server.language_server_lua") -generic_lsp = require("plugins.editor.language_server.language_server_generic") -go_lsp = require("plugins.editor.language_server.language_server_go") -web_lsp = require("plugins.editor.language_server.language_server_web") -php_lsp = require("plugins.editor.language_server.language_server_php") +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 { { @@ -55,6 +55,7 @@ return { "nvimtools/none-ls.nvim", dependencies = { "nvim-lua/plenary.nvim", + "nvimtools/none-ls-extras.nvim" }, config = function() -- Setup -- diff --git a/.config/nvim/lua/plugins/editor/language_server/language_server_generic.lua b/.config/nvim/lua/plugins/editor/language_server/language_server_generic.lua index 0e1f98f..ce769d3 100644 --- a/.config/nvim/lua/plugins/editor/language_server/language_server_generic.lua +++ b/.config/nvim/lua/plugins/editor/language_server/language_server_generic.lua @@ -25,7 +25,18 @@ end function LSP.formatter(null_ls) 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 diff --git a/.config/nvim/lua/plugins/editor/language_server/language_server_go.lua b/.config/nvim/lua/plugins/editor/language_server/language_server_go.lua index 89e0609..b0a1880 100644 --- a/.config/nvim/lua/plugins/editor/language_server/language_server_go.lua +++ b/.config/nvim/lua/plugins/editor/language_server/language_server_go.lua @@ -16,7 +16,9 @@ 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.code_actions.impl, + null_ls.builtins.diagnostics.golangci_lint, + null_ls.builtins.diagnostics.staticcheck } end diff --git a/.config/nvim/lua/plugins/editor/language_server/language_server_lua.lua b/.config/nvim/lua/plugins/editor/language_server/language_server_lua.lua index 0b667c9..ad46ddc 100644 --- a/.config/nvim/lua/plugins/editor/language_server/language_server_lua.lua +++ b/.config/nvim/lua/plugins/editor/language_server/language_server_lua.lua @@ -23,7 +23,8 @@ end function LSP.formatter(null_ls) return { - null_ls.builtins.formatting.stylua + null_ls.builtins.formatting.stylua, + null_ls.builtins.diagnostics.selene } end diff --git a/.config/nvim/lua/plugins/editor/language_server/language_server_php.lua b/.config/nvim/lua/plugins/editor/language_server/language_server_php.lua index e5d6c0b..5befb03 100644 --- a/.config/nvim/lua/plugins/editor/language_server/language_server_php.lua +++ b/.config/nvim/lua/plugins/editor/language_server/language_server_php.lua @@ -22,6 +22,7 @@ function LSP.formatter(null_ls) prefer_local = "vendor/bin/php-cs-fixer", args = { "fix", "--allow-risky=yes", "$FILENAME" } }), + null_ls.builtins.diagnostics.phpcs, null_ls.builtins.diagnostics.twigcs, } end diff --git a/.config/nvim/lua/plugins/editor/language_server/language_server_web.lua b/.config/nvim/lua/plugins/editor/language_server/language_server_web.lua index 0e58e2f..5b49fab 100644 --- a/.config/nvim/lua/plugins/editor/language_server/language_server_web.lua +++ b/.config/nvim/lua/plugins/editor/language_server/language_server_web.lua @@ -15,7 +15,7 @@ LSP.plugin_info = { } -function LSP.setup(lspconfig) +function LSP.setup(lspconfig, capabilities) local config = { capabilities = capabilities } lspconfig.html.setup(config) lspconfig.emmet_ls.setup(config) @@ -29,7 +29,8 @@ end function LSP.formatter(null_ls) return { - null_ls.builtins.formatting.eslint_d, + require("none-ls.formatting.eslint_d"), + null_ls.builtins.diagnostics.stylelint } end diff --git a/.config/nvim/lua/utils/finder.lua b/.config/nvim/lua/utils/finder.lua index e0bb2fb..6764b2c 100644 --- a/.config/nvim/lua/utils/finder.lua +++ b/.config/nvim/lua/utils/finder.lua @@ -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