Minor Tweaks
This commit is contained in:
parent
87764d8fdd
commit
acb1c692bf
GPG key ID:
A494330694B208EF
5 changed files with 253 additions and 208 deletions
39
.config/nvim/lazy-lock.json
Normal file
39
.config/nvim/lazy-lock.json
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{
|
||||
"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" }
|
||||
}
|
||||
|
|
@ -5,73 +5,90 @@ 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")
|
||||
{
|
||||
"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)
|
||||
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>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,
|
||||
}
|
||||
-- Keybinding --
|
||||
vim.keymap.set("n", "<leader>fc", vim.lsp.buf.format, { desc = "Format Code" })
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvimdev/lspsaga.nvim",
|
||||
after = "nvim-lspconfig",
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
},
|
||||
config = function()
|
||||
local lspsaga = require("lspsaga")
|
||||
lspsaga.setup({})
|
||||
|
||||
-- Keybinding --
|
||||
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", "t" }, "<F6>", "<cmd>Lspsaga term_toggle<CR>", { desc = "Toggle Terminal" })
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,67 +1,71 @@
|
|||
return {
|
||||
"nvim-neo-tree/neo-tree.nvim",
|
||||
branch = "v3.x",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"MunifTanjim/nui.nvim",
|
||||
},
|
||||
config = function()
|
||||
-- Setup --
|
||||
require("neo-tree").setup({
|
||||
close_if_last_window = false,
|
||||
enable_git_status = true,
|
||||
enable_diagnostics = true,
|
||||
name = {
|
||||
trailing_slash = false,
|
||||
use_git_status_colors = true,
|
||||
highlight = "NeoTreeFileName",
|
||||
},
|
||||
git_status = {
|
||||
symbols = {
|
||||
-- Git Change type Icon --
|
||||
added = "✚",
|
||||
modified = "",
|
||||
deleted = "✖",
|
||||
renamed = "",
|
||||
-- Git Status type Icon --
|
||||
untracked = "",
|
||||
ignored = "",
|
||||
unstaged = "",
|
||||
staged = "",
|
||||
conflict = "",
|
||||
}
|
||||
},
|
||||
symlink_target = {
|
||||
enabled = false,
|
||||
},
|
||||
filesystem = {
|
||||
hijack_netrw_behavior = "open_default"
|
||||
},
|
||||
-- Keybinding --
|
||||
window = {
|
||||
mappings = {
|
||||
["<space>"] = "open"
|
||||
}
|
||||
}
|
||||
})
|
||||
"nvim-neo-tree/neo-tree.nvim",
|
||||
branch = "v3.x",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"MunifTanjim/nui.nvim",
|
||||
},
|
||||
config = function()
|
||||
-- Setup --
|
||||
require("neo-tree").setup({
|
||||
close_if_last_window = false,
|
||||
enable_git_status = true,
|
||||
enable_diagnostics = true,
|
||||
name = {
|
||||
trailing_slash = false,
|
||||
use_git_status_colors = true,
|
||||
highlight = "NeoTreeFileName",
|
||||
},
|
||||
git_status = {
|
||||
symbols = {
|
||||
-- Git Change type Icon --
|
||||
added = "✚",
|
||||
modified = "",
|
||||
deleted = "✖",
|
||||
renamed = "",
|
||||
-- Git Status type Icon --
|
||||
untracked = "",
|
||||
ignored = "",
|
||||
unstaged = "",
|
||||
staged = "",
|
||||
conflict = "",
|
||||
},
|
||||
},
|
||||
symlink_target = {
|
||||
enabled = false,
|
||||
},
|
||||
filesystem = {
|
||||
hijack_netrw_behavior = "open_default",
|
||||
},
|
||||
-- Keybinding --
|
||||
window = {
|
||||
mappings = {
|
||||
["<space>"] = "open",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
-- Dignostic Icons --
|
||||
vim.fn.sign_define("DiagnosticSignError", {
|
||||
text = " ", texthl = "DiagnosticSignError"
|
||||
})
|
||||
vim.fn.sign_define("DiagnosticSignWarn", {
|
||||
text = " ", texthl = "DiagnosticSignWarn"
|
||||
})
|
||||
vim.fn.sign_define("DiagnosticSignInfo", {
|
||||
text = " ", texthl = "DiagnosticSignInfo"
|
||||
})
|
||||
vim.fn.sign_define("DiagnosticSignHint", {
|
||||
text = "", texthl = "DiagnosticSignHint"
|
||||
})
|
||||
-- Dignostic Icons --
|
||||
vim.fn.sign_define("DiagnosticSignError", {
|
||||
text = " ",
|
||||
texthl = "DiagnosticSignError",
|
||||
})
|
||||
vim.fn.sign_define("DiagnosticSignWarn", {
|
||||
text = " ",
|
||||
texthl = "DiagnosticSignWarn",
|
||||
})
|
||||
vim.fn.sign_define("DiagnosticSignInfo", {
|
||||
text = " ",
|
||||
texthl = "DiagnosticSignInfo",
|
||||
})
|
||||
vim.fn.sign_define("DiagnosticSignHint", {
|
||||
text = "",
|
||||
texthl = "DiagnosticSignHint",
|
||||
})
|
||||
|
||||
-- Keybinding --
|
||||
vim.keymap.set("n", "<C-n>", ":Neotree toggle reveal left<CR>", { desc = "Toggle File Tree" })
|
||||
vim.keymap.set("n", "<leader>bf", ":Neotree buffers reveal float<CR>", { desc = "Show Open Files" })
|
||||
end,
|
||||
-- Keybinding --
|
||||
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" })
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,60 +1,66 @@
|
|||
return {
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
config = function()
|
||||
-- Setup --
|
||||
require("lualine").setup({
|
||||
options = {
|
||||
component_separators = { left = "", right = "" },
|
||||
section_separators = { left = "", right = "" },
|
||||
disabled_filetypes = {
|
||||
"neo-tree",
|
||||
"fugitive",
|
||||
"help",
|
||||
},
|
||||
ignore_focus = {},
|
||||
always_divide_middle = true,
|
||||
globalstatus = false,
|
||||
refresh = {
|
||||
statusline = 1000,
|
||||
tabline = 1000,
|
||||
winbar = 1000,
|
||||
},
|
||||
},
|
||||
sections = {
|
||||
lualine_a = { "mode" },
|
||||
lualine_b = { "branch", "diff", "diagnostics" },
|
||||
lualine_x = { "location" },
|
||||
lualine_y = { "encoding" },
|
||||
lualine_z = { "filetype" },
|
||||
},
|
||||
inactive_sections = {
|
||||
lualine_a = { "mode" },
|
||||
lualine_b = { "branch", "diff", "diagnostics" },
|
||||
lualine_x = { "location" },
|
||||
lualine_y = { "encoding" },
|
||||
lualine_z = { "filetype" },
|
||||
},
|
||||
tabline = {},
|
||||
winbar = {
|
||||
lualine_a = { "filename" },
|
||||
},
|
||||
inactive_winbar = {
|
||||
lualine_a = { "filename" },
|
||||
},
|
||||
extensions = {},
|
||||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"romgrk/barbar.nvim",
|
||||
dependencies = {
|
||||
"lewis6991/gitsigns.nvim",
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
},
|
||||
config = function()
|
||||
require("barbar").setup()
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = {
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"nvimdev/lspsaga.nvim",
|
||||
},
|
||||
config = function()
|
||||
-- Setup --
|
||||
local lspsaga_breadcrumbs = require("lspsaga.symbol.winbar").get_bar
|
||||
require("lualine").setup({
|
||||
options = {
|
||||
component_separators = { left = "", right = "" },
|
||||
section_separators = { left = "", right = "" },
|
||||
disabled_filetypes = {
|
||||
"neo-tree",
|
||||
"fugitive",
|
||||
"help",
|
||||
},
|
||||
ignore_focus = {},
|
||||
always_divide_middle = true,
|
||||
globalstatus = false,
|
||||
refresh = {
|
||||
statusline = 1000,
|
||||
tabline = 1000,
|
||||
winbar = 1000,
|
||||
},
|
||||
},
|
||||
sections = {
|
||||
lualine_a = { "mode" },
|
||||
lualine_b = { "diagnostics" },
|
||||
lualine_c = { lspsaga_breadcrumbs },
|
||||
lualine_x = { "location" },
|
||||
lualine_y = { "diff", "branch" },
|
||||
lualine_z = { "filetype" },
|
||||
},
|
||||
inactive_sections = {
|
||||
lualine_a = { "mode" },
|
||||
lualine_b = { "diagnostics" },
|
||||
lualine_c = {},
|
||||
lualine_x = { "location" },
|
||||
lualine_y = { "diff", "branch" },
|
||||
lualine_z = { "filetype" },
|
||||
},
|
||||
tabline = {},
|
||||
winbar = {
|
||||
lualine_a = { "filename" },
|
||||
},
|
||||
inactive_winbar = {
|
||||
lualine_a = { "filename" },
|
||||
},
|
||||
extensions = {},
|
||||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"romgrk/barbar.nvim",
|
||||
dependencies = {
|
||||
"lewis6991/gitsigns.nvim",
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
},
|
||||
config = function()
|
||||
require("barbar").setup()
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
return {
|
||||
"caenrique/buffer-term.nvim",
|
||||
config = function()
|
||||
local buffer_term = require("buffer-term")
|
||||
buffer_term.setup()
|
||||
|
||||
-- Keybindings --
|
||||
vim.keymap.set({ "n", "t" }, "<F6>", buffer_term.toggle_last, { desc = "Toggle Last Terminal" })
|
||||
|
||||
local function getToggleTerminalFunction(terminalNumber)
|
||||
return function()
|
||||
buffer_term.toggle(terminalNumber)
|
||||
end
|
||||
end
|
||||
|
||||
for i = 0, 9 do
|
||||
local key = "<F6>" .. i
|
||||
vim.keymap.set({ "n", "t" }, key, getToggleTerminalFunction(tostring(i)), { desc = "Toggle Terminal " .. i })
|
||||
end
|
||||
end,
|
||||
}
|
||||
Loading…
Reference in a new issue