mirror of
https://github.com/pnx/dotfiles
synced 2026-06-17 19:40:02 +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
|
||||
Loading…
Add table
Add a link
Reference in a new issue