Cleanup
This commit is contained in:
parent
0eaa505631
commit
2aacd10240
20 changed files with 273 additions and 316 deletions
3
.config/nvim/.gitignore
vendored
Normal file
3
.config/nvim/.gitignore
vendored
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
/.*
|
||||||
|
!.gitignore
|
||||||
|
lazy-lock.json
|
|
@ -1,39 +0,0 @@
|
||||||
{
|
|
||||||
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
|
|
||||||
"alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
|
|
||||||
"autoclose.nvim": { "branch": "main", "commit": "dc42806540dcf448ecb2bad6b67204410cfbe629" },
|
|
||||||
"barbar.nvim": { "branch": "master", "commit": "d181f2cfd4b828f9c6f1e10e69c68241de59f54f" },
|
|
||||||
"buffer-term.nvim": { "branch": "main", "commit": "5d2a30d69288398d9e1e25a87822187ff6da6daa" },
|
|
||||||
"catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" },
|
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
|
||||||
"friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" },
|
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" },
|
|
||||||
"lazy.nvim": { "branch": "main", "commit": "b77aaa08cb5b178ed8662765caa41c70ff254a4c" },
|
|
||||||
"lspsaga.nvim": { "branch": "main", "commit": "4e9d6162863d2f532751db91a1193cfe1f3a4361" },
|
|
||||||
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
|
|
||||||
"luasnip-snippets": { "branch": "main", "commit": "731fc02d4b2e30ef0fddd345f9cad5f261479b7c" },
|
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
|
|
||||||
"mason.nvim": { "branch": "main", "commit": "0fb4e56837f13b81a972fcc0554be1327b39061e" },
|
|
||||||
"mdpreview.nvim": { "branch": "master", "commit": "c0996795060dfd4c160ee20a173767706763e249" },
|
|
||||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
|
|
||||||
"neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
|
|
||||||
"none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" },
|
|
||||||
"none-ls.nvim": { "branch": "main", "commit": "f5b960a73418249aebcdae3455de320360509253" },
|
|
||||||
"nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
|
|
||||||
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
|
|
||||||
"nvim-dap": { "branch": "master", "commit": "09b54e03d43d967c062a7d5b1da445f04e6f3113" },
|
|
||||||
"nvim-dap-go": { "branch": "main", "commit": "a0c5a2b991d7e9304a9a032cf177e22a4b0acda1" },
|
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
|
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "b124ef3bd4435a6db7ff03ea2f5a23e1e0487552" },
|
|
||||||
"nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" },
|
|
||||||
"nvim-terminal.lua": { "branch": "master", "commit": "095f98aaa7265628a72cd2706350c091544b5602" },
|
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "b7d50e59b1b2990b3ce8761d4cf595f4b71c87e2" },
|
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
|
|
||||||
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
|
|
||||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
|
||||||
"telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
|
|
||||||
"vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
|
|
||||||
"vim-just": { "branch": "main", "commit": "e217cb8dbf50d4b2608584b41e8f56d42580b8a1" },
|
|
||||||
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
|
|
||||||
}
|
|
|
@ -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
|
||||||
|
|
|
@ -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>", "<<")
|
||||||
|
|
|
@ -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"),
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
return {
|
return {
|
||||||
'm4xshen/autoclose.nvim',
|
"m4xshen/autoclose.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("autoclose").setup()
|
require("autoclose").setup()
|
||||||
end
|
end,
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,6 +65,7 @@ return {
|
||||||
},
|
},
|
||||||
mapping = cmp.mapping.preset.insert(doc_keybindings),
|
mapping = cmp.mapping.preset.insert(doc_keybindings),
|
||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
|
{ name = "lazydev", group_index = 0 },
|
||||||
{ name = "nvim_lsp" },
|
{ name = "nvim_lsp" },
|
||||||
{ name = "luasnip" },
|
{ name = "luasnip" },
|
||||||
}, { { name = "buffer" } }),
|
}, { { name = "buffer" } }),
|
||||||
|
|
|
@ -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",
|
||||||
|
|
|
@ -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,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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,
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,12 @@ return {
|
||||||
|
|
||||||
-- Keybinding --
|
-- Keybinding --
|
||||||
vim.keymap.set("n", "<leader>gh", ":Gitsigns preview_hunk_inline<CR>", { desc = "Toggle Inline Git Diff" })
|
vim.keymap.set("n", "<leader>gh", ":Gitsigns preview_hunk_inline<CR>", { desc = "Toggle Inline Git Diff" })
|
||||||
vim.keymap.set("n", "<leader>gb", ":Gitsigns toggle_current_line_blame<CR>", { desc = "Toggle Inline Git Blame" })
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"<leader>gb",
|
||||||
|
":Gitsigns toggle_current_line_blame<CR>",
|
||||||
|
{ desc = "Toggle Inline Git Blame" }
|
||||||
|
)
|
||||||
vim.keymap.set("n", "<leader>go", ":Git <CR>", { desc = "Open Git" })
|
vim.keymap.set("n", "<leader>go", ":Git <CR>", { desc = "Open Git" })
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
|
@ -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
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,5 +5,5 @@ return {
|
||||||
config = function()
|
config = function()
|
||||||
-- Set Theme --
|
-- Set Theme --
|
||||||
vim.cmd("colorscheme catppuccin")
|
vim.cmd("colorscheme catppuccin")
|
||||||
end
|
end,
|
||||||
}
|
}
|
Loading…
Reference in a new issue