mirror of
https://github.com/pnx/dotfiles
synced 2026-06-17 03:30:01 +02:00
new nvim config
This commit is contained in:
parent
4b730d3924
commit
7388c9bfd3
78 changed files with 1291 additions and 43 deletions
6
nvim/lua/config/autocmd.lua
Normal file
6
nvim/lua/config/autocmd.lua
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
local autocmd = vim.api.nvim_create_autocmd
|
||||
|
||||
-- Remove all trailing whitespaces on save
|
||||
autocmd('BufWritePre', {
|
||||
command = [[:exe 'norm m`' | %s/\s\+$//eg | norm ``]]
|
||||
})
|
||||
|
|
@ -6,26 +6,29 @@ return function()
|
|||
local selectPrev = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert })
|
||||
local selectNext = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert })
|
||||
|
||||
local borderstyle = {
|
||||
local windowstyle = {
|
||||
border = "none",
|
||||
winhighlight = 'Normal:Pmenu,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None',
|
||||
}
|
||||
|
||||
return {
|
||||
preselect = false,
|
||||
completion = {
|
||||
completeopt = "menuone,longest,noinsert,preview"
|
||||
},
|
||||
view = {
|
||||
entries = { name = 'custom', selection_order = 'near_cursor' },
|
||||
},
|
||||
window = {
|
||||
documentation = borderstyle,
|
||||
completion = borderstyle
|
||||
documentation = windowstyle,
|
||||
completion = windowstyle
|
||||
},
|
||||
mapping = {
|
||||
["<Up>"] = selectPrev,
|
||||
["<S-Tab>"] = selectPrev,
|
||||
["<Down>"] = selectNext,
|
||||
["<Tab>"] = selectNext,
|
||||
["<S-c>"] = cmp.mapping.abort(),
|
||||
["<C-c>"] = cmp.mapping.abort(),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||
},
|
||||
snippet = {
|
||||
|
|
@ -44,7 +47,6 @@ return function()
|
|||
}),
|
||||
},
|
||||
sources = {
|
||||
{ name = "copilot" },
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'buffer' },
|
||||
{ name = 'path' },
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
-- Nice command that creates all directores in the path
|
||||
-- then creates the file and opens it.
|
||||
local createfile = function(opts)
|
||||
local dir = vim.fs.dirname(opts.fargs[1])
|
||||
vim.cmd(string.format("!mkdir -p %s\n !touch %s", dir, opts.fargs[1]))
|
||||
vim.cmd.e(opts.fargs)
|
||||
end
|
||||
|
||||
|
||||
vim.api.nvim_create_user_command('CreateFile', createfile, { nargs = 1, complete = "file" })
|
||||
vim.cmd("ca cf CreateFile")
|
||||
12
nvim/lua/config/conform.lua
Normal file
12
nvim/lua/config/conform.lua
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
return {
|
||||
format_options = {
|
||||
async = true,
|
||||
lsp_fallback = true,
|
||||
},
|
||||
notify_on_error = true,
|
||||
formatters_by_ft = {
|
||||
blade = { "blade-formatter" },
|
||||
lua = { "stylua" },
|
||||
["_"] = { "prettier" }
|
||||
}
|
||||
}
|
||||
12
nvim/lua/config/gitsigns.lua
Normal file
12
nvim/lua/config/gitsigns.lua
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
local icons = require('config.icons').diff_gutter
|
||||
|
||||
return {
|
||||
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 },
|
||||
},
|
||||
}
|
||||
|
|
@ -6,6 +6,11 @@ return {
|
|||
modified = '',
|
||||
pinned = '',
|
||||
separator = '│',
|
||||
fold = {
|
||||
open = '',
|
||||
close = '',
|
||||
sep = ' ',
|
||||
},
|
||||
tree = {
|
||||
node = '│',
|
||||
nodelast = '└',
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
-- config
|
||||
require("config.commands")
|
||||
require("config.settings")
|
||||
require("config.mappings")
|
||||
require("config.filetype")
|
||||
135
nvim/lua/config/keymaps.lua
Normal file
135
nvim/lua/config/keymaps.lua
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
local cmd = vim.cmd
|
||||
|
||||
return {
|
||||
leader = " ",
|
||||
|
||||
--
|
||||
-- Global keymaps! Alot of stuff "borrowed" from thePrimeagen
|
||||
--
|
||||
global = {
|
||||
|
||||
--
|
||||
-- Navigation
|
||||
--
|
||||
|
||||
-- Make half page jumps stay in the center of screen
|
||||
{ "n", "<C-u>", "<C-u>zz", { silent = true, desc = "jump half a page up" } },
|
||||
{ "n", "<C-d>", "<C-d>zz", { silent = true, desc = "jump half a page down" } },
|
||||
{ "n", "<S-PageUp>", "<C-u>zz", { silent = true, desc = "jump half a page up" } },
|
||||
{ "n", "<S-PageDown>", "<C-d>zz", { silent = true, desc = "jump half a page down" } },
|
||||
|
||||
-- Split windows
|
||||
{ "n", "<C-h>", "<C-w>h", { silent = true, desc = "Goto left split" } },
|
||||
{ "n", "<C-j>", "<C-w>j", { silent = true, desc = "Goto down split" } },
|
||||
{ "n", "<C-k>", "<C-w>k", { silent = true, desc = "Goto up split" } },
|
||||
{ "n", "<C-l>", "<C-w>l", { silent = true, desc = "Goto right split" } },
|
||||
|
||||
-- Make jump to next search item stay in the center of screen.
|
||||
{ "n", "n", "nzzzv", { silent = true, desc = "jump to next search match" } },
|
||||
{ "n", "N", "Nzzzv", { silent = true, desc = "jump to previous search match" } },
|
||||
|
||||
-- Ctrl+s saves the current buffer in normal/insert mode.
|
||||
{ { "n", "i" }, "<C-s>", cmd.w, { desc = "save current buffer" } },
|
||||
|
||||
-- Move text
|
||||
{ "n", "<S-a>", ":m -2<CR>v=", { silent = true, desc = "move current line one line up" } },
|
||||
{ "n", "<S-d>", ":m +1<CR>v=", { silent = true, desc = "move current line one line down" } },
|
||||
{ "v", "<S-a>", ":m '<-2<CR>gv=gv", { silent = true, desc = "move current selection one line up" } },
|
||||
{ "v", "<S-d>", ":m '>+1<CR>gv=gv", { silent = true, desc = "move current selection one line down" } },
|
||||
|
||||
-- copy/paste
|
||||
{ "x", "<leader>p", [["_dP]],
|
||||
{ silent = true, desc = "Paste over selected text without losing content in \"-register" } },
|
||||
{ { "n", "v" }, "<leader>y", [["+y]], { desc = "Yank to system clipboard register" } },
|
||||
{ { "n", "v" }, "<leader>p", [["+p]], { desc = "Paste from system clipboard register" } },
|
||||
|
||||
-- File operations
|
||||
{ "n", "<leader>Fe", "<cmd>Ex<CR>", { silent = true, desc = "Open Netrw" } },
|
||||
{ "n", "<leader>Fc", ":CreateFile ", { silent = true, desc = "Create new file" } },
|
||||
{ "n", "<leader>Fx", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Set execute flag on current file" } },
|
||||
|
||||
-- buffers
|
||||
{ "n", "<leader>bn", cmd.bn, { silent = true, desc = "Move to next buffer" } },
|
||||
{ "n", "<leader>bb", cmd.bp, { silent = true, desc = "Move to previous buffer" } },
|
||||
{ "n", "<leader>bd", cmd.bd, { silent = true, desc = "Close current buffer" } },
|
||||
{ "n", "<leader>bc", "<cmd>BufferLineCloseOthers<cr>", { silent = true, desc = "Close all other buffers" } },
|
||||
{ "n", "<leader>bD", "<cmd>%bd<cr>", { silent = true, desc = "Close all buffers" } },
|
||||
|
||||
-- Indent
|
||||
{ 'n', "<Tab>", "^=$" },
|
||||
{ 'x', "<Tab>", "=", { desc = "auto indent selection" } },
|
||||
{ "i", "<S-Tab>", "<C-d>", { desc = "delete indent" } },
|
||||
|
||||
{ 'n', "<leader>fs", [[:%s/\s\+$//g<CR>`']], desc = "Remove trailing spaces" },
|
||||
|
||||
-- fix paste
|
||||
-- {'n', "p", "p=$"},
|
||||
|
||||
-- Crazy search+replace
|
||||
{ "n", "<leader>rw", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
|
||||
{ desc = "search+replace word under cursor" } },
|
||||
|
||||
{ { "x" }, "<leader>fhx", [[:s/\(\x\{2\}\)/0x\1, /g]], { desc = "Format hex" } },
|
||||
{ { "x" }, "<leader>fha", [[:s/0x\(\x\{1\}\X\)/0x0\1/g]], { desc = "Format each hex number to be 2 characters long" } },
|
||||
{ { "x" }, "<leader>fhn", [[:s/\(\(0x\x\{1,2\}, \)\{8\}\)/\1\r/g]], { desc = "Format hex with 8 bytes per row" } },
|
||||
-- {{"x"}, "<leader>hb", [[:'<,'>s/\(\x\{2\}\)/0x\1, /g<cr>]], { desc = "Format a hex string to byte array"}},
|
||||
|
||||
-- diagnostics
|
||||
{ "n", "<leader>do", vim.diagnostic.open_float, { desc = "Open diagnostics" } },
|
||||
{ "n", "<leader>dn", vim.diagnostic.get_next, { desc = "Goto next" } },
|
||||
{ "n", "<leader>dp", vim.diagnostic.get_prev, { desc = "Goto previous" } },
|
||||
|
||||
-- TMux
|
||||
{ "n", "<leader>m", ":terminal tmuxs<cr>i", { desc = "Open tmux manager" } },
|
||||
|
||||
|
||||
{ "n", "Q", "<nop>" },
|
||||
|
||||
},
|
||||
whichkey = {
|
||||
mode = { "n", "v" },
|
||||
["<leader>r"] = { name = "+Rename" },
|
||||
["<leader>b"] = { name = "+Buffers" },
|
||||
["<leader>f"] = { name = "+Format" },
|
||||
["<leader>F"] = { name = "+Files" },
|
||||
["<leader>d"] = { name = "+Diagnostics" },
|
||||
["<leader>s"] = { name = "+Search" },
|
||||
["<leader>g"] = { name = "+Git" },
|
||||
},
|
||||
oil = {
|
||||
{ '<leader>.', function() require('oil').open_float() end, { desc = "Open parent directory" } }
|
||||
},
|
||||
conform = {
|
||||
{ '<leader>ff', "<cmd>Format<cr>", desc = 'Format file' },
|
||||
{ '<leader>ff', "<cmd>Format<cr>", mode = 'x', desc = 'Format selection' },
|
||||
},
|
||||
gitsigns = {
|
||||
{ '<leader>gp', '<cmd>Gitsigns preview_hunk<cr>', desc = 'Git preview diff' },
|
||||
{ '<leader>gb', '<cmd>Gitsigns blame_line<cr>', desc = 'Git blame' }
|
||||
},
|
||||
-- Keybinds for buffers with an LSP client attached
|
||||
lsp = {
|
||||
{ 'K', function() vim.lsp.buf.hover() end, desc = '' },
|
||||
{ '<leader>ca', function() vim.lsp.buf.code_action() end, desc = 'Code action' },
|
||||
{ '<leader>rs', function() vim.lsp.buf.rename() end, desc = 'Rename symbol' },
|
||||
{ '<leader>sr', '<cmd>Telescope lsp_references<cr>', desc = 'Search Reference' },
|
||||
{ '<leader>ss', '<cmd>Telescope lsp_document_symbols<cr>', desc = 'Search document symbols' },
|
||||
{ '<leader>sr', '<cmd>Telescope lsp_references<cr>', desc = 'Search Reference' },
|
||||
{ '<leader>si', '<cmd>Telescope lsp_implementations<cr>', desc = 'Search Inplementations' },
|
||||
{ '<leader>sp', '<cmd>Telescope lsp_workspace_symbols<cr>', desc = 'Search Workspace symbols' },
|
||||
{ 'go', '<cmd>Telescope lsp_type_definitions<cr>', desc = "Goto type definition" },
|
||||
{ 'gd', '<cmd>Telescope lsp_definitions<cr>', desc = 'Goto definition' },
|
||||
},
|
||||
telescope = {
|
||||
{ '<leader>sf', '<cmd>Telescope find_files<cr>', desc = 'Search files' },
|
||||
{ '<leader>sF', '<cmd>lua require("telescope.builtin").find_files({no_ignore=true})<cr>', desc = 'Search all files' },
|
||||
{ '<leader>sb', '<cmd>Telescope buffers<cr>', desc = 'Search buffers' },
|
||||
{ '<leader>sa', '<cmd>Telescope live_grep<cr>', desc = 'Search in files' },
|
||||
{ '<leader>sg', '<cmd>Telescope git_files<cr>', desc = 'Search Git files' },
|
||||
{ '<leader>so', '<cmd>Telescope oldfiles<cr>', desc = 'Search Old files' },
|
||||
{ '<leader>sw', '<cmd>Telescope grep_string<cr>', desc = 'Search for word under cursor' },
|
||||
{ '<leader>sd', '<cmd>Telescope diagnostics<cr>', desc = 'Search Diagnostics' },
|
||||
{ '<leader>sq', '<cmd>Telescope quickfix<cr>', desc = 'Search Quickfix' },
|
||||
{ '<leader>sh', '<cmd>Telescope help<cr>', desc = 'Search Neovim help' },
|
||||
},
|
||||
}
|
||||
|
|
@ -1,13 +1,4 @@
|
|||
return {
|
||||
mappings = {
|
||||
["<leader>rs"] = { vim.lsp.buf.rename, { desc = "Rename symbol" } },
|
||||
["<leader>ca"] = { vim.lsp.buf.code_action, { desc = "Code action" } },
|
||||
["<leader>ff"] = { vim.lsp.buf.format, { desc = "Format file" } },
|
||||
K = { vim.lsp.buf.hover, { desc = "Hover" } },
|
||||
gd = { vim.lsp.buf.definition, { desc = "Goto definition" } },
|
||||
gi = { vim.lsp.buf.implementation, { desc = "Goto implementation" } },
|
||||
gr = { vim.lsp.buf.references, { desc = "Goto references" } },
|
||||
},
|
||||
servers = {
|
||||
-- PHP
|
||||
phpactor = {
|
||||
|
|
@ -28,7 +19,6 @@ return {
|
|||
tailwindcss = {},
|
||||
-- GO
|
||||
gopls = {
|
||||
-- format_on_save = true,
|
||||
on_save = function()
|
||||
local params = vim.lsp.util.make_range_params()
|
||||
params.context = { only = { "source.organizeImports" } }
|
||||
|
|
@ -56,6 +46,7 @@ return {
|
|||
},
|
||||
-- Lua
|
||||
lua_ls = {
|
||||
cmd = {"/opt/luals/bin/lua-language-server", "--logpath=~/.local/luals/logs"},
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
--
|
||||
-- Keymaps! Alot of stuff "borrowed" from thePrimeagen
|
||||
--
|
||||
local map = vim.keymap.set
|
||||
local cmd = vim.cmd
|
||||
|
||||
vim.g.mapleader = " "
|
||||
|
||||
-- Make half page jumps stay in the center of screen
|
||||
map("n", "<C-u>", "<C-u>zz", { silent = true, desc = "jump half a page up" })
|
||||
map("n", "<C-d>", "<C-d>zz", { silent = true, desc = "jump half a page down" })
|
||||
map("n", "<S-PageUp>", "<C-u>zz", { silent = true, desc = "jump half a page up" })
|
||||
map("n", "<S-PageDown>", "<C-d>zz", { silent = true, desc = "jump half a page down" })
|
||||
-- Make jump to next search item stay in the center of screen.
|
||||
map("n", "n", "nzzzv", { silent = true, desc = "jump to next search match" })
|
||||
map("n", "N", "Nzzzv", { silent = true, desc = "jump to previous search match" })
|
||||
|
||||
-- Ctrl+s saves the current buffer in normal/insert mode.
|
||||
map({ "n", "i" }, "<C-s>", cmd.w, { desc = "save current buffer" })
|
||||
|
||||
-- Move text
|
||||
map("n", "<S-a>", ":m -2<CR>v=", { silent = true, desc = "move current line one line up" })
|
||||
map("n", "<S-d>", ":m +1<CR>v=", { silent = true, desc = "move current line one line down" })
|
||||
map("v", "<S-a>", ":m '<-2<CR>gv=gv", { silent = true, desc = "move current selection one line up" })
|
||||
map("v", "<S-d>", ":m '>+1<CR>gv=gv", { silent = true, desc = "move current selection one line down" })
|
||||
|
||||
-- copy/paste
|
||||
map("x", "<leader>p", [["_dP]],
|
||||
{ silent = true, desc = "Paste over selected text without losing content in \"-register" })
|
||||
map({ "n", "v" }, "<leader>y", [["+y]], { desc = "Yank to system clipboard register" })
|
||||
map({ "n", "v" }, "<leader>p", [["+p]], { desc = "Paste from system clipboard register" })
|
||||
|
||||
-- File operations
|
||||
map("n", "<leader>Fc", ":CreateFile ", { silent = true, desc = "Create new file" })
|
||||
map("n", "<leader>Fx", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Set execute flag on current file" })
|
||||
|
||||
-- buffers
|
||||
map("n", "<leader>bn", cmd.bn, { silent = true, desc = "Move to next buffer" })
|
||||
map("n", "<leader>bb", cmd.bp, { silent = true, desc = "Move to previous buffer" })
|
||||
map("n", "<leader>bd", cmd.bd, { silent = true, desc = "Close current buffer" })
|
||||
map("n", "<leader>bc", "<cmd>BufferLineCloseOthers<cr>", { silent = true, desc = "Close all other buffers" })
|
||||
map("n", "<leader>bD", "<cmd>%bd<cr>", { silent = true, desc = "Close all buffers" })
|
||||
|
||||
-- Indent
|
||||
map('n', "<Tab>", "^=$")
|
||||
map('x', "<Tab>", "=", { desc = "auto indent selection" })
|
||||
map("i", "<S-Tab>", "<C-d>", { desc = "delete indent" })
|
||||
|
||||
-- fix paste
|
||||
-- map('n', "p", "p=$")
|
||||
|
||||
-- Crazy search+replace
|
||||
map("n", "<leader>rw", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], {
|
||||
desc = "search+replace word under cursor"
|
||||
})
|
||||
|
||||
map({ "x" }, "<leader>fhx", [[:s/\(\x\{2\}\)/0x\1, /g]], { desc = "Format hex" })
|
||||
map({ "x" }, "<leader>fha", [[:s/0x\(\x\{1\}\X\)/0x0\1/g]], { desc = "Format each hex number to be 2 characters long" })
|
||||
map({ "x" }, "<leader>fhn", [[:s/\(\(0x\x\{1,2\}, \)\{8\}\)/\1\r/g]], { desc = "Format hex with 8 bytes per row" })
|
||||
-- map({"x"}, "<leader>hb", [[:'<,'>s/\(\x\{2\}\)/0x\1, /g<cr>]], { desc = "Format a hex string to byte array"})
|
||||
|
||||
-- diagnostics
|
||||
map("n", "<leader>do", vim.diagnostic.open_float, { desc = "Open diagnostics" })
|
||||
map("n", "<leader>dn", vim.diagnostic.get_next, { desc = "Goto next" })
|
||||
map("n", "<leader>dp", vim.diagnostic.get_prev, { desc = "Goto previous" })
|
||||
|
||||
-- TMux
|
||||
map("n", "<leader>m", ":terminal tmuxs<cr>i", { desc = "Open tmux manager" })
|
||||
|
||||
|
||||
map("n", "Q", "<nop>")
|
||||
12
nvim/lua/config/oil.lua
Normal file
12
nvim/lua/config/oil.lua
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
return {
|
||||
float = {
|
||||
-- Padding around the floating window
|
||||
padding = 2,
|
||||
max_width = 200,
|
||||
max_height = 30,
|
||||
border = "single",
|
||||
win_options = {
|
||||
winblend = 0,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
local set = vim.opt
|
||||
|
||||
local icons = require('config.icons')
|
||||
|
||||
--
|
||||
-- General Settings
|
||||
|
|
@ -14,12 +14,21 @@ set.showmode = false -- disable mode in the command line, because i use lualine
|
|||
-- Editor settings
|
||||
--
|
||||
|
||||
|
||||
set.wrap = false -- Disable line wrap
|
||||
set.pumheight = 20
|
||||
set.laststatus = 3
|
||||
set.splitkeep = "screen"
|
||||
set.scrolloff = 20
|
||||
|
||||
set.fillchars = {
|
||||
foldopen = icons.fold.open,
|
||||
foldclose = icons.fold.close,
|
||||
fold = " ",
|
||||
foldsep = icons.fold.sep,
|
||||
diff = " ",
|
||||
eob = " ",
|
||||
}
|
||||
|
||||
-- mouse and cursor
|
||||
set.cursorline = true
|
||||
set.mousemoveevent = true
|
||||
|
|
@ -35,11 +44,8 @@ set.number = true
|
|||
set.relativenumber = true
|
||||
set.numberwidth = 5
|
||||
|
||||
-- sign column to the right.
|
||||
--set.statuscolumn = '%=%{v:relnum?v:relnum:v:lnum} %s '
|
||||
|
||||
-- sign column to the left
|
||||
set.statuscolumn = '%s %=%{v:relnum?v:relnum:v:lnum} '
|
||||
set.statuscolumn = '%s %=%{v:relnum?v:relnum:v:lnum} │ '
|
||||
|
||||
-- indent
|
||||
set.expandtab = true
|
||||
|
|
@ -49,32 +55,26 @@ set.shiftwidth = 4
|
|||
set.autoindent = true
|
||||
set.smartindent = true
|
||||
|
||||
-- Folding
|
||||
--set.foldenable = true
|
||||
--set.foldmethod = "expr"
|
||||
--set.foldexpr = "nvim_treesitter#foldexpr()"
|
||||
|
||||
--vim.api.nvim_create_autocmd('BufReadPost,FileReadPost', {
|
||||
-- pattern = '*',
|
||||
-- cmd = 'normal zR',
|
||||
--})
|
||||
--
|
||||
|
||||
-- Completion
|
||||
set.completeopt = "menuone,longest,preview"
|
||||
|
||||
-- set.completeopt = "menuone,longest,preview"
|
||||
|
||||
-- folds
|
||||
set.foldenable = true
|
||||
set.foldlevel = 99
|
||||
set.foldmethod = "expr"
|
||||
set.foldexpr = "nvim_treesitter#foldexpr()"
|
||||
set.foldcolumn = "auto"
|
||||
|
||||
--
|
||||
-- Diagnostics
|
||||
--
|
||||
|
||||
|
||||
local icons = require('config.icons').diagnostics
|
||||
vim.fn.sign_define('DiagnosticSignError', { text = icons.error, texthl = 'DiagnosticSignError' })
|
||||
vim.fn.sign_define('DiagnosticSignWarn', { text = icons.warn, texthl = 'DiagnosticSignWarn' })
|
||||
vim.fn.sign_define('DiagnosticSignInfo', { text = icons.info, texthl = 'DiagnosticSignInfo' })
|
||||
vim.fn.sign_define('DiagnosticSignHint', { text = icons.hint, texthl = 'DiagnosticSignHint' })
|
||||
|
||||
vim.fn.sign_define('DiagnosticSignError', { text = icons.diagnostics.error, texthl = 'DiagnosticSignError' })
|
||||
vim.fn.sign_define('DiagnosticSignWarn', { text = icons.diagnostics.warn, texthl = 'DiagnosticSignWarn' })
|
||||
vim.fn.sign_define('DiagnosticSignInfo', { text = icons.diagnostics.info, texthl = 'DiagnosticSignInfo' })
|
||||
vim.fn.sign_define('DiagnosticSignHint', { text = icons.diagnostics.hint, texthl = 'DiagnosticSignHint' })
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false,
|
||||
|
|
@ -91,6 +91,6 @@ vim.api.nvim_create_autocmd('TextYankPost', {
|
|||
desc = 'Hightlight selection on yank',
|
||||
pattern = '*',
|
||||
callback = function()
|
||||
vim.highlight.on_yank { higroup = 'IncSearch', timeout = 200 }
|
||||
vim.highlight.on_yank { higroup = 'IncSearch', timeout = 400 }
|
||||
end,
|
||||
})
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
local icons = require('config.icons')
|
||||
|
||||
return function()
|
||||
local highlightfunc = require("catppuccin.groups.integrations.bufferline")
|
||||
return {
|
||||
highlights = highlightfunc.get(),
|
||||
options = {
|
||||
mode = "buffers",
|
||||
themable = true,
|
||||
buffer_close_icon = icons.close,
|
||||
close_icon = icons.close,
|
||||
modified_icon = icons.modified,
|
||||
diagnostics = false,
|
||||
enforce_regular_tabs = true,
|
||||
indicator = {
|
||||
icon = "",
|
||||
},
|
||||
close_command = function(bufnum)
|
||||
vim.cmd("bprev")
|
||||
vim.api.nvim_buf_delete(bufnum, {})
|
||||
end,
|
||||
hover = {
|
||||
enabled = true,
|
||||
delay = 200,
|
||||
reveal = { 'close' }
|
||||
},
|
||||
offsets = {
|
||||
{
|
||||
filetype = "neo-tree",
|
||||
text = "File Explorer",
|
||||
text_align = "left"
|
||||
}
|
||||
},
|
||||
custom_areas = {
|
||||
left = function()
|
||||
return {
|
||||
{
|
||||
text = " ",
|
||||
fg = "#8fff6d",
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
}
|
||||
}
|
||||
end
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
return {
|
||||
options = {
|
||||
custom_commentstring = function() return vim.bo.commentstring end
|
||||
},
|
||||
mappings = {
|
||||
-- Toggle comment (like `gcip` - comment inner paragraph) for both
|
||||
-- Normal and Visual modes
|
||||
comment = '<leader>/',
|
||||
|
||||
-- Toggle comment on current line
|
||||
comment_line = '<leader>//',
|
||||
|
||||
-- Toggle comment on visual selection
|
||||
comment_visual = '<leader>/',
|
||||
|
||||
-- Define 'comment' textobject (like `dg/` - delete whole comment block)
|
||||
-- Works also in Visual mode if mapping differs from `comment_visual`
|
||||
textobject = 'g/',
|
||||
}
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
return {
|
||||
keys = {
|
||||
{ '<leader>ff', "<cmd>Format<cr>", desc = 'Format file' },
|
||||
{ '<leader>ff', "<cmd>Format<cr>", mode = 'x', desc = 'Format selection' },
|
||||
},
|
||||
opts = {
|
||||
format_options = {
|
||||
async = true,
|
||||
lsp_fallback = true,
|
||||
},
|
||||
notify_on_error = true,
|
||||
formatters_by_ft = {
|
||||
blade = { "blade-formatter" },
|
||||
lua = { "stylua" },
|
||||
["_"] = { "prettier" }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
return {
|
||||
keys = {
|
||||
["<leader>la"] = { "<cmd>Laravel artisan<cr>", "Run artisan" },
|
||||
["<leader>lm"] = { "<cmd>Laravel make<cr>", "Make" },
|
||||
["<leader>lr"] = { "<cmd>Laravel routes<cr>", "Search routes" },
|
||||
["<leader>lR"] = { "<cmd>Laravel related<cr>", "Related" },
|
||||
["<leader>lv"] = { "<cmd>Laravel view-finder<cr>", "View finder" },
|
||||
},
|
||||
}
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
local icons = require('config.icons')
|
||||
|
||||
return {
|
||||
close_if_last_window = false,
|
||||
hide_root_node = true,
|
||||
default_component_configs = {
|
||||
indent = {
|
||||
indent_size = 2,
|
||||
padding = 1,
|
||||
-- indent guides
|
||||
with_markers = true,
|
||||
indent_marker = icons.tree.node,
|
||||
last_indent_marker = icons.tree.nodelast,
|
||||
},
|
||||
icon = {
|
||||
folder_open = icons.folder.open,
|
||||
folder_close = icons.folder.close,
|
||||
folder_empty = icons.folder.empty,
|
||||
default = icons.files.text,
|
||||
},
|
||||
name = {
|
||||
use_git_status_colors = false,
|
||||
},
|
||||
git_status = {
|
||||
symbols = icons.gitsigns
|
||||
},
|
||||
file_size = {
|
||||
enabled = false,
|
||||
},
|
||||
type = {
|
||||
enabled = false,
|
||||
},
|
||||
last_modified = {
|
||||
enabled = false,
|
||||
},
|
||||
created = {
|
||||
enabled = false,
|
||||
},
|
||||
symlink_target = {
|
||||
enabled = true,
|
||||
},
|
||||
},
|
||||
event_handlers = {
|
||||
{
|
||||
event = "neo_tree_buffer_enter",
|
||||
handler = function()
|
||||
if vim.bo.filetype == "neo-tree" then
|
||||
vim.cmd("setlocal statuscolumn=")
|
||||
end
|
||||
end,
|
||||
}
|
||||
},
|
||||
filesystem = {
|
||||
filtered_items = {
|
||||
visible = true, -- when true, they will just be displayed differently than normal items
|
||||
hide_dotfiles = true,
|
||||
hide_gitignored = true,
|
||||
hide_hidden = true, -- only works on Windows for hidden files/directories
|
||||
hide_by_name = {
|
||||
"node_modules",
|
||||
"vendor",
|
||||
},
|
||||
},
|
||||
follow_current_file = {
|
||||
enabled = true,
|
||||
},
|
||||
use_libuv_file_watcher = true,
|
||||
}
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
local icons = require('config.icons')
|
||||
|
||||
return {
|
||||
key_groups = {
|
||||
["<leader>s"] = { name = "+search" },
|
||||
},
|
||||
keys = {
|
||||
{ '<leader>sf', '<cmd>Telescope find_files<cr>', desc = 'Search files' },
|
||||
{ '<leader>sa', '<cmd>Telescope live_grep<cr>', desc = 'Search in files' },
|
||||
{ '<leader>sg', '<cmd>Telescope git_files<cr>', desc = 'Search Git files' },
|
||||
{ '<leader>so', '<cmd>Telescope oldfiles<cr>', desc = 'Search Old files' },
|
||||
{ '<leader>sw', '<cmd>Telescope grep_string<cr>', desc = 'Search for word under cursor' },
|
||||
{ '<leader>sd', '<cmd>Telescope diagnostics<cr>', desc = 'Search Diagnostics' },
|
||||
{ '<leader>sq', '<cmd>Telescope quickfix<cr>', desc = 'Search Quickfix' },
|
||||
{ '<leader>sh', '<cmd>Telescope help<cr>', desc = 'Search Neovim help' },
|
||||
-- LSP
|
||||
{ '<leader>sr', '<cmd>Telescope lsp_references<cr>', desc = 'Search Reference' },
|
||||
{ '<leader>ss', '<cmd>Telescope lsp_document_symbols<cr>', desc = 'Search document symbols' },
|
||||
{ '<leader>sr', '<cmd>Telescope lsp_references<cr>', desc = 'Search Reference' },
|
||||
{ '<leader>si', '<cmd>Telescope lsp_implementations<cr>', desc = 'Search Inplementations' },
|
||||
{ '<leader>sp', '<cmd>Telescope lsp_workspace_symbols<cr>', desc = 'Search Workspace symbols' },
|
||||
{ 'gd', '<cmd>Telescope lsp_definitions<cr>', desc = 'Goto definition' },
|
||||
},
|
||||
opts = function()
|
||||
local actions = require("telescope.actions")
|
||||
return {
|
||||
defaults = {
|
||||
path_display = { truncate = 1 },
|
||||
prompt_prefix = ' ',
|
||||
selection_caret = icons.current .. ' ',
|
||||
multi_icon = icons.selected .. ' ',
|
||||
file_ignore_patterns = {
|
||||
".git/",
|
||||
"node_modules/"
|
||||
},
|
||||
mappings = {
|
||||
i = {
|
||||
["<esc>"] = actions.close
|
||||
}
|
||||
}
|
||||
},
|
||||
pickers = {
|
||||
find_files = {
|
||||
hidden = true
|
||||
}
|
||||
}
|
||||
}
|
||||
end,
|
||||
}
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
return {
|
||||
keys = {
|
||||
{ "<leader>xx", function() require("trouble").toggle() end },
|
||||
{ "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end },
|
||||
{ "<leader>xd", function() require("trouble").toggle("document_diagnostics") end },
|
||||
{ "<leader>xq", function() require("trouble").toggle("quickfix") end },
|
||||
{ "<leader>xl", function() require("trouble").toggle("loclist") end },
|
||||
{ "gR", function() require("trouble").toggle("lsp_references") end },
|
||||
},
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
return {
|
||||
defaults = {
|
||||
mode = { "n", "v" },
|
||||
["<leader>r"] = { name = "+rename" },
|
||||
["<leader>b"] = { name = "+buffers" },
|
||||
["<leader>f"] = { name = "+format" },
|
||||
["<leader>F"] = { name = "+files" },
|
||||
["<leader>d"] = { name = "+diagnostics" }
|
||||
}
|
||||
}
|
||||
37
nvim/lua/config/telescope.lua
Normal file
37
nvim/lua/config/telescope.lua
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
local icons = require('config.icons')
|
||||
|
||||
return function()
|
||||
local actions = require("telescope.actions")
|
||||
return {
|
||||
defaults = {
|
||||
border = {
|
||||
prompt = { 1, 1, 1, 1 },
|
||||
results = { 1, 1, 1, 1 },
|
||||
preview = { 1, 1, 1, 1 },
|
||||
},
|
||||
path_display = { truncate = 1 },
|
||||
prompt_prefix = ' ',
|
||||
selection_caret = icons.current .. ' ',
|
||||
multi_icon = icons.selected .. ' ',
|
||||
file_ignore_patterns = {
|
||||
".git/",
|
||||
"node_modules/"
|
||||
},
|
||||
mappings = {
|
||||
i = {
|
||||
["<esc>"] = actions.close
|
||||
}
|
||||
}
|
||||
},
|
||||
pickers = {
|
||||
find_files = {
|
||||
hidden = true
|
||||
}
|
||||
},
|
||||
extensions = {
|
||||
["ui-select"] = {
|
||||
require("telescope.themes").get_dropdown()
|
||||
}
|
||||
}
|
||||
}
|
||||
end
|
||||
187
nvim/lua/plugins/core.lua
Normal file
187
nvim/lua/plugins/core.lua
Normal file
|
|
@ -0,0 +1,187 @@
|
|||
local keys = require('config.keymaps')
|
||||
|
||||
return {
|
||||
-- colorscheme
|
||||
{
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000,
|
||||
config = function()
|
||||
require("catppuccin").setup(require('config.colorscheme'))
|
||||
vim.cmd.colorscheme("catppuccin")
|
||||
end
|
||||
},
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
init = function()
|
||||
vim.o.timeout = true
|
||||
vim.o.timeoutlen = 300
|
||||
end,
|
||||
opts = function() return {
|
||||
defaults = keys.whichkey
|
||||
} end,
|
||||
config = function(_, opts)
|
||||
local wk = require("which-key")
|
||||
wk.setup(opts)
|
||||
wk.register(opts.defaults or {})
|
||||
end
|
||||
},
|
||||
{
|
||||
'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.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',
|
||||
}
|
||||
|
||||
require("nvim-treesitter.configs").setup(opts)
|
||||
end,
|
||||
},
|
||||
{
|
||||
'windwp/nvim-autopairs',
|
||||
event = "InsertEnter",
|
||||
config = true
|
||||
},
|
||||
{
|
||||
"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',
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"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)
|
||||
|
||||
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
|
||||
},
|
||||
-- Git stuff
|
||||
{
|
||||
'lewis6991/gitsigns.nvim',
|
||||
dependencies = {
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
optional = true,
|
||||
opts = {
|
||||
defaults = {
|
||||
["<leader>g"] = { name = "+git" },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
lazy = false,
|
||||
keys = keys.gitsigns or {},
|
||||
opts = require('config.gitsigns')
|
||||
|
||||
},
|
||||
{
|
||||
'nvim-lualine/lualine.nvim',
|
||||
event = "VeryLazy",
|
||||
dependencies = {
|
||||
'arkav/lualine-lsp-progress',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
opts = require("config.lualine")
|
||||
},
|
||||
{
|
||||
'nvim-telescope/telescope.nvim',
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
'sharkdp/fd',
|
||||
'nvim-telescope/telescope-ui-select.nvim',
|
||||
},
|
||||
keys = keys.telescope,
|
||||
opts = require('config.telescope'),
|
||||
config = function (_, opts)
|
||||
local telescope = require("telescope")
|
||||
|
||||
telescope.setup(opts)
|
||||
for name, _ in pairs(opts.extensions or {}) do
|
||||
telescope.load_extension(name)
|
||||
end
|
||||
end,
|
||||
},
|
||||
{
|
||||
'stevearc/conform.nvim',
|
||||
keys = keys.conform or {},
|
||||
opts = require('config.conform'),
|
||||
config = function(_, opts)
|
||||
vim.api.nvim_create_user_command("Format", function(args)
|
||||
local range = nil
|
||||
if args.count ~= -1 then
|
||||
local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
|
||||
range = {
|
||||
start = { args.line1, 0 },
|
||||
["end"] = { args.line2, end_line:len() },
|
||||
}
|
||||
end
|
||||
require("conform").format({ async = true, lsp_fallback = true, range = range })
|
||||
end, { range = true })
|
||||
|
||||
require('conform').setup(opts)
|
||||
end,
|
||||
},
|
||||
{
|
||||
'stevearc/oil.nvim',
|
||||
keys = keys.oil or {},
|
||||
opts = require('config.oil'),
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
return {
|
||||
'windwp/nvim-autopairs',
|
||||
event = "InsertEnter",
|
||||
config = true
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
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',
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
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)
|
||||
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
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
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()
|
||||
|
||||
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,
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
return {
|
||||
'echasnovski/mini.comment',
|
||||
version = '*',
|
||||
opts = require('config.plugins.comment')
|
||||
}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
local config = require('config.plugins.telescope')
|
||||
|
||||
return {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
main = 'telescope',
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
'sharkdp/fd',
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
optional = true,
|
||||
opts = {
|
||||
defaults = config.key_groups or {},
|
||||
},
|
||||
},
|
||||
},
|
||||
keys = config.keys or {},
|
||||
opts = config.opts or {},
|
||||
config = function (_, opts)
|
||||
local override = {
|
||||
border = {
|
||||
prompt = { 1, 1, 1, 1 },
|
||||
results = { 1, 1, 1, 1 },
|
||||
preview = { 1, 1, 1, 1 },
|
||||
},
|
||||
-- borderchars = {
|
||||
-- prompt = { "─", "│", "─", "│", "├", "┤", "┴", "└" },
|
||||
-- results = { "─", "│", " ", "│", "┌", "┬", "│", "│" },
|
||||
-- preview = { "─", "│", "─", " ", "─", "┐", "┘", "─" },
|
||||
-- },
|
||||
}
|
||||
|
||||
opts.defaults = vim.tbl_deep_extend("force", opts.defaults, override)
|
||||
|
||||
require('telescope').setup(opts)
|
||||
end
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
return {
|
||||
'hrsh7th/nvim-cmp',
|
||||
version = false,
|
||||
event = "InsertEnter",
|
||||
dependencies = {
|
||||
'hrsh7th/cmp-buffer',
|
||||
'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
'L3MON4D3/LuaSnip',
|
||||
'onsails/lspkind-nvim',
|
||||
},
|
||||
opts = require('config.plugins.cmp'),
|
||||
config = function(_, opts)
|
||||
local cmp = require('cmp')
|
||||
|
||||
cmp.setup(opts)
|
||||
|
||||
-- insert () on function completion using autopairs
|
||||
cmp.event:on(
|
||||
'confirm_done',
|
||||
require('nvim-autopairs.completion.cmp').on_confirm_done()
|
||||
)
|
||||
end
|
||||
}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
local config = require('config.plugins.conform')
|
||||
|
||||
return {
|
||||
'stevearc/conform.nvim',
|
||||
dependencies = {
|
||||
"williamboman/mason.nvim",
|
||||
"zapling/mason-conform.nvim"
|
||||
},
|
||||
cmd = { "ConformInfo", "Format" },
|
||||
keys = config.keys or {},
|
||||
opts = config.opts or {},
|
||||
config = function (_, opts)
|
||||
|
||||
-- Create command to format a buffer or range.
|
||||
vim.api.nvim_create_user_command("Format", function(args)
|
||||
local range = nil
|
||||
if args.count ~= -1 then
|
||||
local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
|
||||
range = {
|
||||
start = { args.line1, 0 },
|
||||
["end"] = { args.line2, end_line:len() },
|
||||
}
|
||||
end
|
||||
|
||||
local opt = opts.format_options
|
||||
if range ~= nil then
|
||||
opt = vim.tbl_deep_extend("force", opt, { range = range })
|
||||
end
|
||||
|
||||
require("conform").format(opt)
|
||||
end, { range = true })
|
||||
|
||||
require('conform').setup(opts)
|
||||
|
||||
-- setup mason-conform to autmagically install formatters.
|
||||
require('mason-conform').setup()
|
||||
end
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
return {
|
||||
"zbirenbaum/copilot.lua",
|
||||
cmd = "Copilot",
|
||||
event = "InsertEnter",
|
||||
opts = {
|
||||
suggestion = {
|
||||
enabled = true,
|
||||
auto_trigger = true,
|
||||
keymap = {
|
||||
accept = "<C-F>",
|
||||
},
|
||||
},
|
||||
panel = {
|
||||
enabled = true,
|
||||
auto_refresh = true,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
return {
|
||||
"mfussenegger/nvim-dap",
|
||||
dependencies = {
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
-- optional = true,
|
||||
opts = {
|
||||
defaults = {
|
||||
["<leader>D"] = { name = "+debug" },
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"rcarriga/nvim-dap-ui",
|
||||
-- stylua: ignore
|
||||
keys = {
|
||||
{ "<leader>Du", function() require("dapui").toggle({ }) end, desc = "Dap UI" },
|
||||
{ "<leader>De", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "v"} },
|
||||
},
|
||||
opts = {},
|
||||
config = function(_, opts)
|
||||
-- setup dap config by VsCode launch.json file
|
||||
-- require("dap.ext.vscode").load_launchjs()
|
||||
local dap = require("dap")
|
||||
local dapui = require("dapui")
|
||||
dapui.setup(opts)
|
||||
dap.listeners.after.event_initialized["dapui_config"] = function()
|
||||
dapui.open({})
|
||||
end
|
||||
dap.listeners.before.event_terminated["dapui_config"] = function()
|
||||
dapui.close({})
|
||||
end
|
||||
dap.listeners.before.event_exited["dapui_config"] = function()
|
||||
dapui.close({})
|
||||
end
|
||||
end,
|
||||
},
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>Dw", function() require("dap.ui.widgets").hover() end, desc = "Widgets" },
|
||||
{ "<leader>Db", function() require'dap'.toggle_breakpoint() end, desc = "Toggle breakpoint" },
|
||||
},
|
||||
config = function()
|
||||
vim.api.nvim_set_hl(0, "DapStoppedLine", { default = true, link = "Visual" })
|
||||
|
||||
local dap = require "dap"
|
||||
dap.adapters.delve = {
|
||||
type = 'server',
|
||||
port = '${port}',
|
||||
executable = {
|
||||
command = 'dlv',
|
||||
args = {'dap', '-l', '127.0.0.1:${port}'},
|
||||
}
|
||||
}
|
||||
|
||||
dap.configurations.go = {
|
||||
{
|
||||
type = "delve",
|
||||
name = "Debug",
|
||||
request = "launch",
|
||||
program = "${file}"
|
||||
},
|
||||
{
|
||||
type = "delve",
|
||||
name = "Debug test", -- configuration for debugging test files
|
||||
request = "launch",
|
||||
mode = "test",
|
||||
program = "${file}"
|
||||
},
|
||||
-- works with go.mod packages and sub packages
|
||||
{
|
||||
type = "delve",
|
||||
name = "Debug test (go.mod)",
|
||||
request = "launch",
|
||||
mode = "test",
|
||||
program = "./${relativeFileDirname}"
|
||||
}
|
||||
}
|
||||
-- local Config = require("lazyvim.config")
|
||||
|
||||
|
||||
-- for name, sign in pairs(Config.icons.dap) do
|
||||
-- sign = type(sign) == "table" and sign or { sign }
|
||||
-- vim.fn.sign_define(
|
||||
-- "Dap" .. name,
|
||||
-- { text = sign[1], texthl = sign[2] or "DiagnosticInfo", linehl = sign[3], numhl = sign[3] }
|
||||
-- )
|
||||
-- end
|
||||
end,
|
||||
}
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
return {
|
||||
'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/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
|
||||
focusable = true,
|
||||
style = "minimal",
|
||||
border = "single",
|
||||
})
|
||||
|
||||
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
|
||||
vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||
virtual_text = false,
|
||||
}
|
||||
)
|
||||
|
||||
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.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
|
||||
|
||||
-- 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
|
||||
|
||||
if server_opt.on_save then
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = server_opt.on_save,
|
||||
})
|
||||
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
|
||||
})
|
||||
|
||||
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
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
return {
|
||||
"folke/neodev.nvim",
|
||||
opts = {}
|
||||
}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
return {
|
||||
"nvim-neotest/neotest",
|
||||
dependencies = {
|
||||
"nvim-neotest/nvim-nio",
|
||||
"nvim-lua/plenary.nvim",
|
||||
"antoinemadec/FixCursorHold.nvim",
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
"nvim-neotest/neotest-go",
|
||||
"olimorris/neotest-phpunit",
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
optional = true,
|
||||
opts = {
|
||||
defaults = {
|
||||
["<leader>t"] = { name = "+test" },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
keys = {
|
||||
{"<leader>tn", ":lua require('neotest').run.run()<cr>", desc = "test nearest", silent = true},
|
||||
{"<leader>tf", ":lua require('neotest').run.run(vim.fn.expand('%'))<cr>", desc = "test file"},
|
||||
{"<leader>ta", ":lua require('neotest').output_panel.open()<cr>:lua require('neotest').run.run({suite = true})<cr>", desc = "test all"},
|
||||
{"<leader>ts", ":lua require('neotest').run.stop()<cr>", desc = "stop test"},
|
||||
{"<leader>tq", ":lua require('neotest').output_panel.close()<cr>", desc = "close output window"},
|
||||
{"<leader>te", ":Neotest summary<cr>", desc = "Open test explorer"}
|
||||
},
|
||||
opts = function()
|
||||
local icons = require('config.icons').test
|
||||
|
||||
return {
|
||||
adapters = {
|
||||
require("neotest-go")({
|
||||
recursive_run = true
|
||||
}),
|
||||
require("neotest-phpunit")
|
||||
},
|
||||
icons = {
|
||||
child_indent = "│",
|
||||
child_prefix = "├",
|
||||
collapsed = "─",
|
||||
expanded = "┐",
|
||||
failed = icons.failed,
|
||||
final_child_indent = " ",
|
||||
final_child_prefix = "└",
|
||||
non_collapsible = "─",
|
||||
passed = icons.ok,
|
||||
running = icons.running,
|
||||
skipped = icons.skipped,
|
||||
unknown = icons.unknown,
|
||||
watching = icons.watch
|
||||
},
|
||||
summery = {
|
||||
open = "botleft vsplit"
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
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 {},
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
return {
|
||||
"mbbill/undotree",
|
||||
keys = {
|
||||
{"<leader>u", ":UndotreeToggle<CR>", desc = "Toggle undotree"},
|
||||
},
|
||||
}
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
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,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
local opts = {
|
||||
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" },
|
||||
|
||||
-- Editor
|
||||
-----------------------------
|
||||
{ import = "plugins.editor.mini-comment" },
|
||||
{ import = "plugins.editor.telescope" },
|
||||
|
||||
-- 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.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" },
|
||||
|
||||
}, opts)
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
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()'
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
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')
|
||||
|
||||
local haswk, wk = pcall(require, "which-key")
|
||||
|
||||
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
|
||||
|
||||
require('laravel').setup(opts)
|
||||
end
|
||||
}
|
||||
64
nvim/lua/plugins/lsp.lua
Normal file
64
nvim/lua/plugins/lsp.lua
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
return {
|
||||
'VonHeikemen/lsp-zero.nvim',
|
||||
branch = 'v3.x',
|
||||
dependencies = {
|
||||
'neovim/nvim-lspconfig',
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
|
||||
-- completion
|
||||
{
|
||||
'hrsh7th/nvim-cmp',
|
||||
version = false,
|
||||
event = "InsertEnter",
|
||||
dependencies = {
|
||||
'hrsh7th/cmp-buffer',
|
||||
'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
'L3MON4D3/LuaSnip',
|
||||
'onsails/lspkind-nvim',
|
||||
},
|
||||
opts = require('config.cmp'),
|
||||
config = function(_, opts)
|
||||
local cmp = require('cmp')
|
||||
cmp.setup(opts)
|
||||
|
||||
-- insert () on function completion using autopairs
|
||||
cmp.event:on(
|
||||
'confirm_done',
|
||||
require('nvim-autopairs.completion.cmp').on_confirm_done()
|
||||
)
|
||||
end
|
||||
},
|
||||
},
|
||||
opts = require('config.lsp'),
|
||||
config = function(_, opts)
|
||||
local lsp_zero = require('lsp-zero')
|
||||
local lsp_config = require('lspconfig')
|
||||
local augroup = vim.api.nvim_create_augroup("Lsp", {})
|
||||
local map = require('utils.keys')
|
||||
|
||||
lsp_zero.on_attach(function(_, bufnr)
|
||||
for _, v in ipairs(require('config.keymaps').lsp or {}) do
|
||||
map(v, { buffer = bufnr })
|
||||
end
|
||||
end)
|
||||
|
||||
for name, server_opt in pairs(opts.servers) do
|
||||
local on_attach = function(_, bufnr)
|
||||
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
|
||||
end
|
||||
|
||||
server_opt = vim.tbl_deep_extend("force", {on_attach = on_attach}, server_opt or {})
|
||||
|
||||
lsp_config[name].setup(server_opt)
|
||||
end
|
||||
end,
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
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'},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
return {
|
||||
'akinsho/bufferline.nvim',
|
||||
version = "*",
|
||||
dependencies = 'nvim-tree/nvim-web-devicons',
|
||||
opts = require('config.plugins.bufferline')
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
return {
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000,
|
||||
opts = require('config.plugins.catppuccin'),
|
||||
config = function(_, opts)
|
||||
require("catppuccin").setup(opts)
|
||||
vim.cmd.colorscheme("catppuccin")
|
||||
end
|
||||
}
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
return {
|
||||
"navarasu/onedark.nvim",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
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()
|
||||
|
||||
-- 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,40 +0,0 @@
|
|||
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"),
|
||||
|
||||
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 +0,0 @@
|
|||
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",
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
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
|
||||
}
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
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 },
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
return {
|
||||
'nvim-lualine/lualine.nvim',
|
||||
event = "VeryLazy",
|
||||
dependencies = {
|
||||
'arkav/lualine-lsp-progress',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
opts = require("config.plugins.lualine")
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
return {
|
||||
'nvim-neo-tree/neo-tree.nvim',
|
||||
cmd = 'Neotree',
|
||||
keys = {
|
||||
{ '<leader>Fe', ':Neotree reveal toggle<CR>', desc = 'Toggle File Explorer'},
|
||||
},
|
||||
dependencies = {
|
||||
"MunifTanjim/nui.nvim",
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"nvim-lua/plenary.nvim",
|
||||
},
|
||||
opts = require('config.plugins.neo-tree')
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
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
|
||||
}
|
||||
12
nvim/lua/setup.lua
Normal file
12
nvim/lua/setup.lua
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
local M = {}
|
||||
|
||||
M.keymaps = function(opts)
|
||||
opts = type(opts) == 'string' and require(opts) or opts
|
||||
vim.g.mapleader = opts.leader
|
||||
|
||||
for _, v in ipairs(opts.global) do
|
||||
vim.keymap.set(unpack(v))
|
||||
end
|
||||
end
|
||||
|
||||
return M
|
||||
7
nvim/lua/utils/keys.lua
Normal file
7
nvim/lua/utils/keys.lua
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
return function(v, opts)
|
||||
local c = vim.deepcopy(v)
|
||||
local lhs = table.remove(c, 1)
|
||||
local rhs = table.remove(c, 1)
|
||||
opts = vim.tbl_deep_extend("force", c, opts or {})
|
||||
vim.keymap.set('n', lhs, rhs, opts)
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue