mirror of
https://github.com/pnx/dotfiles
synced 2026-08-31 06:48:12 +02:00
touching the nvim.
This commit is contained in:
parent
15e6408670
commit
71717129e1
40 changed files with 1045 additions and 921 deletions
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
|
||||
"LuaSnip": { "branch": "master", "commit": "825a61bad1d60d917a7962d73cf3c683f4e0407e" },
|
||||
"LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" },
|
||||
"catppuccin": { "branch": "main", "commit": "aebe43db9cb26e1c70fc5b2fd4158169c405e720" },
|
||||
"catppuccin": { "branch": "main", "commit": "02bdd749931a5d739063562e57531c118e081882" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
|
|
@ -12,39 +12,42 @@
|
|||
"dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" },
|
||||
"edgy.nvim": { "branch": "main", "commit": "de79b7d92a5979cd71a9a1d8b6282515345e5055" },
|
||||
"fd": { "branch": "master", "commit": "11069e284a61afef8becdd4e189977e5621c0cf9" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "fa052c20aa7cc62ce6a328c7f3bd556c93b5370e" },
|
||||
"go.nvim": { "branch": "master", "commit": "ae58327c9e894f6663bf43496063c167170b4ac3" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "c097cb255096f333e14d341082a84f572b394fa2" },
|
||||
"go.nvim": { "branch": "master", "commit": "39c245285483f7b587d827b3ff3eaa7e9ed00510" },
|
||||
"guihua.lua": { "branch": "master", "commit": "3b3126ae87c254f6849e708549ba76c39e3f42f8" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
|
||||
"laravel.nvim": { "branch": "main", "commit": "baafe3c0072ecb7c8f1efc9ed5e3c96ff4fbf056" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
|
||||
"lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
|
||||
"lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
|
||||
"mason-conform.nvim": { "branch": "main", "commit": "c41b19222db71b016e55c64454b5e03441f56859" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" },
|
||||
"mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
|
||||
"mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" },
|
||||
"neotest": { "branch": "master", "commit": "e07fe8241112274aae9947b98d255763738a1d52" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "c61074acb19102dfc6f21738dcae4d9a494a8959" },
|
||||
"neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
|
||||
"neotest": { "branch": "master", "commit": "f03a78cef74db5638e4312e18b767294a90de8da" },
|
||||
"neotest-go": { "branch": "main", "commit": "6a2f996d89fe4631942e035b1c114544ee045043" },
|
||||
"neotest-phpunit": { "branch": "main", "commit": "5799a4ea84450af14461d24edbde43913f9b3008" },
|
||||
"noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "0d42ba8d506242b2252d2d2885a7f6f4f5b2bcb2" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "dca7ddec321a102ec9e792b1b29193702aff5fbb" },
|
||||
"nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
|
||||
"nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "96e5711040df23583591391ce49e556b8cd248d8" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "b3014f2209503944f2714cf27c95591433a0c7d8" },
|
||||
"nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "1b050206e490a4146cdf25c7b38969c1711b5620" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "f5183cea0fda26126e22e789382c208e7b1120f4" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "b0ac1135fe304edd34e18204304906744db0fe63" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "67ac27f859ee3f7584f3edef81d0942bb61d5344" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" },
|
||||
"onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
|
||||
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "4626aaa2bcfdacf55fd6d44b430e2df81b2403ff" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "5a701e99906961218b55d7ad6c2a998f066c6fe0" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
|
||||
"undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" },
|
||||
"vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
|
||||
}
|
||||
|
|
@ -1,13 +1,11 @@
|
|||
|
||||
-- Nice command that creates all directores in the path
|
||||
-- then creates the file and opens it.
|
||||
vim.api.nvim_create_user_command('CreateFile',
|
||||
function(opts)
|
||||
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,
|
||||
{ nargs = 1, complete = "file" }
|
||||
)
|
||||
end
|
||||
|
||||
|
||||
vim.api.nvim_create_user_command('CreateFile', createfile, { nargs = 1, complete = "file" })
|
||||
vim.cmd("ca cf CreateFile")
|
||||
|
|
|
|||
|
|
@ -4,6 +4,26 @@
|
|||
local autocmd = vim.api.nvim_create_autocmd
|
||||
local augroup = vim.api.nvim_create_augroup
|
||||
|
||||
|
||||
-- Add blade filetype for .blade.php files
|
||||
vim.filetype.add({
|
||||
pattern = {
|
||||
['.*%.blade%.php'] = 'blade',
|
||||
},
|
||||
})
|
||||
|
||||
-- Fix autocomment plugins to use line comments for php.
|
||||
autocmd('Filetype', {
|
||||
pattern = 'php',
|
||||
command = 'setlocal commentstring=//\\%s'
|
||||
})
|
||||
|
||||
|
||||
--
|
||||
-- Indent
|
||||
--
|
||||
|
||||
|
||||
augroup('indent', { clear = true })
|
||||
|
||||
-- Hardtabs for make
|
||||
|
|
@ -26,10 +46,3 @@ autocmd('Filetype', {
|
|||
pattern = { 'c', 'cpp' },
|
||||
command = 'setlocal ts=8 sts=0 sw=8 noexpandtab'
|
||||
})
|
||||
|
||||
-- Fix autocomment plugins to use line comments for php.
|
||||
autocmd('Filetype', {
|
||||
pattern = 'php',
|
||||
command = 'setlocal commentstring=//\\%s'
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@ return {
|
|||
current = ' ',
|
||||
selected = '',
|
||||
close = '',
|
||||
modified = '',
|
||||
pinned = '',
|
||||
separator = '│',
|
||||
tree = {
|
||||
node = '│',
|
||||
nodelast = '└',
|
||||
|
|
@ -26,8 +28,8 @@ return {
|
|||
removed = '',
|
||||
},
|
||||
diff_gutter = {
|
||||
add = '▏',
|
||||
change = '▏',
|
||||
add = '▍',
|
||||
change = '▍',
|
||||
delete = '',
|
||||
untracked = '+'
|
||||
},
|
||||
|
|
@ -85,5 +87,4 @@ return {
|
|||
Operator = "",
|
||||
TypeParameter = "",
|
||||
},
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
-- config
|
||||
require("config.commands")
|
||||
require("config.settings")
|
||||
require("config.mappings")
|
||||
require("config.filetype")
|
||||
require("config.commands")
|
||||
|
|
|
|||
|
|
@ -25,17 +25,21 @@ map("v", "<S-a>", ":m '<-2<CR>gv=gv", { silent = true, desc = "move current sele
|
|||
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("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", "<leader>p", [["+p]], { desc = "Paste from system clipboard register" })
|
||||
map({ "n", "v" }, "<leader>p", [["+p]], { desc = "Paste from system clipboard register" })
|
||||
|
||||
-- File operations
|
||||
map("n", "<leader>fx", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Set execute flag on current file" })
|
||||
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>", "^=$")
|
||||
|
|
@ -43,21 +47,25 @@ map('x', "<Tab>", "=", { desc = "auto indent selection" })
|
|||
map("i", "<S-Tab>", "<C-d>", { desc = "delete indent" })
|
||||
|
||||
-- fix paste
|
||||
map('n', "p", "p=$")
|
||||
-- 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>hx", [[:s/\(\x\{2\}\)/0x\1,/g<cr>]], { desc = "Format hex"})
|
||||
map({"x"}, "<leader>ha", [[:s/0x\(\x\{1\}\X\)/0x0\1/g<cr>]], { desc = "Format hex more"})
|
||||
map({"x"}, "<leader>hn", [[:s/\(\(0x\x\{1,2\}, \)\{8\}\)/\1\r/g<cr>]], { desc = "Format hex with 8 bytes per row"})
|
||||
|
||||
|
||||
map("n", "Q", "<nop>")
|
||||
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>")
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ return function ()
|
|||
themable = true,
|
||||
buffer_close_icon = icons.close,
|
||||
close_icon = icons.close,
|
||||
modified_icon = icons.modified_icon,
|
||||
modified_icon = icons.modified,
|
||||
diagnostics = false,
|
||||
enforce_regular_tabs = true,
|
||||
indicator = {
|
||||
style = 'underline',
|
||||
icon = "",
|
||||
},
|
||||
close_command = function(bufnum)
|
||||
vim.cmd("bprev")
|
||||
|
|
@ -31,6 +31,16 @@ return function ()
|
|||
text_align = "left"
|
||||
}
|
||||
},
|
||||
custom_areas = {
|
||||
left = function()
|
||||
return {
|
||||
{
|
||||
text = " ",
|
||||
fg = "#8fff6d",
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
}
|
||||
}
|
||||
end
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ return {
|
|||
flavour = "mocha",
|
||||
color_overrides = {
|
||||
mocha = {
|
||||
base = '#0e1019',
|
||||
base = '#0E1019',
|
||||
mantle = '#0D0F17',
|
||||
crust = '#0C0D14',
|
||||
surface0 = '#131521',
|
||||
|
|
@ -19,13 +19,17 @@ return {
|
|||
highlight_overrides = {
|
||||
mocha = function(colors)
|
||||
return {
|
||||
-- Normal = { fg = colors.text },
|
||||
-- NormalNC = { fg = colors.text },
|
||||
|
||||
-- Floating windows
|
||||
NormalFloat = { fg = colors.text, bg = colors.base },
|
||||
NormalFloat = { fg = colors.text, bg = colors.mantle },
|
||||
FloatTitle = { fg = colors.base, bg = colors.blue },
|
||||
FloatBorder = { fg = colors.blue, bg = colors.base },
|
||||
FloatBorder = { fg = colors.blue, bg = colors.mantle },
|
||||
|
||||
-- Window separator
|
||||
WinSeparator = { fg = colors.surface0 },
|
||||
NeoTreeWinSeparator = { link = "WinSeparator" },
|
||||
|
||||
-- Menus
|
||||
Pmenu = { fg = colors.text, bg = colors.mantle },
|
||||
|
|
@ -49,6 +53,16 @@ return {
|
|||
TelescopePromptBorder = { fg = colors.mantle, bg = colors.mantle },
|
||||
TelescopePromptTitle = { fg = colors.crust, bg = colors.blue },
|
||||
TelescopePreviewTitle = { fg = colors.crust, bg = colors.mauve },
|
||||
TelescopeSelection = { fg = colors.text, bg = colors.surface0 },
|
||||
|
||||
-- Statusline
|
||||
StatusLine = { fg = colors.text, bg = colors.mantle },
|
||||
StatusLineNormal = { fg = colors.text, bg = colors.mantle },
|
||||
StatusLineSeparator = { fg = colors.surface0, bg = colors.mantle },
|
||||
StatusLineInsert = { fg = colors.base, bg = colors.blue },
|
||||
StatusLineVisual = { fg = colors.base, bg = colors.mauve },
|
||||
StatusLineCommand = { fg = colors.base, bg = colors.yellow },
|
||||
StatusLineReplace = { fg = colors.base, bg = colors.maroon },
|
||||
|
||||
-- Syntax
|
||||
PreProc = { link = "Include" },
|
||||
|
|
|
|||
|
|
@ -1,14 +1,7 @@
|
|||
local icons = require('config.icons')
|
||||
|
||||
return function()
|
||||
local lspkind_config = {
|
||||
mode = 'symbol',
|
||||
preset = 'codicons',
|
||||
symbol_map = icons.symbols,
|
||||
maxwidth = 40,
|
||||
ellipsis_char = "...",
|
||||
}
|
||||
local cmp = require('cmp')
|
||||
local lspkind = require('utils.lspkind')
|
||||
local icons = require('config.icons')
|
||||
|
||||
local selectPrev = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert })
|
||||
local selectNext = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert })
|
||||
|
|
@ -19,17 +12,7 @@ return function ()
|
|||
}
|
||||
|
||||
return {
|
||||
completion = {
|
||||
completeopt = "menu,menuone,noinsert",
|
||||
},
|
||||
-- enabled = function()
|
||||
-- if require"cmp.config.context".in_treesitter_capture("comment")==true or require"cmp.config.context".in_syntax_group("Comment") then
|
||||
-- return false
|
||||
-- else
|
||||
-- return true
|
||||
-- end
|
||||
-- end,
|
||||
-- preselect = false,
|
||||
preselect = false,
|
||||
view = {
|
||||
entries = { name = 'custom', selection_order = 'near_cursor' },
|
||||
},
|
||||
|
|
@ -42,7 +25,7 @@ return function ()
|
|||
["<S-Tab>"] = selectPrev,
|
||||
["<Down>"] = selectNext,
|
||||
["<Tab>"] = selectNext,
|
||||
["<esc>"] = cmp.mapping.abort(),
|
||||
["<S-c>"] = cmp.mapping.abort(),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||
},
|
||||
snippet = {
|
||||
|
|
@ -52,18 +35,13 @@ return function ()
|
|||
},
|
||||
formatting = {
|
||||
fields = { "abbr", "kind", "menu" },
|
||||
format = function(entry, vim_item)
|
||||
if vim.tbl_contains({ 'path' }, entry.source.name) then
|
||||
local icon, hl_group = require('nvim-web-devicons').get_icon(entry:get_completion_item().label)
|
||||
if icon then
|
||||
vim_item.kind = icon
|
||||
vim_item.kind_hl_group = hl_group
|
||||
return vim_item
|
||||
end
|
||||
end
|
||||
|
||||
return require('lspkind').cmp_format(lspkind_config)(entry, vim_item)
|
||||
end
|
||||
format = lspkind.format({
|
||||
mode = 'symbol',
|
||||
preset = 'codicons',
|
||||
symbol_map = icons.symbols,
|
||||
maxwidth = 40,
|
||||
ellipsis_char = "...",
|
||||
}),
|
||||
},
|
||||
sources = {
|
||||
{ name = "copilot" },
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ return {
|
|||
-- Toggle comment on visual selection
|
||||
comment_visual = '<leader>/',
|
||||
|
||||
-- Define 'comment' textobject (like `dgc` - delete whole comment block)
|
||||
-- Define 'comment' textobject (like `dg/` - delete whole comment block)
|
||||
-- Works also in Visual mode if mapping differs from `comment_visual`
|
||||
textobject = 'gc',
|
||||
textobject = 'g/',
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
return {
|
||||
keys = {
|
||||
["<leader>la"] = { ":Laravel artisan<cr>", "Run artisan" },
|
||||
["<leader>lr"] = { ":Laravel routes<cr>", "Search routes" },
|
||||
["<leader>lm"] = { ":Laravel related<cr>", "Related" },
|
||||
["<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" },
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,20 +3,29 @@ return {
|
|||
["<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 = {
|
||||
settings = {
|
||||
init_options = {
|
||||
["language_server_phpstan.enabled"] = true,
|
||||
["language_server_psalm.enabled"] = false,
|
||||
}
|
||||
}
|
||||
-- phpactor = {
|
||||
-- settings = {
|
||||
-- init_options = {
|
||||
-- ["language_server_phpstan.enabled"] = true,
|
||||
-- ["language_server_psalm.enabled"] = false,
|
||||
-- }
|
||||
-- }
|
||||
-- },
|
||||
--
|
||||
--
|
||||
-- JS,TS,VUE
|
||||
volar = {
|
||||
filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' }
|
||||
},
|
||||
-- TailwindCSS
|
||||
tailwindcss = {},
|
||||
-- GO
|
||||
gopls = {
|
||||
-- format_on_save = true,
|
||||
|
|
|
|||
93
nvim/lua/config/plugins/lualine.lua
Normal file
93
nvim/lua/config/plugins/lualine.lua
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
local icons = require('config.icons')
|
||||
local separator = { "'" .. icons.separator .. "'", color = 'StatusLineSeparator' }
|
||||
|
||||
return {
|
||||
options = {
|
||||
globalstatus = true,
|
||||
component_separators = '',
|
||||
section_separators = '',
|
||||
disabled_filetypes = {
|
||||
statusline = {
|
||||
'dashboard',
|
||||
}
|
||||
},
|
||||
theme = {
|
||||
normal = {
|
||||
a = "StatusLineNormal",
|
||||
b = "StatusLine",
|
||||
c = "StatusLine",
|
||||
x = "StatusLine",
|
||||
y = "StatusLine",
|
||||
z = "StatusLine",
|
||||
},
|
||||
command = {
|
||||
a = "StatusLineCommand",
|
||||
z = "StatusLine",
|
||||
},
|
||||
insert = {
|
||||
a = "StatusLineInsert",
|
||||
z = "StatusLine",
|
||||
},
|
||||
visual = {
|
||||
a = "StatusLineVisual",
|
||||
z = "StatusLine",
|
||||
},
|
||||
replace = {
|
||||
a = "StatusLineReplace",
|
||||
z = "StatusLine",
|
||||
}
|
||||
}
|
||||
},
|
||||
sections = {
|
||||
lualine_a = {
|
||||
"mode",
|
||||
},
|
||||
lualine_b = {
|
||||
separator,
|
||||
"branch",
|
||||
separator,
|
||||
'" " .. tostring(#vim.tbl_keys(vim.lsp.buf_get_clients()))',
|
||||
{
|
||||
require("lazy.status").updates,
|
||||
cond = require("lazy.status").has_updates,
|
||||
color = { fg = "#ff9e64" },
|
||||
},
|
||||
{
|
||||
"diagnostics",
|
||||
symbols = {
|
||||
error = icons.diagnostics.error .. ' ',
|
||||
warn = icons.diagnostics.warn .. ' ',
|
||||
info = icons.diagnostics.info .. ' ',
|
||||
hint = icons.diagnostics.hint .. ' ',
|
||||
},
|
||||
},
|
||||
{
|
||||
"diff",
|
||||
symbols = {
|
||||
added = icons.diff.added .. ' ',
|
||||
modified = icons.diff.modified .. ' ',
|
||||
removed = icons.diff.removed .. ' '
|
||||
}
|
||||
},
|
||||
separator,
|
||||
},
|
||||
lualine_c = {
|
||||
'filename'
|
||||
},
|
||||
lualine_x = {
|
||||
'filetype',
|
||||
'fileformat',
|
||||
'(vim.bo.expandtab and "SPC" or "TAB") .. " " .. vim.bo.shiftwidth',
|
||||
},
|
||||
lualine_y = {
|
||||
separator,
|
||||
'location',
|
||||
'progress'
|
||||
},
|
||||
lualine_z = {}
|
||||
},
|
||||
extensions = {
|
||||
'lazy',
|
||||
'neo-tree'
|
||||
}
|
||||
}
|
||||
|
|
@ -10,10 +10,15 @@ return {
|
|||
{ '<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()
|
||||
|
|
|
|||
10
nvim/lua/config/plugins/trouble.lua
Normal file
10
nvim/lua/config/plugins/trouble.lua
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
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 },
|
||||
},
|
||||
}
|
||||
|
|
@ -3,7 +3,8 @@ return {
|
|||
mode = { "n", "v" },
|
||||
["<leader>r"] = { name = "+rename" },
|
||||
["<leader>b"] = { name = "+buffers" },
|
||||
["<leader>f"] = { name = "+files" },
|
||||
["<leader>f"] = { name = "+format" },
|
||||
["<leader>F"] = { name = "+files" },
|
||||
["<leader>d"] = { name = "+diagnostics" }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,34 @@
|
|||
local set = vim.opt
|
||||
|
||||
|
||||
--
|
||||
-- General Settings
|
||||
--
|
||||
|
||||
set.termguicolors = true
|
||||
set.updatetime = 50
|
||||
set.showmode = false -- disable mode in the command line, because i use lualine
|
||||
set.mousemoveevent = true
|
||||
|
||||
|
||||
--
|
||||
-- Editor settings
|
||||
--
|
||||
|
||||
|
||||
set.pumheight = 20
|
||||
set.hlsearch = false
|
||||
set.incsearch = true
|
||||
set.laststatus = 3
|
||||
set.splitkeep = "screen"
|
||||
set.scrolloff = 20
|
||||
--vim.opt.sidescrolloff = 8
|
||||
|
||||
-- mouse and cursor
|
||||
set.cursorline = true
|
||||
set.mousemoveevent = true
|
||||
|
||||
-- search
|
||||
set.hlsearch = false
|
||||
set.incsearch = true
|
||||
set.ignorecase = true
|
||||
set.smartcase = true
|
||||
|
||||
-- line numbers
|
||||
set.number = true
|
||||
|
|
@ -32,22 +42,34 @@ set.numberwidth = 5
|
|||
set.statuscolumn = '%s %=%{v:relnum?v:relnum:v:lnum} '
|
||||
|
||||
-- indent
|
||||
set.expandtab = true
|
||||
set.tabstop = 4
|
||||
set.softtabstop = 4
|
||||
set.shiftwidth = 4
|
||||
set.autoindent = true
|
||||
set.smartindent = true
|
||||
|
||||
-- Filetypes
|
||||
vim.filetype.add({
|
||||
pattern = {
|
||||
['.*%.blade%.php'] = 'blade',
|
||||
},
|
||||
})
|
||||
-- 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"
|
||||
|
||||
|
||||
|
||||
--
|
||||
-- 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' })
|
||||
|
|
@ -55,11 +77,11 @@ vim.fn.sign_define('DiagnosticSignInfo', { text = icons.info, texthl = 'Diagnost
|
|||
vim.fn.sign_define('DiagnosticSignHint', { text = icons.hint, texthl = 'DiagnosticSignHint' })
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = true,
|
||||
virtual_text = false,
|
||||
severity_sort = true,
|
||||
underline = false,
|
||||
float = {
|
||||
border = 'single',
|
||||
source = 'always',
|
||||
-- border = 'single',
|
||||
},
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ return {
|
|||
}
|
||||
},
|
||||
config = function(_, opts)
|
||||
|
||||
require 'ibl'.setup(opts)
|
||||
|
||||
local hooks = require 'ibl.hooks'
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ return {
|
|||
'williamboman/mason.nvim',
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
{ 'folke/neodev.nvim', opts = {} },
|
||||
},
|
||||
opts = require('config.plugins.lsp'),
|
||||
config = function(_, opts)
|
||||
|
|
@ -26,6 +27,12 @@ return {
|
|||
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
|
||||
|
|
@ -53,6 +60,8 @@ return {
|
|||
})
|
||||
end
|
||||
|
||||
|
||||
if client.supports_method("textDocument/documentHighlight") then
|
||||
vim.api.nvim_create_autocmd("CursorHold", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
|
|
@ -71,6 +80,7 @@ return {
|
|||
callback = function() vim.lsp.buf.clear_references() end
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
lspconfig[name].setup({
|
||||
settings = server_opt.settings or {},
|
||||
|
|
|
|||
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"},
|
||||
},
|
||||
}
|
||||
|
|
@ -33,11 +33,10 @@ require("lazy").setup({
|
|||
|
||||
-- UI
|
||||
-----------------------------
|
||||
{ import = "plugins.ui.catppuccin" },
|
||||
{ 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" },
|
||||
|
|
@ -46,11 +45,14 @@ require("lazy").setup({
|
|||
|
||||
-- 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
|
||||
|
|
@ -59,4 +61,3 @@ require("lazy").setup({
|
|||
{ import = "plugins.lang.go" },
|
||||
|
||||
}, opts)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ return {
|
|||
lazy = false,
|
||||
priority = 1000,
|
||||
opts = {
|
||||
style = 'darker',
|
||||
style = 'deep',
|
||||
code_style = {
|
||||
comments = 'none',
|
||||
keywords = 'none',
|
||||
|
|
@ -11,82 +11,82 @@ return {
|
|||
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" },
|
||||
}
|
||||
-- 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))
|
||||
-- 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,4 +1,3 @@
|
|||
|
||||
local logo = [[
|
||||
::::::::: :::: ::: ::: :::
|
||||
:+: :+: :+:+: :+: :+: :+:
|
||||
|
|
@ -39,4 +38,3 @@ return {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
local icons = require('config.icons')
|
||||
|
||||
return {
|
||||
'nvim-lualine/lualine.nvim',
|
||||
event = "VeryLazy",
|
||||
|
|
@ -7,60 +5,5 @@ return {
|
|||
'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'
|
||||
}
|
||||
}
|
||||
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 },
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
@ -12,4 +12,3 @@ return {
|
|||
wk.register(opts.defaults or {})
|
||||
end
|
||||
}
|
||||
|
||||
|
|
|
|||
21
nvim/lua/utils/lspkind.lua
Normal file
21
nvim/lua/utils/lspkind.lua
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
|
||||
local M = {}
|
||||
|
||||
-- Create format function.
|
||||
function M.format(config)
|
||||
return function(entry, vim_item)
|
||||
-- Devicons for files
|
||||
if vim.tbl_contains({ 'path' }, entry.source.name) then
|
||||
local icon, hl_group = require('nvim-web-devicons').get_icon(entry:get_completion_item().label)
|
||||
if icon then
|
||||
vim_item.kind = icon
|
||||
vim_item.kind_hl_group = hl_group
|
||||
return vim_item
|
||||
end
|
||||
end
|
||||
|
||||
return require('lspkind').cmp_format(config)(entry, vim_item)
|
||||
end
|
||||
end
|
||||
|
||||
return M
|
||||
Loading…
Add table
Add a link
Reference in a new issue