mirror of
https://github.com/pnx/dotfiles
synced 2026-06-16 19:30:01 +02:00
touching the nvim.
This commit is contained in:
parent
15e6408670
commit
71717129e1
40 changed files with 1045 additions and 921 deletions
|
|
@ -1,24 +1,24 @@
|
|||
return {
|
||||
"windwp/nvim-ts-autotag",
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter'
|
||||
},
|
||||
opts = {
|
||||
filetypes = {
|
||||
'html',
|
||||
'javascript',
|
||||
'typescript',
|
||||
'javascriptreact',
|
||||
'typescriptreact',
|
||||
'svelte',
|
||||
'vue',
|
||||
'tsx',
|
||||
'jsx',
|
||||
'rescript',
|
||||
'xml',
|
||||
'php',
|
||||
'blade',
|
||||
'markdown',
|
||||
}
|
||||
}
|
||||
"windwp/nvim-ts-autotag",
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter'
|
||||
},
|
||||
opts = {
|
||||
filetypes = {
|
||||
'html',
|
||||
'javascript',
|
||||
'typescript',
|
||||
'javascriptreact',
|
||||
'typescriptreact',
|
||||
'svelte',
|
||||
'vue',
|
||||
'tsx',
|
||||
'jsx',
|
||||
'rescript',
|
||||
'xml',
|
||||
'php',
|
||||
'blade',
|
||||
'markdown',
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,28 @@
|
|||
return {
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
main = "ibl",
|
||||
opts = {
|
||||
debounce = 10,
|
||||
indent = {
|
||||
char = '▏',
|
||||
},
|
||||
scope = {
|
||||
enabled = true,
|
||||
show_start = false,
|
||||
show_end = false
|
||||
},
|
||||
exclude = {
|
||||
filetypes = {
|
||||
'help',
|
||||
'dashboard'
|
||||
}
|
||||
}
|
||||
},
|
||||
config = function (_, opts)
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
main = "ibl",
|
||||
opts = {
|
||||
debounce = 10,
|
||||
indent = {
|
||||
char = '▏',
|
||||
},
|
||||
scope = {
|
||||
enabled = true,
|
||||
show_start = false,
|
||||
show_end = false
|
||||
},
|
||||
exclude = {
|
||||
filetypes = {
|
||||
'help',
|
||||
'dashboard'
|
||||
}
|
||||
}
|
||||
},
|
||||
config = function(_, opts)
|
||||
require 'ibl'.setup(opts)
|
||||
|
||||
require 'ibl'.setup(opts)
|
||||
|
||||
local hooks = require 'ibl.hooks'
|
||||
hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_tab_indent_level)
|
||||
hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level)
|
||||
end
|
||||
local hooks = require 'ibl.hooks'
|
||||
hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_tab_indent_level)
|
||||
hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level)
|
||||
end
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
return {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
build = function()
|
||||
require('nvim-treesitter.install').update({ with_sync = true })
|
||||
end,
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter-textobjects',
|
||||
'nvim-treesitter/playground'
|
||||
},
|
||||
opts = require('config.plugins.treesitter'),
|
||||
config = function(_, opts)
|
||||
local parser_config = require('nvim-treesitter.parsers').get_parser_configs()
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
build = function()
|
||||
require('nvim-treesitter.install').update({ with_sync = true })
|
||||
end,
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter-textobjects',
|
||||
'nvim-treesitter/playground'
|
||||
},
|
||||
opts = require('config.plugins.treesitter'),
|
||||
config = function(_, opts)
|
||||
local parser_config = require('nvim-treesitter.parsers').get_parser_configs()
|
||||
|
||||
parser_config.blade = {
|
||||
install_info = {
|
||||
url = 'https://github.com/EmranMR/tree-sitter-blade',
|
||||
branch = "main",
|
||||
files = { 'src/parser.c' },
|
||||
generate_requires_npm = true,
|
||||
requires_generate_from_grammar = true,
|
||||
},
|
||||
filetype = 'blade',
|
||||
}
|
||||
parser_config.blade = {
|
||||
install_info = {
|
||||
url = 'https://github.com/EmranMR/tree-sitter-blade',
|
||||
branch = "main",
|
||||
files = { 'src/parser.c' },
|
||||
generate_requires_npm = true,
|
||||
requires_generate_from_grammar = true,
|
||||
},
|
||||
filetype = 'blade',
|
||||
}
|
||||
|
||||
require("nvim-treesitter.configs").setup(opts)
|
||||
end,
|
||||
require("nvim-treesitter.configs").setup(opts)
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,82 +1,92 @@
|
|||
return {
|
||||
'neovim/nvim-lspconfig',
|
||||
dependencies = {
|
||||
'williamboman/mason.nvim',
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
},
|
||||
opts = require('config.plugins.lsp'),
|
||||
config = function (_, opts)
|
||||
-- Setup Mason to automatically install LSP servers
|
||||
require('mason').setup()
|
||||
require('mason-lspconfig').setup({ automatic_installation = true })
|
||||
local augroup = vim.api.nvim_create_augroup("Lsp", {})
|
||||
local lspconfig = require('lspconfig')
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
capabilities.textDocument.completion.completionItem.snippetSupport = false
|
||||
'neovim/nvim-lspconfig',
|
||||
dependencies = {
|
||||
'williamboman/mason.nvim',
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
{ 'folke/neodev.nvim', opts = {} },
|
||||
},
|
||||
opts = require('config.plugins.lsp'),
|
||||
config = function(_, opts)
|
||||
-- Setup Mason to automatically install LSP servers
|
||||
require('mason').setup()
|
||||
require('mason-lspconfig').setup({ automatic_installation = true })
|
||||
local augroup = vim.api.nvim_create_augroup("Lsp", {})
|
||||
local lspconfig = require('lspconfig')
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
capabilities.textDocument.completion.completionItem.snippetSupport = false
|
||||
|
||||
vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
|
||||
vim.lsp.handlers.hover,
|
||||
{border = 'single'}
|
||||
)
|
||||
vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
|
||||
vim.lsp.handlers.hover,
|
||||
{ border = 'single' }
|
||||
)
|
||||
|
||||
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
|
||||
focusable = true,
|
||||
style = "minimal",
|
||||
border = "single",
|
||||
})
|
||||
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
|
||||
focusable = true,
|
||||
style = "minimal",
|
||||
border = "single",
|
||||
})
|
||||
|
||||
for name, server_opt in pairs(opts.servers) do
|
||||
local on_attach = function(client, bufnr)
|
||||
for bind, settings in pairs(opts.mappings) do
|
||||
vim.keymap.set('n', bind, settings[1], vim.tbl_deep_extend("force", settings[2], { buffer = bufnr }))
|
||||
end
|
||||
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
|
||||
vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||
virtual_text = false,
|
||||
}
|
||||
)
|
||||
|
||||
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
|
||||
for name, server_opt in pairs(opts.servers) do
|
||||
local on_attach = function(client, bufnr)
|
||||
for bind, settings in pairs(opts.mappings) do
|
||||
vim.keymap.set('n', bind, settings[1], vim.tbl_deep_extend("force", settings[2], { buffer = bufnr }))
|
||||
end
|
||||
|
||||
-- Add format on save if configured and client supports it.
|
||||
if server_opt.format_on_save and client.supports_method("textDocument/formatting") then
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function()
|
||||
vim.lsp.buf.format()
|
||||
end,
|
||||
})
|
||||
end
|
||||
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
|
||||
|
||||
if server_opt.on_save then
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = server_opt.on_save,
|
||||
})
|
||||
end
|
||||
-- Add format on save if configured and client supports it.
|
||||
if server_opt.format_on_save and client.supports_method("textDocument/formatting") then
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function()
|
||||
vim.lsp.buf.format()
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
||||
vim.api.nvim_create_autocmd("CursorHold", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function() vim.lsp.buf.document_highlight() end
|
||||
})
|
||||
if server_opt.on_save then
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = server_opt.on_save,
|
||||
})
|
||||
end
|
||||
|
||||
vim.api.nvim_create_autocmd("CursorHoldI", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function() vim.lsp.buf.document_highlight() end
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("CursorMoved", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function() vim.lsp.buf.clear_references() end
|
||||
})
|
||||
end
|
||||
if client.supports_method("textDocument/documentHighlight") then
|
||||
vim.api.nvim_create_autocmd("CursorHold", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function() vim.lsp.buf.document_highlight() end
|
||||
})
|
||||
|
||||
lspconfig[name].setup({
|
||||
settings = server_opt.settings or {},
|
||||
capabilities = capabilities,
|
||||
on_attach = on_attach
|
||||
})
|
||||
end
|
||||
end
|
||||
vim.api.nvim_create_autocmd("CursorHoldI", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function() vim.lsp.buf.document_highlight() end
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("CursorMoved", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function() vim.lsp.buf.clear_references() end
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
lspconfig[name].setup({
|
||||
settings = server_opt.settings or {},
|
||||
capabilities = capabilities,
|
||||
on_attach = on_attach
|
||||
})
|
||||
end
|
||||
end
|
||||
}
|
||||
|
|
|
|||
4
nvim/lua/plugins/ide/neodev.lua
Normal file
4
nvim/lua/plugins/ide/neodev.lua
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
return {
|
||||
"folke/neodev.nvim",
|
||||
opts = {}
|
||||
}
|
||||
8
nvim/lua/plugins/ide/trouble.lua
Normal file
8
nvim/lua/plugins/ide/trouble.lua
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
local conf = require("config.plugins.trouble") or {}
|
||||
|
||||
return {
|
||||
"folke/trouble.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
keys = conf.keys or {},
|
||||
opts = conf.opts or {},
|
||||
}
|
||||
6
nvim/lua/plugins/ide/undotree.lua
Normal file
6
nvim/lua/plugins/ide/undotree.lua
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
return {
|
||||
"mbbill/undotree",
|
||||
keys = {
|
||||
{"<leader>u", ":UndotreeToggle<CR>", desc = "Toggle undotree"},
|
||||
},
|
||||
}
|
||||
|
|
@ -1,62 +1,63 @@
|
|||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
local opts = {
|
||||
dev = {
|
||||
path = "~/code/nvim_plugins",
|
||||
}
|
||||
dev = {
|
||||
path = "~/code/nvim_plugins",
|
||||
}
|
||||
}
|
||||
|
||||
require("lazy").setup({
|
||||
|
||||
-- Core
|
||||
-----------------------------
|
||||
{ import = "plugins.core.treesitter" },
|
||||
{ import = "plugins.core.autopairs" },
|
||||
{ import = "plugins.core.autotag" },
|
||||
{ import = "plugins.core.indent-blankline" },
|
||||
-- Core
|
||||
-----------------------------
|
||||
{ import = "plugins.core.treesitter" },
|
||||
{ import = "plugins.core.autopairs" },
|
||||
{ import = "plugins.core.autotag" },
|
||||
{ import = "plugins.core.indent-blankline" },
|
||||
|
||||
-- Editor
|
||||
-----------------------------
|
||||
{ import = "plugins.editor.mini-comment" },
|
||||
{ import = "plugins.editor.telescope" },
|
||||
-- Editor
|
||||
-----------------------------
|
||||
{ import = "plugins.editor.mini-comment" },
|
||||
{ import = "plugins.editor.telescope" },
|
||||
|
||||
-- UI
|
||||
-----------------------------
|
||||
{ import = "plugins.ui.dressing" },
|
||||
{ import = "plugins.ui.edgy" },
|
||||
{ import = "plugins.ui.noice" },
|
||||
{ import = "plugins.ui.dashboard" },
|
||||
{ import = "plugins.ui.catppuccin" },
|
||||
{ import = "plugins.ui.neo-tree" },
|
||||
{ import = "plugins.ui.bufferline" },
|
||||
{ import = "plugins.ui.lualine" },
|
||||
{ import = "plugins.ui.gitsigns" },
|
||||
{ import = "plugins.ui.which-key" },
|
||||
-- UI
|
||||
-----------------------------
|
||||
{ import = "plugins.ui.catppuccin" },
|
||||
{ import = "plugins.ui.dressing" },
|
||||
{ import = "plugins.ui.edgy" },
|
||||
{ import = "plugins.ui.dashboard" },
|
||||
{ import = "plugins.ui.neo-tree" },
|
||||
{ import = "plugins.ui.bufferline" },
|
||||
{ import = "plugins.ui.lualine" },
|
||||
{ import = "plugins.ui.gitsigns" },
|
||||
{ import = "plugins.ui.which-key" },
|
||||
|
||||
-- IDE
|
||||
-----------------------------
|
||||
{ import = "plugins.ide.conform" },
|
||||
{ import = "plugins.ide.cmp" },
|
||||
{ import = "plugins.ide.lsp" },
|
||||
{ import = "plugins.ide.dap" },
|
||||
{ import = "plugins.ide.neotest" },
|
||||
{ import = "plugins.ide.copilot" },
|
||||
-- IDE
|
||||
-----------------------------
|
||||
{ import = "plugins.ide.trouble" },
|
||||
{ import = "plugins.ide.undotree" },
|
||||
{ import = "plugins.ide.conform" },
|
||||
{ import = "plugins.ide.cmp" },
|
||||
{ import = "plugins.ide.lsp" },
|
||||
{ import = "plugins.ide.dap" },
|
||||
{ import = "plugins.ide.neotest" },
|
||||
{ import = "plugins.ide.neodev" },
|
||||
{ import = "plugins.ide.copilot" },
|
||||
|
||||
-- Language specific
|
||||
-----------------------------
|
||||
{ import = "plugins.lang.laravel" },
|
||||
{ import = "plugins.lang.go" },
|
||||
-- Language specific
|
||||
-----------------------------
|
||||
{ import = "plugins.lang.laravel" },
|
||||
{ import = "plugins.lang.go" },
|
||||
|
||||
}, opts)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
return {
|
||||
"ray-x/go.nvim",
|
||||
main = "go",
|
||||
dependencies = {
|
||||
"ray-x/guihua.lua",
|
||||
"neovim/nvim-lspconfig",
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
},
|
||||
config = function(opts)
|
||||
require('go').setup(opts)
|
||||
end,
|
||||
event = {"CmdlineEnter"},
|
||||
ft = {"go", 'gomod'},
|
||||
build = ':lua require("go.install").update_all_sync()'
|
||||
"ray-x/go.nvim",
|
||||
main = "go",
|
||||
dependencies = {
|
||||
"ray-x/guihua.lua",
|
||||
"neovim/nvim-lspconfig",
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
},
|
||||
config = function(opts)
|
||||
require('go').setup(opts)
|
||||
end,
|
||||
event = { "CmdlineEnter" },
|
||||
ft = { "go", 'gomod' },
|
||||
build = ':lua require("go.install").update_all_sync()'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,26 @@
|
|||
return {
|
||||
"adalessa/laravel.nvim",
|
||||
dependencies = {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
"tpope/vim-dotenv",
|
||||
"MunifTanjim/nui.nvim",
|
||||
"nvimtools/none-ls.nvim",
|
||||
},
|
||||
ft = "php",
|
||||
cmd = { "Sail", "Artisan", "Composer", "Npm", "Yarn", "Laravel" },
|
||||
config = function (_, _)
|
||||
local opts = require('config.plugins.laravel')
|
||||
"adalessa/laravel.nvim",
|
||||
dependencies = {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
"tpope/vim-dotenv",
|
||||
"MunifTanjim/nui.nvim",
|
||||
"nvimtools/none-ls.nvim",
|
||||
},
|
||||
ft = "php",
|
||||
cmd = { "Sail", "Artisan", "Composer", "Npm", "Yarn", "Laravel" },
|
||||
config = function(_, _)
|
||||
local opts = require('config.plugins.laravel')
|
||||
|
||||
local haswk, wk = pcall(require, "which-key")
|
||||
local haswk, wk = pcall(require, "which-key")
|
||||
|
||||
if haswk then
|
||||
wk.register({l = {name = "laravel" }}, { prefix = "<leader>" })
|
||||
end
|
||||
if haswk then
|
||||
wk.register({ l = { name = "laravel" } }, { prefix = "<leader>" })
|
||||
end
|
||||
|
||||
for key, value in pairs(opts.keys) do
|
||||
vim.keymap.set("n", key, value[1], { desc = value[2] or ''})
|
||||
end
|
||||
for key, value in pairs(opts.keys) do
|
||||
vim.keymap.set("n", key, value[1], { desc = value[2] or '' })
|
||||
end
|
||||
|
||||
require('laravel').setup(opts)
|
||||
end
|
||||
require('laravel').setup(opts)
|
||||
end
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
local icons = require('config.icons')
|
||||
|
||||
return {
|
||||
'romgrk/barbar.nvim',
|
||||
dependencies = {
|
||||
'lewis6991/gitsigns.nvim',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
init = function() vim.g.barbar_auto_setup = false end,
|
||||
opts = {
|
||||
animation = false,
|
||||
auto_hide = 0,
|
||||
focus_on_close = 'previous',
|
||||
button = icons.close,
|
||||
highlight_inactive_file_icons = true,
|
||||
icons = {
|
||||
separator = {left = '', right = ''},
|
||||
separator_at_end = false,
|
||||
inactive = { button = '', separator = { left = '', right = ''} },
|
||||
modified = {button = icons.gitsigns.modified },
|
||||
pinned = {button = icons.pinned, filename = true},
|
||||
gitsigns = {
|
||||
added = { enabled = false },
|
||||
changed = { enabled = false },
|
||||
deleted = { enabled = false },
|
||||
}
|
||||
},
|
||||
maximum_padding = 2,
|
||||
minimum_padding = 1,
|
||||
sidebar_filetypes = {
|
||||
--['neo-tree'] = {event = 'BufWipeout'},
|
||||
}
|
||||
},
|
||||
'romgrk/barbar.nvim',
|
||||
dependencies = {
|
||||
'lewis6991/gitsigns.nvim',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
init = function() vim.g.barbar_auto_setup = false end,
|
||||
opts = {
|
||||
animation = false,
|
||||
auto_hide = 0,
|
||||
focus_on_close = 'previous',
|
||||
button = icons.close,
|
||||
highlight_inactive_file_icons = true,
|
||||
icons = {
|
||||
separator = { left = '', right = '' },
|
||||
separator_at_end = false,
|
||||
inactive = { button = '', separator = { left = '', right = '' } },
|
||||
modified = { button = icons.gitsigns.modified },
|
||||
pinned = { button = icons.pinned, filename = true },
|
||||
gitsigns = {
|
||||
added = { enabled = false },
|
||||
changed = { enabled = false },
|
||||
deleted = { enabled = false },
|
||||
}
|
||||
},
|
||||
maximum_padding = 2,
|
||||
minimum_padding = 1,
|
||||
sidebar_filetypes = {
|
||||
--['neo-tree'] = {event = 'BufWipeout'},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
return {
|
||||
'akinsho/bufferline.nvim',
|
||||
version = "*",
|
||||
dependencies = 'nvim-tree/nvim-web-devicons',
|
||||
opts = require('config.plugins.bufferline')
|
||||
'akinsho/bufferline.nvim',
|
||||
version = "*",
|
||||
dependencies = 'nvim-tree/nvim-web-devicons',
|
||||
opts = require('config.plugins.bufferline')
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
return {
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000,
|
||||
opts = require('config.plugins.catppuccin'),
|
||||
config = function (_, opts)
|
||||
require("catppuccin").setup(opts)
|
||||
vim.cmd.colorscheme("catppuccin")
|
||||
end
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000,
|
||||
opts = require('config.plugins.catppuccin'),
|
||||
config = function(_, opts)
|
||||
require("catppuccin").setup(opts)
|
||||
vim.cmd.colorscheme("catppuccin")
|
||||
end
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,91 +2,91 @@ return {
|
|||
"navarasu/onedark.nvim",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
opts = {
|
||||
style = 'darker',
|
||||
code_style = {
|
||||
comments = 'none',
|
||||
keywords = 'none',
|
||||
functions = 'none',
|
||||
strings = 'none',
|
||||
variables = 'none'
|
||||
},
|
||||
colors = {
|
||||
fg = '#b3b1b1',
|
||||
bg0 = '#171b26',
|
||||
bg1 = '#30323b',
|
||||
bg2 = '#24262f',
|
||||
bg3 = '#383a43',
|
||||
bg_d = "#1f2129",
|
||||
bg_blue = "#ff00ff",
|
||||
bg_yellow = "#f0d197",
|
||||
red = '#cc4a33',
|
||||
green = '#51cc7f',
|
||||
yellow = '#ccaf33',
|
||||
orange = '#ccab1f',
|
||||
blue = '#3390cc',
|
||||
cyan = '#33ccb7',
|
||||
purple = '#9233cc',
|
||||
dark_cyan = "#8abeb7",
|
||||
dark_red = "#cc817f",
|
||||
dark_yellow = "#ffcc99",
|
||||
dark_purple = "#9999cc",
|
||||
},
|
||||
highlights = {
|
||||
LineNr = { fg = "$light_grey" },
|
||||
CursorLineNr = { fg = "$blue" },
|
||||
|
||||
Pmenu = { bg = "$bg2"},
|
||||
PmenuSel = { bg = "$bg_d", fg = "$fg" },
|
||||
FloatBorder = { fg = "$grey", bg = 'None' },
|
||||
-- Syntax
|
||||
["@comment"] = { fg = "$red" },
|
||||
["@string"] = { fg = "$purple" },
|
||||
["@function"] = { fg = "$fg" },
|
||||
["@keyword"] = { fg = "$yellow" },
|
||||
["@keyword.import"] = { fg = "$yellow" },
|
||||
["@keyword.function"] = { fg = "$yellow" },
|
||||
["@keyword.conditional"] = { fg = "$yellow" },
|
||||
["@keyword.operator"] = { fg = "$yellow" },
|
||||
["@keyword.repeat"] = { fg = "$yellow" },
|
||||
["@constant"] = { fg = "$green" },
|
||||
["@tag"] = { fg = "$yellow" },
|
||||
["@tag.delimiter"] = { fg = "$yellow" },
|
||||
["@tag.attribute"] = { fg = "$yellow" },
|
||||
["@type"] = { fg = "$blue" },
|
||||
["@type.qualifier"] = { fg = "$yellow" },
|
||||
["@type.definition"] = { fg = "$blue" },
|
||||
["@type.builtin"] = { fg = "$blue" },
|
||||
["@function.method"] = { fg = "$fg" },
|
||||
["@function.call"] = { fg = "$fg" },
|
||||
["@function.builtin"] = { fg = "$fg" },
|
||||
|
||||
["@number"] = { fg = "$red" },
|
||||
["@variable"] = { fg = "$green" },
|
||||
["@variable.member"] = { fg = "$green" },
|
||||
["@variable.builtin"] = { fg = "$green" },
|
||||
["@variable.parameter"] = { fg = "$fg" },
|
||||
["@property"] = { fg = "$orange" },
|
||||
-- ["@property"] = { fg = "$fg" },
|
||||
["@punctuation.delimiter"] = { fg = "$fg" },
|
||||
["@punctuation.bracket"] = { fg = "$fg" },
|
||||
["@module"] = { fg = "$fg" },
|
||||
|
||||
-- php overrides
|
||||
["@class_name.php"] = { fg = "$fg" },
|
||||
["@extend_name.php"] = { fg = "$fg" },
|
||||
["@implements_name.php"] = { fg = "$fg" },
|
||||
["@namespace_name.php"] = { fg = "$fg" },
|
||||
["@namespace_alias.php"] = { fg = "$fg" },
|
||||
}
|
||||
},
|
||||
opts = {
|
||||
style = 'deep',
|
||||
code_style = {
|
||||
comments = 'none',
|
||||
keywords = 'none',
|
||||
functions = 'none',
|
||||
strings = 'none',
|
||||
variables = 'none'
|
||||
},
|
||||
-- colors = {
|
||||
-- fg = '#b3b1b1',
|
||||
-- bg0 = '#171b26',
|
||||
-- bg1 = '#30323b',
|
||||
-- bg2 = '#24262f',
|
||||
-- bg3 = '#383a43',
|
||||
-- bg_d = "#1f2129",
|
||||
-- bg_blue = "#ff00ff",
|
||||
-- bg_yellow = "#f0d197",
|
||||
-- red = '#cc4a33',
|
||||
-- green = '#51cc7f',
|
||||
-- yellow = '#ccaf33',
|
||||
-- orange = '#ccab1f',
|
||||
-- -- blue = '#3390cc',
|
||||
-- cyan = '#33ccb7',
|
||||
-- purple = '#9233cc',
|
||||
-- dark_cyan = "#8abeb7",
|
||||
-- dark_red = "#cc817f",
|
||||
-- dark_yellow = "#ffcc99",
|
||||
-- dark_purple = "#9999cc",
|
||||
-- },
|
||||
-- highlights = {
|
||||
-- LineNr = { fg = "$light_grey" },
|
||||
-- CursorLineNr = { fg = "$blue" },
|
||||
--
|
||||
-- Pmenu = { bg = "$bg2" },
|
||||
-- PmenuSel = { bg = "$bg_d", fg = "$fg" },
|
||||
-- FloatBorder = { fg = "$grey", bg = 'None' },
|
||||
-- -- Syntax
|
||||
-- ["@comment"] = { fg = "$red" },
|
||||
-- ["@string"] = { fg = "$purple" },
|
||||
-- ["@function"] = { fg = "$fg" },
|
||||
-- ["@keyword"] = { fg = "$yellow" },
|
||||
-- ["@keyword.import"] = { fg = "$yellow" },
|
||||
-- ["@keyword.function"] = { fg = "$yellow" },
|
||||
-- ["@keyword.conditional"] = { fg = "$yellow" },
|
||||
-- ["@keyword.operator"] = { fg = "$yellow" },
|
||||
-- ["@keyword.repeat"] = { fg = "$yellow" },
|
||||
-- ["@constant"] = { fg = "$green" },
|
||||
-- ["@tag"] = { fg = "$yellow" },
|
||||
-- ["@tag.delimiter"] = { fg = "$yellow" },
|
||||
-- ["@tag.attribute"] = { fg = "$yellow" },
|
||||
-- ["@type"] = { fg = "$blue" },
|
||||
-- ["@type.qualifier"] = { fg = "$yellow" },
|
||||
-- ["@type.definition"] = { fg = "$blue" },
|
||||
-- ["@type.builtin"] = { fg = "$blue" },
|
||||
-- ["@function.method"] = { fg = "$fg" },
|
||||
-- ["@function.call"] = { fg = "$fg" },
|
||||
-- ["@function.builtin"] = { fg = "$fg" },
|
||||
--
|
||||
-- ["@number"] = { fg = "$red" },
|
||||
-- ["@variable"] = { fg = "$green" },
|
||||
-- ["@variable.member"] = { fg = "$green" },
|
||||
-- ["@variable.builtin"] = { fg = "$green" },
|
||||
-- ["@variable.parameter"] = { fg = "$fg" },
|
||||
-- ["@property"] = { fg = "$orange" },
|
||||
-- -- ["@property"] = { fg = "$fg" },
|
||||
-- ["@punctuation.delimiter"] = { fg = "$fg" },
|
||||
-- ["@punctuation.bracket"] = { fg = "$fg" },
|
||||
-- ["@module"] = { fg = "$fg" },
|
||||
--
|
||||
-- -- php overrides
|
||||
-- ["@class_name.php"] = { fg = "$fg" },
|
||||
-- ["@extend_name.php"] = { fg = "$fg" },
|
||||
-- ["@implements_name.php"] = { fg = "$fg" },
|
||||
-- ["@namespace_name.php"] = { fg = "$fg" },
|
||||
-- ["@namespace_alias.php"] = { fg = "$fg" },
|
||||
-- }
|
||||
},
|
||||
config = function(_, opts)
|
||||
local c = require('onedark')
|
||||
c.setup(opts)
|
||||
c.load()
|
||||
local c = require('onedark')
|
||||
c.setup(opts)
|
||||
c.load()
|
||||
|
||||
vim.cmd(string.format("highlight GitSignsAdd guifg='%s'", opts.colors.green))
|
||||
vim.cmd(string.format("highlight GitSignsChange guifg='%s'", opts.colors.yellow))
|
||||
vim.cmd(string.format("highlight GitSignsDelete guifg='%s'", opts.colors.red))
|
||||
end
|
||||
-- vim.cmd(string.format("highlight GitSignsAdd guifg='%s'", opts.colors.green))
|
||||
-- vim.cmd(string.format("highlight GitSignsChange guifg='%s'", opts.colors.yellow))
|
||||
-- vim.cmd(string.format("highlight GitSignsDelete guifg='%s'", opts.colors.red))
|
||||
end
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
|
||||
local logo = [[
|
||||
::::::::: :::: ::: ::: :::
|
||||
:+: :+: :+:+: :+: :+: :+:
|
||||
+:+ +:+ :+:+:+ +:+ +:+ +:+
|
||||
+#++:++#+ +#+ +:+ +#+ +#++:+
|
||||
+#+ +#+ +#+#+# +#+ +#+
|
||||
+:+ +:+ :+:+:+ +:+ +:+ +:+
|
||||
+#++:++#+ +#+ +:+ +#+ +#++:+
|
||||
+#+ +#+ +#+#+# +#+ +#+
|
||||
#+# #+# #+#+# #+# #+#
|
||||
### ### #### ### ###
|
||||
]]
|
||||
|
|
@ -12,31 +11,30 @@ local logo = [[
|
|||
logo = string.rep("\n", 8) .. logo .. "\n\n"
|
||||
|
||||
return {
|
||||
'nvimdev/dashboard-nvim',
|
||||
name = 'dashboard',
|
||||
dependencies = {
|
||||
'nvim-tree/nvim-web-devicons'
|
||||
},
|
||||
event = 'VimEnter',
|
||||
opts = {
|
||||
theme = 'doom',
|
||||
config = {
|
||||
header = vim.split(logo, "\n"),
|
||||
'nvimdev/dashboard-nvim',
|
||||
name = 'dashboard',
|
||||
dependencies = {
|
||||
'nvim-tree/nvim-web-devicons'
|
||||
},
|
||||
event = 'VimEnter',
|
||||
opts = {
|
||||
theme = 'doom',
|
||||
config = {
|
||||
header = vim.split(logo, "\n"),
|
||||
|
||||
center = {
|
||||
{ action = function() require('telescope.builtin').find_files() end, desc = " Find file", icon = " ", key = "f" },
|
||||
{ action = "ene | startinsert", desc = " New file", icon = " ", key = "n" },
|
||||
{ action = function() require('telescope.builtin').oldfiles() end, desc = " Recent files", icon = " ", key = "r" },
|
||||
{ action = function() require('telescope.builtin').live_grep() end, desc = " Find text", icon = " ", key = "g" },
|
||||
{ action = "Lazy", desc = " Lazy", icon = " ", key = "l" },
|
||||
{ action = "qa", desc = " Quit", icon = " ", key = "q" }
|
||||
},
|
||||
footer = function()
|
||||
local stats = require("lazy").stats()
|
||||
local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
|
||||
return { "Loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms .. "ms" }
|
||||
end,
|
||||
}
|
||||
}
|
||||
center = {
|
||||
{ action = function() require('telescope.builtin').find_files() end, desc = " Find file", icon = " ", key = "f" },
|
||||
{ action = "ene | startinsert", desc = " New file", icon = " ", key = "n" },
|
||||
{ action = function() require('telescope.builtin').oldfiles() end, desc = " Recent files", icon = " ", key = "r" },
|
||||
{ action = function() require('telescope.builtin').live_grep() end, desc = " Find text", icon = " ", key = "g" },
|
||||
{ action = "Lazy", desc = " Lazy", icon = " ", key = "l" },
|
||||
{ action = "qa", desc = " Quit", icon = " ", key = "q" }
|
||||
},
|
||||
footer = function()
|
||||
local stats = require("lazy").stats()
|
||||
local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
|
||||
return { "Loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms .. "ms" }
|
||||
end,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
return {
|
||||
'stevearc/dressing.nvim',
|
||||
opts = {
|
||||
input = {
|
||||
title_pos = "center",
|
||||
border = "single",
|
||||
relative = "win",
|
||||
},
|
||||
select = {
|
||||
backend = { "telescope", "builtin" },
|
||||
telescope = require('telescope.themes').get_dropdown({
|
||||
borderchars = {
|
||||
prompt = { "─", "│", "─", "│", "┌", "┐", "┘", "└" },
|
||||
results = { "─", "│", "─", "│", "├", "┤", "┘", "└" },
|
||||
},
|
||||
max_height = 5
|
||||
}),
|
||||
builtin = {
|
||||
border = "single",
|
||||
}
|
||||
}
|
||||
},
|
||||
'stevearc/dressing.nvim',
|
||||
opts = {
|
||||
input = {
|
||||
title_pos = "center",
|
||||
border = "single",
|
||||
relative = "win",
|
||||
},
|
||||
select = {
|
||||
backend = { "telescope", "builtin" },
|
||||
telescope = require('telescope.themes').get_dropdown({
|
||||
borderchars = {
|
||||
prompt = { "─", "│", "─", "│", "┌", "┐", "┘", "└" },
|
||||
results = { "─", "│", "─", "│", "├", "┤", "┘", "└" },
|
||||
},
|
||||
max_height = 5
|
||||
}),
|
||||
builtin = {
|
||||
border = "single",
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,33 @@
|
|||
return {
|
||||
"folke/edgy.nvim",
|
||||
event = "VeryLazy",
|
||||
keys = {
|
||||
{ "<leader>ue", function() require("edgy").toggle() end, desc = "Edgy Toggle" },
|
||||
-- stylua: ignore
|
||||
{ "<leader>uE", function() require("edgy").select() end, desc = "Edgy Select Window" },
|
||||
},
|
||||
opts = {
|
||||
left = {
|
||||
{
|
||||
title = "Neo-Tree",
|
||||
ft = "neo-tree",
|
||||
filter = function(buf)
|
||||
return vim.b[buf].neo_tree_source == "filesystem"
|
||||
end,
|
||||
size = { height = 0.5 },
|
||||
},
|
||||
{
|
||||
title = "Test",
|
||||
ft = "neotest-summary"
|
||||
},
|
||||
"neo-tree",
|
||||
},
|
||||
options = {
|
||||
left = { size = 40 }
|
||||
},
|
||||
animate = {
|
||||
enabled = false,
|
||||
},
|
||||
exit_when_last = false
|
||||
}
|
||||
"folke/edgy.nvim",
|
||||
event = "VeryLazy",
|
||||
keys = {
|
||||
{ "<leader>ue", function() require("edgy").toggle() end, desc = "Edgy Toggle" },
|
||||
-- stylua: ignore
|
||||
{ "<leader>uE", function() require("edgy").select() end, desc = "Edgy Select Window" },
|
||||
},
|
||||
opts = {
|
||||
left = {
|
||||
{
|
||||
title = "Neo-Tree",
|
||||
ft = "neo-tree",
|
||||
filter = function(buf)
|
||||
return vim.b[buf].neo_tree_source == "filesystem"
|
||||
end,
|
||||
size = { height = 0.5 },
|
||||
},
|
||||
{
|
||||
title = "Test",
|
||||
ft = "neotest-summary"
|
||||
},
|
||||
"neo-tree",
|
||||
},
|
||||
options = {
|
||||
left = { size = 40 }
|
||||
},
|
||||
animate = {
|
||||
enabled = false,
|
||||
},
|
||||
exit_when_last = false
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
local icons = require('config.icons').diff_gutter
|
||||
|
||||
return {
|
||||
'lewis6991/gitsigns.nvim',
|
||||
dependencies = {
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
optional = true,
|
||||
opts = {
|
||||
defaults = {
|
||||
["<leader>g"] = { name = "+git" },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
lazy = false,
|
||||
keys = {
|
||||
{ '<leader>gp', '<cmd>Gitsigns preview_hunk<cr>', desc = 'Git preview diff' },
|
||||
{ '<leader>gb', '<cmd>Gitsigns blame_line<cr>', desc = 'Git blame' }
|
||||
},
|
||||
opts = {
|
||||
signs = {
|
||||
add = { text = icons.add },
|
||||
delete = { text = icons.delete },
|
||||
change = { text = icons.change },
|
||||
untracked = { text = icons.untracked },
|
||||
topdelete = { text = icons.delete },
|
||||
changedelete = { text = icons.change },
|
||||
},
|
||||
},
|
||||
'lewis6991/gitsigns.nvim',
|
||||
dependencies = {
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
optional = true,
|
||||
opts = {
|
||||
defaults = {
|
||||
["<leader>g"] = { name = "+git" },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
lazy = false,
|
||||
keys = {
|
||||
{ '<leader>gp', '<cmd>Gitsigns preview_hunk<cr>', desc = 'Git preview diff' },
|
||||
{ '<leader>gb', '<cmd>Gitsigns blame_line<cr>', desc = 'Git blame' }
|
||||
},
|
||||
opts = {
|
||||
signs = {
|
||||
add = { text = icons.add },
|
||||
delete = { text = icons.delete },
|
||||
change = { text = icons.change },
|
||||
untracked = { text = icons.untracked },
|
||||
topdelete = { text = icons.delete },
|
||||
changedelete = { text = icons.change },
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,66 +1,9 @@
|
|||
local icons = require('config.icons')
|
||||
|
||||
return {
|
||||
'nvim-lualine/lualine.nvim',
|
||||
event = "VeryLazy",
|
||||
dependencies = {
|
||||
'arkav/lualine-lsp-progress',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
opts = {
|
||||
options = {
|
||||
theme = "catppuccin-mocha",
|
||||
component_separators = '',
|
||||
globalstatus = true,
|
||||
section_separators = { left = '', right = '' },
|
||||
disabled_filetypes = {
|
||||
statusline = {
|
||||
'dashboard',
|
||||
'TelescopePrompt'
|
||||
}
|
||||
}
|
||||
},
|
||||
sections = {
|
||||
lualine_a = { "mode" },
|
||||
lualine_b = { "branch" },
|
||||
lualine_c = {
|
||||
{
|
||||
"diagnostics",
|
||||
symbols = {
|
||||
error = icons.diagnostics.error .. ' ',
|
||||
warn = icons.diagnostics.warn .. ' ',
|
||||
info = icons.diagnostics.info .. ' ',
|
||||
hint = icons.diagnostics.hint .. ' ',
|
||||
},
|
||||
}
|
||||
},
|
||||
lualine_x = {
|
||||
{
|
||||
require("lazy.status").updates,
|
||||
cond = require("lazy.status").has_updates,
|
||||
color = { fg = "#ff9e64" },
|
||||
},
|
||||
-- {
|
||||
-- "diff",
|
||||
-- symbols = {
|
||||
-- added = icons.diff.added .. ' ',
|
||||
-- modified = icons.diff.modified .. ' ',
|
||||
-- removed = icons.diff.removed .. ' '
|
||||
-- }
|
||||
-- },
|
||||
'filename'
|
||||
},
|
||||
lualine_y = {
|
||||
'encoding',
|
||||
'fileformat',
|
||||
'filetype',
|
||||
'location'
|
||||
},
|
||||
lualine_z = {}
|
||||
},
|
||||
extensions = {
|
||||
'lazy',
|
||||
'neo-tree'
|
||||
}
|
||||
}
|
||||
'nvim-lualine/lualine.nvim',
|
||||
event = "VeryLazy",
|
||||
dependencies = {
|
||||
'arkav/lualine-lsp-progress',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
opts = require("config.plugins.lualine")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ return {
|
|||
'nvim-neo-tree/neo-tree.nvim',
|
||||
cmd = 'Neotree',
|
||||
keys = {
|
||||
{ '<leader>fe', ':Neotree reveal toggle<CR>', desc = 'Toggle File Explorer'},
|
||||
{ '<leader>Fe', ':Neotree reveal toggle<CR>', desc = 'Toggle File Explorer'},
|
||||
},
|
||||
dependencies = {
|
||||
"MunifTanjim/nui.nvim",
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
return {
|
||||
"folke/noice.nvim",
|
||||
event = "VeryLazy",
|
||||
dependencies = {
|
||||
"MunifTanjim/nui.nvim",
|
||||
},
|
||||
opts = {
|
||||
cmdline = {
|
||||
enabled = true,
|
||||
view = "cmdline"
|
||||
},
|
||||
presets = {
|
||||
bottom_search = true,
|
||||
command_palette = false
|
||||
},
|
||||
commands = {
|
||||
history = {
|
||||
view = "cmdline_output",
|
||||
}
|
||||
},
|
||||
views = {
|
||||
mini = {
|
||||
position = {
|
||||
row = -2,
|
||||
},
|
||||
border = {
|
||||
style = 'solid',
|
||||
padding = { 0, 1 },
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
@ -1,15 +1,14 @@
|
|||
return {
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
init = function()
|
||||
vim.o.timeout = true
|
||||
vim.o.timeoutlen = 300
|
||||
end,
|
||||
opts = require('config.plugins.which-key'),
|
||||
config = function(_, opts)
|
||||
local wk = require("which-key")
|
||||
wk.setup(opts)
|
||||
wk.register(opts.defaults or {})
|
||||
end
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
init = function()
|
||||
vim.o.timeout = true
|
||||
vim.o.timeoutlen = 300
|
||||
end,
|
||||
opts = require('config.plugins.which-key'),
|
||||
config = function(_, opts)
|
||||
local wk = require("which-key")
|
||||
wk.setup(opts)
|
||||
wk.register(opts.defaults or {})
|
||||
end
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue