Snoweuph/Dotfiles
1
1
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
Snoweuph 2024-06-02 19:11:54 +02:00
parent 0eaa505631
commit 076cd6c300
Signed by: Snoweuph
GPG key ID: A494330694B208EF
14 changed files with 257 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.config/nvim/lua/core/editor.lua
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

6
.config/nvim/lua/core/keymap.lua
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>", "<<")

2
.config/nvim/lua/plugins/editor.lua
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"),
} }

4
.config/nvim/lua/plugins/editor/editor_auto_brackets.lua
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,
} }

2
.config/nvim/lua/plugins/editor/editor_debugging.lua
View file

@ -23,7 +23,7 @@ return {
}, },
{ {
elements = { elements = {
{ id = "repl", size = 0.5 }, { id = "repl", size = 0.5 },
{ id = "console", size = 0.5 }, { id = "console", size = 0.5 },
}, },
position = "bottom", position = "bottom",

164
.config/nvim/lua/plugins/editor/editor_language_server.lua
View file

@ -5,90 +5,90 @@ local web_lsp = require("plugins.editor.language_server.language_server_web")
local php_lsp = require("plugins.editor.language_server.language_server_php") local php_lsp = require("plugins.editor.language_server.language_server_php")
return { return {
{ {
"williamboman/mason.nvim", "williamboman/mason.nvim",
lazy = false, lazy = false,
config = function() config = function()
require("mason").setup() require("mason").setup()
end, end,
}, },
{ {
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
lazy = false, lazy = false,
opts = { opts = {
auto_install = true, auto_install = true,
}, },
config = function() config = function()
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
ensure_installed = { ensure_installed = {
table.unpack(lua_lsp.mason_requirements), table.unpack(lua_lsp.mason_requirements),
table.unpack(generic_lsp.mason_requirements), table.unpack(generic_lsp.mason_requirements),
table.unpack(go_lsp.mason_requirements), table.unpack(go_lsp.mason_requirements),
table.unpack(web_lsp.mason_requirements), table.unpack(web_lsp.mason_requirements),
table.unpack(php_lsp.mason_requirements), table.unpack(php_lsp.mason_requirements),
}, },
}) })
end, end,
}, },
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
lazy = false, lazy = false,
config = function() config = function()
-- Setup -- -- Setup --
local capabilities = require("cmp_nvim_lsp").default_capabilities() local capabilities = require("cmp_nvim_lsp").default_capabilities()
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
lua_lsp.setup(lspconfig, capabilities) lua_lsp.setup(lspconfig, capabilities)
generic_lsp.setup(lspconfig, capabilities) generic_lsp.setup(lspconfig, capabilities)
go_lsp.setup(lspconfig, capabilities) go_lsp.setup(lspconfig, capabilities)
web_lsp.setup(lspconfig, capabilities) web_lsp.setup(lspconfig, capabilities)
php_lsp.setup(lspconfig, capabilities) php_lsp.setup(lspconfig, capabilities)
-- Keybinding -- -- Keybinding --
vim.keymap.set("n", "<leader>cd", vim.lsp.buf.hover, { desc = "Show Code Definition" }) 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>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>gr", vim.lsp.buf.references, { desc = "Go to References" })
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Do Code Actions" }) vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Do Code Actions" })
end, end,
}, },
{ {
"nvimtools/none-ls.nvim", "nvimtools/none-ls.nvim",
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
"nvimtools/none-ls-extras.nvim", "nvimtools/none-ls-extras.nvim",
}, },
config = function() config = function()
-- Setup -- -- Setup --
local null_ls = require("null-ls") local null_ls = require("null-ls")
null_ls.setup({ null_ls.setup({
sources = { sources = {
table.unpack(lua_lsp.formatter(null_ls)), table.unpack(lua_lsp.formatter(null_ls)),
table.unpack(generic_lsp.formatter(null_ls)), table.unpack(generic_lsp.formatter(null_ls)),
table.unpack(go_lsp.formatter(null_ls)), table.unpack(go_lsp.formatter(null_ls)),
table.unpack(web_lsp.formatter(null_ls)), table.unpack(web_lsp.formatter(null_ls)),
table.unpack(php_lsp.formatter(null_ls)), table.unpack(php_lsp.formatter(null_ls)),
}, },
}) })
-- Keybinding -- -- Keybinding --
vim.keymap.set("n", "<leader>fc", vim.lsp.buf.format, { desc = "Format Code" }) vim.keymap.set("n", "<leader>fc", vim.lsp.buf.format, { desc = "Format Code" })
end, end,
}, },
{ {
"nvimdev/lspsaga.nvim", "nvimdev/lspsaga.nvim",
after = "nvim-lspconfig", after = "nvim-lspconfig",
dependencies = { dependencies = {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
"nvim-tree/nvim-web-devicons", "nvim-tree/nvim-web-devicons",
}, },
config = function() config = function()
local lspsaga = require("lspsaga") local lspsaga = require("lspsaga")
lspsaga.setup({}) lspsaga.setup({})
-- Keybinding -- -- Keybinding --
vim.keymap.set("n", "<leader>cr", ":Lspsaga rename<CR>", { desc = "Rename Variable" }) vim.keymap.set("n", "<leader>cr", ":Lspsaga rename<CR>", { desc = "Rename Variable" })
vim.keymap.set("n", "<leader>cp", ":Lspsaga peek_definition<CR>", { desc = "Peek Code Definition" }) vim.keymap.set("n", "<leader>cp", ":Lspsaga peek_definition<CR>", { desc = "Peek Code Definition" })
vim.keymap.set({ "n", "t" }, "<F6>", "<cmd>Lspsaga term_toggle<CR>", { desc = "Toggle Terminal" }) vim.keymap.set({ "n", "t" }, "<F6>", "<cmd>Lspsaga term_toggle<CR>", { desc = "Toggle Terminal" })
end, end,
}, },
} }

10
.config/nvim/lua/plugins/editor/language_server/language_server_generic.lua
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

8
.config/nvim/lua/plugins/editor/language_server/language_server_go.lua
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

14
.config/nvim/lua/plugins/editor/language_server/language_server_lua.lua
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

8
.config/nvim/lua/plugins/editor/language_server/language_server_php.lua
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,

6
.config/nvim/lua/plugins/editor/language_server/language_server_web.lua
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

134
.config/nvim/lua/plugins/file_tree.lua
View file

@ -1,71 +1,71 @@
return { return {
"nvim-neo-tree/neo-tree.nvim", "nvim-neo-tree/neo-tree.nvim",
branch = "v3.x", branch = "v3.x",
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons", "nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
}, },
config = function() config = function()
-- Setup -- -- Setup --
require("neo-tree").setup({ require("neo-tree").setup({
close_if_last_window = false, close_if_last_window = false,
enable_git_status = true, enable_git_status = true,
enable_diagnostics = true, enable_diagnostics = true,
name = { name = {
trailing_slash = false, trailing_slash = false,
use_git_status_colors = true, use_git_status_colors = true,
highlight = "NeoTreeFileName", highlight = "NeoTreeFileName",
}, },
git_status = { git_status = {
symbols = { symbols = {
-- Git Change type Icon -- -- Git Change type Icon --
added = "✚", added = "✚",
modified = "", modified = "",
deleted = "✖", deleted = "✖",
renamed = "󰁕", renamed = "󰁕",
-- Git Status type Icon -- -- Git Status type Icon --
untracked = "", untracked = "",
ignored = "", ignored = "",
unstaged = "󰄱", unstaged = "󰄱",
staged = "", staged = "",
conflict = "", conflict = "",
}, },
}, },
symlink_target = { symlink_target = {
enabled = false, enabled = false,
}, },
filesystem = { filesystem = {
hijack_netrw_behavior = "open_default", hijack_netrw_behavior = "open_default",
}, },
-- Keybinding -- -- Keybinding --
window = { window = {
mappings = { mappings = {
["<space>"] = "open", ["<space>"] = "open",
}, },
}, },
}) })
-- Dignostic Icons -- -- Dignostic Icons --
vim.fn.sign_define("DiagnosticSignError", { vim.fn.sign_define("DiagnosticSignError", {
text = "", text = "",
texthl = "DiagnosticSignError", texthl = "DiagnosticSignError",
}) })
vim.fn.sign_define("DiagnosticSignWarn", { vim.fn.sign_define("DiagnosticSignWarn", {
text = "", text = "",
texthl = "DiagnosticSignWarn", texthl = "DiagnosticSignWarn",
}) })
vim.fn.sign_define("DiagnosticSignInfo", { vim.fn.sign_define("DiagnosticSignInfo", {
text = "", text = "",
texthl = "DiagnosticSignInfo", texthl = "DiagnosticSignInfo",
}) })
vim.fn.sign_define("DiagnosticSignHint", { vim.fn.sign_define("DiagnosticSignHint", {
text = "󰌵", text = "󰌵",
texthl = "DiagnosticSignHint", texthl = "DiagnosticSignHint",
}) })
-- Keybinding -- -- Keybinding --
vim.keymap.set("n", "<leader>ft", ":Neotree toggle reveal left<CR>", { desc = "Toggle File Tree" }) vim.keymap.set("n", "<leader>ft", ":Neotree toggle reveal left<CR>", { desc = "Toggle File Tree" })
vim.keymap.set("n", "<leader>fo", ":Neotree buffers reveal float<CR>", { desc = "Show Open Files" }) vim.keymap.set("n", "<leader>fo", ":Neotree buffers reveal float<CR>", { desc = "Show Open Files" })
end, end,
} }

5
.config/nvim/lua/plugins/search.lua
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
} }

152
.config/nvim/lua/plugins/status_bar.lua
View file

@ -1,79 +1,79 @@
return { return {
{ {
"nvim-lualine/lualine.nvim", "nvim-lualine/lualine.nvim",
dependencies = { dependencies = {
"nvim-tree/nvim-web-devicons", "nvim-tree/nvim-web-devicons",
"nvimdev/lspsaga.nvim", "nvimdev/lspsaga.nvim",
}, },
after = "rcarriga/nvim-dap-ui", after = "rcarriga/nvim-dap-ui",
config = function() config = function()
-- Setup -- -- Setup --
local lspsaga_breadcrumbs = require("lspsaga.symbol.winbar").get_bar local lspsaga_breadcrumbs = require("lspsaga.symbol.winbar").get_bar
require("lualine").setup({ require("lualine").setup({
options = { options = {
component_separators = { left = "", right = "" }, component_separators = { left = "", right = "" },
section_separators = { left = "", right = "" }, section_separators = { left = "", right = "" },
disabled_filetypes = { disabled_filetypes = {
"neo-tree", "neo-tree",
"fugitive", "fugitive",
"help", "help",
statusline = { statusline = {
"dap-repl", "dap-repl",
"dapui_console", "dapui_console",
"dapui_console", "dapui_console",
"dapui_watches", "dapui_watches",
"dapui_stacks", "dapui_stacks",
"dapui_breakpoints", "dapui_breakpoints",
"dapui_scopes", "dapui_scopes",
}, },
}, },
ignore_focus = {}, ignore_focus = {},
always_divide_middle = true, always_divide_middle = true,
globalstatus = false, globalstatus = false,
refresh = { refresh = {
statusline = 1000, statusline = 1000,
tabline = 1000, tabline = 1000,
winbar = 1000, winbar = 1000,
}, },
}, },
sections = { sections = {
lualine_a = { "mode" }, lualine_a = { "mode" },
lualine_b = { "diagnostics" }, lualine_b = { "diagnostics" },
lualine_c = { lspsaga_breadcrumbs }, lualine_c = { lspsaga_breadcrumbs },
lualine_x = { "location" }, lualine_x = { "location" },
lualine_y = { "diff", "branch" }, lualine_y = { "diff", "branch" },
lualine_z = { "filetype" }, lualine_z = { "filetype" },
}, },
inactive_sections = { inactive_sections = {
lualine_a = { "mode" }, lualine_a = { "mode" },
lualine_b = { "diagnostics" }, lualine_b = { "diagnostics" },
lualine_c = {}, lualine_c = {},
lualine_x = { "location" }, lualine_x = { "location" },
lualine_y = { "diff", "branch" }, lualine_y = { "diff", "branch" },
lualine_z = { "filetype" }, lualine_z = { "filetype" },
}, },
tabline = {}, tabline = {},
winbar = { winbar = {
lualine_a = { "filename" }, lualine_a = { "filename" },
}, },
inactive_winbar = { inactive_winbar = {
lualine_a = { "filename" }, lualine_a = { "filename" },
}, },
extensions = { extensions = {
require("plugins.temp.status_bar_plugin"), require("plugins.extension.status_bar_plugin"),
}, },
}) })
end, end,
}, },
{ {
"romgrk/barbar.nvim", "romgrk/barbar.nvim",
dependencies = { dependencies = {
"lewis6991/gitsigns.nvim", "lewis6991/gitsigns.nvim",
"nvim-tree/nvim-web-devicons", "nvim-tree/nvim-web-devicons",
}, },
config = function() config = function()
require("barbar").setup() require("barbar").setup()
end, end,
}, },
} }