This commit is contained in:
Snoweuph 2024-06-02 19:11:54 +02:00
parent 0eaa505631
commit c77a700a15
Signed by: Snoweuph
GPG key ID: A494330694B208EF
16 changed files with 262 additions and 275 deletions

View file

@ -1,8 +1,8 @@
-- Use 2 Spaces Instead of Tabs -- -- Use 2 Spaces Instead of Tabs --
vim.cmd("set expandtab") vim.opt.expandtab = true
vim.cmd("set tabstop=4") vim.opt.tabstop = 4
vim.cmd("set softtabstop=4") vim.opt.softtabstop = 4
vim.cmd("set shiftwidth=4") vim.opt.shiftwidth = 4
-- Enable Line Number -- -- Enable Line Number --
vim.cmd("set number") vim.opt.number = true

View file

@ -1,5 +1,5 @@
vim.g.mapleader = " " vim.g.mapleader = " "
--[[ Indentation ]]-- --[[ Indentation ]]
vim.keymap.set("n", "<Tab>", ">>") vim.keymap.set("n", "<Tab>", ">>")
vim.keymap.set("n", "<S-Tab>", "<<") vim.keymap.set("n", "<S-Tab>", "<<")

View file

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

View file

@ -1,6 +1,6 @@
return { return {
'm4xshen/autoclose.nvim', "m4xshen/autoclose.nvim",
config = function() config = function()
require("autoclose").setup() require("autoclose").setup()
end end,
} }

View file

@ -6,12 +6,10 @@ LSP.mason_requirements = {
"sqlls", "sqlls",
"lemminx", "lemminx",
"yamlls", "yamlls",
"marksman" "marksman",
} }
LSP.plugin_info = { LSP.plugin_info = {}
}
function LSP.setup(lspconfig, capabilities) function LSP.setup(lspconfig, capabilities)
local config = { capabilities = capabilities } local config = { capabilities = capabilities }
@ -26,7 +24,7 @@ end
function LSP.formatter(null_ls) function LSP.formatter(null_ls)
return { return {
null_ls.builtins.formatting.prettier.with({ null_ls.builtins.formatting.prettier.with({
command = "prettierd" command = "prettierd",
}), }),
null_ls.builtins.diagnostics.spectral, null_ls.builtins.diagnostics.spectral,
null_ls.builtins.code_actions.refactoring, null_ls.builtins.code_actions.refactoring,
@ -38,7 +36,7 @@ function LSP.formatter(null_ls)
null_ls.builtins.diagnostics.codespell, null_ls.builtins.diagnostics.codespell,
null_ls.builtins.diagnostics.dotenv_linter, null_ls.builtins.diagnostics.dotenv_linter,
null_ls.builtins.diagnostics.trail_space, null_ls.builtins.diagnostics.trail_space,
null_ls.builtins.diagnostics.vacuum null_ls.builtins.diagnostics.vacuum,
} }
end end

View file

@ -1,12 +1,10 @@
local LSP = {} local LSP = {}
LSP.mason_requirements = { LSP.mason_requirements = {
"gopls" "gopls",
} }
LSP.plugin_info = { LSP.plugin_info = {}
}
function LSP.setup(lspconfig, capabilities) function LSP.setup(lspconfig, capabilities)
lspconfig.gopls.setup({ capabilities = capabilities }) lspconfig.gopls.setup({ capabilities = capabilities })
@ -18,7 +16,7 @@ function LSP.formatter(null_ls)
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.golangci_lint,
null_ls.builtins.diagnostics.staticcheck null_ls.builtins.diagnostics.staticcheck,
} }
end end

View file

@ -1,12 +1,10 @@
local LSP = {} local LSP = {}
LSP.mason_requirements = { LSP.mason_requirements = {
"lua_ls" "lua_ls",
} }
LSP.plugin_info = { LSP.plugin_info = {}
}
function LSP.setup(lspconfig, capabilities) function LSP.setup(lspconfig, capabilities)
lspconfig.lua_ls.setup({ lspconfig.lua_ls.setup({
@ -15,16 +13,16 @@ function LSP.setup(lspconfig, capabilities)
Lua = { Lua = {
diagnostics = { diagnostics = {
globals = { "vim" }, globals = { "vim" },
} },
} },
} },
}) })
end 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 null_ls.builtins.diagnostics.selene,
} }
end end

View file

@ -2,12 +2,10 @@ local LSP = {}
LSP.mason_requirements = { LSP.mason_requirements = {
"phpactor", "phpactor",
"stimulus_ls" "stimulus_ls",
} }
LSP.plugin_info = { LSP.plugin_info = {}
}
function LSP.setup(lspconfig, capabilities) function LSP.setup(lspconfig, capabilities)
local config = { capabilities = capabilities } local config = { capabilities = capabilities }
@ -20,7 +18,7 @@ function LSP.formatter(null_ls)
null_ls.builtins.diagnostics.phpstan, null_ls.builtins.diagnostics.phpstan,
null_ls.builtins.formatting.phpcsfixer.with({ null_ls.builtins.formatting.phpcsfixer.with({
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.phpcs,
null_ls.builtins.diagnostics.twigcs, null_ls.builtins.diagnostics.twigcs,

View file

@ -11,9 +11,7 @@ LSP.mason_requirements = {
"eslint", "eslint",
} }
LSP.plugin_info = { LSP.plugin_info = {}
}
function LSP.setup(lspconfig, capabilities) function LSP.setup(lspconfig, capabilities)
local config = { capabilities = capabilities } local config = { capabilities = capabilities }
@ -30,7 +28,7 @@ end
function LSP.formatter(null_ls) function LSP.formatter(null_ls)
return { return {
require("none-ls.formatting.eslint_d"), require("none-ls.formatting.eslint_d"),
null_ls.builtins.diagnostics.stylelint null_ls.builtins.diagnostics.stylelint,
} }
end end

View file

@ -1,10 +1,8 @@
return { return {
"folke/which-key.nvim", "folke/which-key.nvim",
config = function() config = function()
vim.o.timeout = true; vim.o.timeout = true
vim.o.timeoutlen = 300 vim.o.timeoutlen = 300
require("which-key").setup({ require("which-key").setup({})
end,
})
end
} }

View file

@ -3,7 +3,7 @@ return {
tag = "0.1.5", tag = "0.1.5",
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
"nvim-telescope/telescope-ui-select.nvim" "nvim-telescope/telescope-ui-select.nvim",
}, },
config = function() config = function()
-- Setup -- -- Setup --
@ -31,6 +31,5 @@ return {
setTelescopeBinding("n", "<leader>fz", telescope.live_grep, false, "Fuzzy Find") setTelescopeBinding("n", "<leader>fz", telescope.live_grep, false, "Fuzzy Find")
setTelescopeBinding("n", "<leader>gff", telescope.find_files, true, "Global Find File") setTelescopeBinding("n", "<leader>gff", telescope.find_files, true, "Global Find File")
setTelescopeBinding("n", "<leader>gfz", telescope.live_grep, true, "Global Fuzzy Find") setTelescopeBinding("n", "<leader>gfz", telescope.live_grep, true, "Global Fuzzy Find")
end,
end
} }

View file

@ -61,7 +61,7 @@ return {
lualine_a = { "filename" }, lualine_a = { "filename" },
}, },
extensions = { extensions = {
require("plugins.temp.status_bar_plugin"), require("plugins.extension.status_bar_plugin"),
}, },
}) })
end, end,

View file

@ -5,5 +5,5 @@ return {
config = function() config = function()
-- Set Theme -- -- Set Theme --
vim.cmd("colorscheme catppuccin") vim.cmd("colorscheme catppuccin")
end end,
} }