fix dashboard
This commit is contained in:
parent
a9518b1718
commit
c839993a25
SSH Key Fingerprint:
SHA256:lT5C2bB398DcX6daCF/gYFNSTK3y+Du3oTGUnYzfTEw
@ -2,43 +2,57 @@ local augroup = vim.api.nvim_create_augroup
|
|||||||
local autocmd = vim.api.nvim_create_autocmd
|
local autocmd = vim.api.nvim_create_autocmd
|
||||||
|
|
||||||
-- Restore cursor position
|
-- Restore cursor position
|
||||||
local restore_cursor = augroup('RestoreCursor', { clear = true })
|
local restore_cursor = augroup("RestoreCursor", { clear = true })
|
||||||
autocmd('BufReadPost', {
|
autocmd("BufReadPost", {
|
||||||
group = restore_cursor,
|
group = restore_cursor,
|
||||||
callback = function()
|
callback = function()
|
||||||
local mark = vim.api.nvim_buf_get_mark(0, '"')
|
local mark = vim.api.nvim_buf_get_mark(0, '"')
|
||||||
local lcount = vim.api.nvim_buf_line_count(0)
|
local lcount = vim.api.nvim_buf_line_count(0)
|
||||||
if mark[1] > 0 and mark[1] <= lcount then
|
if mark[1] > 0 and mark[1] <= lcount then
|
||||||
pcall(vim.api.nvim_win_set_cursor, 0, mark)
|
pcall(vim.api.nvim_win_set_cursor, 0, mark)
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Help and man pages in vertical split
|
-- Help and man pages in vertical split
|
||||||
local help_config = augroup('HelpConfig', { clear = true })
|
local help_config = augroup("HelpConfig", { clear = true })
|
||||||
autocmd('FileType', {
|
autocmd("FileType", {
|
||||||
group = help_config,
|
group = help_config,
|
||||||
pattern = { 'help', 'man' },
|
pattern = { "help", "man" },
|
||||||
command = 'wincmd L'
|
command = "wincmd L",
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Terminal settings
|
-- Terminal settings
|
||||||
local term_config = augroup('TermConfig', { clear = true })
|
local term_config = augroup("TermConfig", { clear = true })
|
||||||
autocmd('TermOpen', {
|
autocmd("TermOpen", {
|
||||||
group = term_config,
|
group = term_config,
|
||||||
pattern = '*',
|
pattern = "*",
|
||||||
command = 'setlocal nonumber norelativenumber'
|
command = "setlocal nonumber norelativenumber",
|
||||||
})
|
})
|
||||||
|
|
||||||
local highlight_yank = augroup('HighlightYank', { clear = true })
|
local highlight_yank = augroup("HighlightYank", { clear = true })
|
||||||
autocmd('TextYankPost', {
|
autocmd("TextYankPost", {
|
||||||
group = highlight_yank,
|
group = highlight_yank,
|
||||||
pattern = '*',
|
pattern = "*",
|
||||||
callback = function()
|
callback = function()
|
||||||
vim.highlight.on_yank({ higroup = "IncSearch", timeout = 420 })
|
vim.highlight.on_yank({ higroup = "IncSearch", timeout = 420 })
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
function disable_for_dashboard()
|
||||||
|
local buftype = vim.api.nvim_buf_get_option(0, "buftype")
|
||||||
|
local filetype = vim.api.nvim_buf_get_option(0, "filetype")
|
||||||
|
if buftype == "nofile" and filetype == "dashboard" then
|
||||||
|
vim.b.indent_blankline_enabled = false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
vim.cmd([[
|
||||||
|
augroup IndentBlankline
|
||||||
|
autocmd!
|
||||||
|
autocmd FileType dashboard lua disable_for_dashboard()
|
||||||
|
augroup END
|
||||||
|
]])
|
||||||
|
|
||||||
-- Code actions on cursor hold
|
-- Code actions on cursor hold
|
||||||
-- local code_action = augroup('CodeAction', { clear = true })
|
-- local code_action = augroup('CodeAction', { clear = true })
|
||||||
-- autocmd({ 'CursorHold', 'CursorHoldI' }, {
|
-- autocmd({ 'CursorHold', 'CursorHoldI' }, {
|
||||||
@ -49,4 +63,3 @@ autocmd('TextYankPost', {
|
|||||||
-- end
|
-- end
|
||||||
-- end
|
-- end
|
||||||
-- })
|
-- })
|
||||||
|
|
||||||
|
|||||||
@ -1,37 +1,36 @@
|
|||||||
local map = vim.keymap.set
|
local map = vim.keymap.set
|
||||||
local Terminal = require('toggleterm.terminal').Terminal
|
local Terminal = require("toggleterm.terminal").Terminal
|
||||||
local lazygit = Terminal:new({ cmd = 'lazygit', hidden = true })
|
local lazygit = Terminal:new({ cmd = "lazygit", hidden = true })
|
||||||
local ipython = Terminal:new({ cmd = 'ipython', hidden = true })
|
local ipython = Terminal:new({ cmd = "ipython", hidden = true })
|
||||||
local notify = require('notify')
|
local notify = require("notify")
|
||||||
|
|
||||||
local function term_factory(cfg)
|
local function term_factory(cfg)
|
||||||
cfg["on_stderr"] = function(_, job, data, name)
|
cfg["on_stderr"] = function(_, job, data, name)
|
||||||
notify(name .. ' encountered an error on job: ' .. job .. '\nData: ' .. data)
|
notify(name .. " encountered an error on job: " .. job .. "\nData: " .. data)
|
||||||
end
|
end
|
||||||
cfg["on_stdout"] = function(_, job, data, name)
|
cfg["on_stdout"] = function(_, job, data, name)
|
||||||
notify(name .. ' output for job' .. job .. '\nData: ' .. data)
|
notify(name .. " output for job" .. job .. "\nData: " .. data)
|
||||||
end
|
end
|
||||||
return Terminal:new(cfg)
|
return Terminal:new(cfg)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function term_toggle(term)
|
local function term_toggle(term)
|
||||||
term:toggle()
|
term:toggle()
|
||||||
end
|
end
|
||||||
|
|
||||||
local opts = { silent = true, noremap = true }
|
local opts = { silent = true, noremap = true }
|
||||||
|
|
||||||
|
|
||||||
local function ReloadConfig()
|
local function ReloadConfig()
|
||||||
dofile(vim.fn.stdpath('config') .. '/init.lua')
|
dofile(vim.fn.stdpath("config") .. "/init.lua")
|
||||||
dofile(vim.fn.stdpath('config') .. '/lua/core/keymaps.lua')
|
dofile(vim.fn.stdpath("config") .. "/lua/core/keymaps.lua")
|
||||||
dofile(vim.fn.stdpath('config') .. '/lua/core/autocmds.lua')
|
dofile(vim.fn.stdpath("config") .. "/lua/core/autocmds.lua")
|
||||||
dofile(vim.fn.stdpath('config') .. '/lua/core/options.lua')
|
dofile(vim.fn.stdpath("config") .. "/lua/core/options.lua")
|
||||||
dofile(vim.fn.stdpath('config') .. '/lua/core/plugins.lua')
|
dofile(vim.fn.stdpath("config") .. "/lua/core/plugins.lua")
|
||||||
dofile(vim.fn.stdpath('config') .. '/lua/plugins/ui/init.lua')
|
dofile(vim.fn.stdpath("config") .. "/lua/plugins/ui/init.lua")
|
||||||
dofile(vim.fn.stdpath('config') .. '/lua/plugins/ui/toggleterm.lua')
|
dofile(vim.fn.stdpath("config") .. "/lua/plugins/ui/toggleterm.lua")
|
||||||
dofile(vim.fn.stdpath('config') .. '/lua/plugins/ai/init.lua')
|
dofile(vim.fn.stdpath("config") .. "/lua/plugins/ai/init.lua")
|
||||||
dofile(vim.fn.stdpath('config') .. '/lua/plugins/lsp/init.lua')
|
dofile(vim.fn.stdpath("config") .. "/lua/plugins/lsp/init.lua")
|
||||||
dofile(vim.fn.stdpath('config') .. '/lua/plugins/colorscheme/init.lua')
|
dofile(vim.fn.stdpath("config") .. "/lua/plugins/colorscheme/init.lua")
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Leader key
|
-- Leader key
|
||||||
@ -39,97 +38,98 @@ vim.g.mapleader = " "
|
|||||||
vim.g.maplocalleader = ","
|
vim.g.maplocalleader = ","
|
||||||
|
|
||||||
-- Custom commands
|
-- Custom commands
|
||||||
vim.api.nvim_create_user_command('PS', ':PackerSync', {})
|
vim.api.nvim_create_user_command("PS", ":PackerSync", {})
|
||||||
vim.api.nvim_create_user_command('Reload', ReloadConfig, {})
|
vim.api.nvim_create_user_command("Reload", ReloadConfig, {})
|
||||||
vim.api.nvim_create_user_command('Config', 'edit ~/.config/nvim/init.lua', {})
|
vim.api.nvim_create_user_command("Config", "edit ~/.config/nvim", {})
|
||||||
vim.api.nvim_create_user_command('Plugins', 'edit ~/.config/nvim/lua/core/plugins.lua', {})
|
vim.api.nvim_create_user_command("Plugins", "edit ~/.config/nvim/lua/core/plugins.lua", {})
|
||||||
vim.api.nvim_create_user_command('Keymaps', 'edit ~/.config/nvim/lua/core/keymaps.lua', {})
|
vim.api.nvim_create_user_command("Keymaps", "edit ~/.config/nvim/lua/core/keymaps.lua", {})
|
||||||
|
|
||||||
-- {{{ Basic mappings
|
-- {{{ Basic mappings
|
||||||
map('n', '<C-u>', '<C-u>zz', opts)
|
map("n", "<C-u>", "<C-u>zz", opts)
|
||||||
map('n', 'n', 'nzzzv', opts)
|
map("n", "n", "nzzzv", opts)
|
||||||
map('n', 'N', 'Nzzzv', opts)
|
map("n", "N", "Nzzzv", opts)
|
||||||
map('x', '<leader>p', '"_dP', opts) -- paste without yanking
|
map("x", "<leader>p", '"_dP', opts) -- paste without yanking
|
||||||
map('v', '<', '<gv', opts) -- reselect after indent
|
map("v", "<", "<gv", opts) -- reselect after indent
|
||||||
map('v', '>', '>gv', opts)
|
map("v", ">", ">gv", opts)
|
||||||
map('v', 'J', ":m '>+1<CR>gv=gv", opts) -- move lines
|
map("v", "J", ":m '>+1<CR>gv=gv", opts) -- move lines
|
||||||
map('v', 'K', ":m '<-2<CR>gv=gv", opts)
|
map("v", "K", ":m '<-2<CR>gv=gv", opts)
|
||||||
-- }}}
|
-- }}}
|
||||||
|
|
||||||
-- {{{ Buffer navigation
|
-- {{{ Buffer navigation
|
||||||
map('n', '<C-J>', ':bnext<CR>', opts)
|
map("n", "<C-J>", ":bnext<CR>", opts)
|
||||||
map('n', '<C-K>', ':bprev<CR>', opts)
|
map("n", "<C-K>", ":bprev<CR>", opts)
|
||||||
map('n', '<leader>bb', ':Telescope buffers<CR>', opts)
|
map("n", "<leader>bb", ":Telescope buffers<CR>", opts)
|
||||||
map('n', '<leader>bk', ':bdelete<CR>', opts)
|
map("n", "<leader>bk", ":bdelete<CR>", opts)
|
||||||
map('n', '<leader>bn', ':bnext<CR>', opts)
|
map("n", "<leader>bn", ":bnext<CR>", opts)
|
||||||
map('n', '<leader>bp', ':bprev<CR>', opts)
|
map("n", "<leader>bp", ":bprev<CR>", opts)
|
||||||
-- }}}
|
-- }}}
|
||||||
|
|
||||||
--{{{ Terminal mappings
|
--{{{ Terminal mappings
|
||||||
|
|
||||||
local programs_map = {
|
local programs_map = {
|
||||||
gg = { cmd = 'lazygit', display_name = 'lazygit', direction = 'tab', hidden = true },
|
gg = { cmd = "lazygit", display_name = "lazygit", direction = "tab", hidden = true },
|
||||||
op = { cmd = 'ipython', display_name = 'ipython', direction = 'vertical', hidden = true },
|
op = { cmd = "ipython", display_name = "ipython", direction = "vertical", hidden = true },
|
||||||
oP = { cmd = 'ipython', display_name = 'ipython-full', direction = 'tab', hidden = true },
|
oP = { cmd = "ipython", display_name = "ipython-full", direction = "tab", hidden = true },
|
||||||
on = { cmd = 'ncmpcpp', display_name = 'ncmpcpp', direction = 'tab', hidden = true },
|
on = { cmd = "ncmpcpp", display_name = "ncmpcpp", direction = "tab", hidden = true },
|
||||||
ob = { cmd = 'btop', display_name = 'btop', direction = 'tab', hidden = true },
|
ob = { cmd = "btop", display_name = "btop", direction = "tab", hidden = true },
|
||||||
od = { cmd = 'lazydocker', display_name = 'lazydocker', direction = 'tab', hidden = true },
|
od = { cmd = "lazydocker", display_name = "lazydocker", direction = "tab", hidden = true },
|
||||||
}
|
}
|
||||||
|
|
||||||
for key, value in pairs(programs_map) do
|
for key, value in pairs(programs_map) do
|
||||||
map('n', '<leader>' .. key, function()
|
map("n", "<leader>" .. key, function()
|
||||||
term_toggle(term_factory(value))
|
term_toggle(term_factory(value))
|
||||||
end, opts)
|
end, opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
map('v', 'op', '<C-\\><C-N>:ToggleTerm name=ipython')
|
map("v", "op", "<C-\\><C-N>:ToggleTerm name=ipython")
|
||||||
map('v', 'oP', '<C-\\><C-N>:ToggleTerm name=ipython-full')
|
map("v", "oP", "<C-\\><C-N>:ToggleTerm name=ipython-full")
|
||||||
map('t', '<leader>tp', '<C-\\><C-N>:FloatermToggle ipython<CR>', opts)
|
map("t", "<leader>tp", "<C-\\><C-N>:FloatermToggle ipython<CR>", opts)
|
||||||
map('t', '<leader>tP', '<C-\\><C-N>:FloatermToggle ipython-full<CR>', opts)
|
map("t", "<leader>tP", "<C-\\><C-N>:FloatermToggle ipython-full<CR>", opts)
|
||||||
|
|
||||||
map('n', '<C-T>', ':ToggleTerm name=toggleterm<CR>', opts)
|
map("n", "<C-T>", ":ToggleTerm name=toggleterm<CR>", opts)
|
||||||
map('n', '<leader>tt', ':ToggleTerm name=toggleterm<CR>', opts)
|
map("n", "<leader>tt", ":ToggleTerm name=toggleterm<CR>", opts)
|
||||||
map('n', '<leader>ts', ':TermSelect<CR>', opts)
|
map("n", "<leader>ts", ":TermSelect<CR>", opts)
|
||||||
map('n', '<leader>tv', ':ToggleTerm direction=vertical name=toggleterm-vert<CR>', opts)
|
map("n", "<leader>tv", ":ToggleTerm direction=vertical name=toggleterm-vert<CR>", opts)
|
||||||
map('n', '<leader>th', ':ToggleTerm direction=horizontal name=toggleterm-hori<CR>', opts)
|
map("n", "<leader>th", ":ToggleTerm direction=horizontal name=toggleterm-hori<CR>", opts)
|
||||||
map('n', '<leader>tf', ':ToggleTerm name=toggleterm<CR>', opts)
|
map("n", "<leader>tf", ":ToggleTerm name=toggleterm<CR>", opts)
|
||||||
|
|
||||||
map('t', '<leader>tt', '<C-\\><C-N>:ToggleTerm<CR>', opts)
|
map("t", "<leader>tt", "<C-\\><C-N>:ToggleTerm<CR>", opts)
|
||||||
map('t', '<leader>tf', '<C-\\><C-N>:ToggleTerm<CR>', opts)
|
map("t", "<leader>tf", "<C-\\><C-N>:ToggleTerm<CR>", opts)
|
||||||
map('t', '<leader>tv', '<C-\\><C-N>:ToggleTerm --name=toggleterm-vert<CR>', opts)
|
map("t", "<leader>tv", "<C-\\><C-N>:ToggleTerm --name=toggleterm-vert<CR>", opts)
|
||||||
map('t', '<leader>th', '<C-\\><C-N>:ToggleTerm --name=toggleterm-hori<CR>', opts)
|
map("t", "<leader>th", "<C-\\><C-N>:ToggleTerm --name=toggleterm-hori<CR>", opts)
|
||||||
map('t', '<C-T>', '<C-\\><C-n>:Toggleterm<CR>', opts)
|
map("t", "<C-T>", "<C-\\><C-n>:Toggleterm<CR>", opts)
|
||||||
map('t', '<Esc>', '<C-\\><C-n>', opts)
|
map("t", "<Esc>", "<C-\\><C-n>", opts)
|
||||||
map('t', '<space>', '<space>', opts) -- fix space in terminal
|
map("t", "<space>", "<space>", opts) -- fix space in terminal
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ LSP mappings
|
--{{{ LSP mappings
|
||||||
map('n', 'gA', vim.lsp.buf.code_action, opts)
|
map("n", "gA", vim.lsp.buf.code_action, opts)
|
||||||
map('n', 'gd', ':Telescope lsp_definitions<CR>', opts)
|
map("n", "gd", ":Telescope lsp_definitions<CR>", opts)
|
||||||
map('n', 'gDc', ':Telescope lsp_implementations<CR>', opts)
|
map("n", "gDc", ":Telescope lsp_implementations<CR>", opts)
|
||||||
map('n', 'gDf', ':Telescope lsp_definitions<CR>', opts)
|
map("n", "gDf", ":Telescope lsp_definitions<CR>", opts)
|
||||||
map('n', 'gF', ':edit <cfile><CR>', opts)
|
map("n", "gF", ":edit <cfile><CR>", opts)
|
||||||
map('n', 'gT', ':Telescope lsp_type_definitions<CR>', opts)
|
map("n", "gT", ":Telescope lsp_type_definitions<CR>", opts)
|
||||||
map('n', 'gb', ':Gitsigns blame_line<CR>', opts)
|
map("n", "gb", ":Gitsigns blame_line<CR>", opts)
|
||||||
map('n', 'gi', ':Telescope lsp_implementations<CR>', opts)
|
map("n", "gi", ":Telescope lsp_implementations<CR>", opts)
|
||||||
map('n', 'gj', ':Telescope jumplist<CR>', opts)
|
map("n", "gj", ":Telescope jumplist<CR>", opts)
|
||||||
map('n', 'gl', vim.lsp.codelens.run, opts)
|
map("n", "gl", vim.lsp.codelens.run, opts)
|
||||||
map('n', 'gr', ':Telescope lsp_references<CR>', opts)
|
map("n", "gr", ":Telescope lsp_references<CR>", opts)
|
||||||
map('n', 'gs', vim.lsp.buf.signature_help, opts)
|
map("n", "gs", vim.lsp.buf.signature_help, opts)
|
||||||
map('n', 'K', vim.lsp.buf.hover, opts)
|
map("n", "K", vim.lsp.buf.hover, opts)
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ Code Companion and Copilot
|
--{{{ Code Companion and Copilot
|
||||||
map('n', '<leader>oc', ':CodeCompanionChat<CR>')
|
map("n", "<leader>oc", ":CodeCompanionChat<CR>")
|
||||||
map('n', '<leader>cc', ':CodeCompanionChat<CR>', opts)
|
map("n", "<leader>cc", ":CodeCompanionChat<CR>", opts)
|
||||||
map('n', '<leader>ci', ':CodeCompanion ', opts)
|
map("n", "<leader>ct", ":CodeCompanionChat Toggle<CR>", opts)
|
||||||
map('n', '<leader>cp', ':vert Copilot panel<CR>', opts)
|
map("n", "<leader>ci", ":CodeCompanion ", opts)
|
||||||
map('n', '<leader>Ca', ':CodeCompanionActions<CR>', opts)
|
map("n", "<leader>cp", ":vert Copilot panel<CR>", opts)
|
||||||
map('v', '<leader>Cc', ':CodeCompanionChat Add<CR>', opts)
|
map("n", "<leader>Ca", ":CodeCompanionActions<CR>", opts)
|
||||||
map('v', '<leader>Ce', ':CodeCompanion /explain<CR>', opts)
|
map("v", "<leader>Cc", ":CodeCompanionChat Add<CR>", opts)
|
||||||
map('v', '<leader>Cf', ':CodeCompanion /fix<CR>', opts)
|
map("v", "<leader>Ce", ":CodeCompanion /explain<CR>", opts)
|
||||||
map('v', '<leader>Cl', ':CodeCompanion /lsp<CR>', opts)
|
map("v", "<leader>Cf", ":CodeCompanion /fix<CR>", opts)
|
||||||
map('v', '<leader>CT', ':CodeCompanion /tests<CR>', opts)
|
map("v", "<leader>Cl", ":CodeCompanion /lsp<CR>", opts)
|
||||||
|
map("v", "<leader>CT", ":CodeCompanion /tests<CR>", opts)
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ Diagnostics
|
--{{{ Diagnostics
|
||||||
@ -137,88 +137,94 @@ map('v', '<leader>CT', ':CodeCompanion /tests<CR>', opts)
|
|||||||
-- nnoremap <leader>cDn :lua vim.diagnostic.goto_next()<CR>
|
-- nnoremap <leader>cDn :lua vim.diagnostic.goto_next()<CR>
|
||||||
-- nnoremap <leader>cDp :lua vim.diagnostic.goto_prev()<CR>
|
-- nnoremap <leader>cDp :lua vim.diagnostic.goto_prev()<CR>
|
||||||
-- nnoremap <leader>cl :lua vim.diagnostic.setloclist()<CR>
|
-- nnoremap <leader>cl :lua vim.diagnostic.setloclist()<CR>
|
||||||
map('n', "<leader>cd", ':Telescope diagnostics<CR>')
|
map("n", "<leader>cd", ":Telescope diagnostics<CR>")
|
||||||
map('n', "<leader>cDn", ':lua vim.diagnostic.goto_next()<CR>')
|
map("n", "<leader>cDn", ":lua vim.diagnostic.goto_next()<CR>")
|
||||||
map('n', "<leader>cDp", ':lua vim.diagnostic.goto_prev()<CR<CR>')
|
map("n", "<leader>cDp", ":lua vim.diagnostic.goto_prev()<CR<CR>")
|
||||||
map('n', "<leader>cd", ':lua vim.diagnostic.setloclist()<CR>')
|
map("n", "<leader>cd", ":lua vim.diagnostic.setloclist()<CR>")
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ Telescope mappings
|
--{{{ Telescope mappings
|
||||||
map('n', '//', ':Telescope current_buffer_fuzzy_find<CR>', opts)
|
map("n", "//", ":Telescope current_buffer_fuzzy_find<CR>", opts)
|
||||||
map('n', '??', ':Telescope lsp_document_symbols<CR>', opts)
|
map("n", "??", ":Telescope lsp_document_symbols<CR>", opts)
|
||||||
map('n', '<leader>fc',
|
map(
|
||||||
':Telescope color_names theme=dropdown layout_config={width=0.45,height=25,prompt_position="bottom"} layout_strategy=vertical<CR>',
|
"n",
|
||||||
opts)
|
"<leader>fc",
|
||||||
|
':Telescope color_names theme=dropdown layout_config={width=0.45,height=25,prompt_position="bottom"} layout_strategy=vertical<CR>',
|
||||||
|
opts
|
||||||
|
)
|
||||||
-- map('n', '<leader>ob', ':Telescope file_browser<CR>')
|
-- map('n', '<leader>ob', ':Telescope file_browser<CR>')
|
||||||
map('n', '<leader>ff', ':Telescope find_files<CR>', opts)
|
map("n", "<leader>ff", ":Telescope find_files<CR>", opts)
|
||||||
map('n', '<leader>sf', ':Telescope find_files<CR>', opts)
|
map("n", "<leader>sf", ":Telescope find_files<CR>", opts)
|
||||||
map('n', '<leader>fg', ':Telescope live_grep<CR>', opts)
|
map("n", "<leader>fg", ":Telescope live_grep<CR>", opts)
|
||||||
map('n', '<leader>fG',
|
map(
|
||||||
':Telescope glyph theme=dropdown layout_config={width=0.45,height=35,prompt_position="bottom"} layout_strategy=vertical<CR>',
|
"n",
|
||||||
opts)
|
"<leader>fG",
|
||||||
map('n', '<leader>fb', ':Telescope file_browser<CR>', opts)
|
':Telescope glyph theme=dropdown layout_config={width=0.45,height=35,prompt_position="bottom"} layout_strategy=vertical<CR>',
|
||||||
map('n', '<leader>fr', ':Telescope oldfiles<CR>', opts)
|
opts
|
||||||
|
)
|
||||||
|
map("n", "<leader>fb", ":Telescope file_browser<CR>", opts)
|
||||||
|
map("n", "<leader>fr", ":Telescope oldfiles<CR>", opts)
|
||||||
|
|
||||||
--{{{ Telescope Helper
|
--{{{ Telescope Helper
|
||||||
map('n', '<leader>hc', ':Telescope commands<CR>')
|
map("n", "<leader>hc", ":Telescope commands<CR>")
|
||||||
map('n', '<leader>hv', ':Telescope vim_options<CR>')
|
map("n", "<leader>hv", ":Telescope vim_options<CR>")
|
||||||
map('n', '<leader>hk', ':Telescope keymaps<CR>')
|
map("n", "<leader>hk", ":Telescope keymaps<CR>")
|
||||||
map('n', '<leader>hs', ':Telescope spell_suggest<CR>')
|
map("n", "<leader>hs", ":Telescope spell_suggest<CR>")
|
||||||
map('n', '<leader>hm', ':Telescope man_pages<CR>')
|
map("n", "<leader>hm", ":Telescope man_pages<CR>")
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ Telescope Search
|
--{{{ Telescope Search
|
||||||
map('n', '<leader>sf', ':Telescope find_files<CR>')
|
map("n", "<leader>sf", ":Telescope find_files<CR>")
|
||||||
map('n', '<leader>sg', ':Telescope live_grep<CR>')
|
map("n", "<leader>sg", ":Telescope live_grep<CR>")
|
||||||
map('n', '<leader>sh', ':Telescope command_history<CR>')
|
map("n", "<leader>sh", ":Telescope command_history<CR>")
|
||||||
map('n', '<leader>sm', ':Telescope man_pages<CR>')
|
map("n", "<leader>sm", ":Telescope man_pages<CR>")
|
||||||
map('n', '<leader>s/', ':Telescope search_history<CR>')
|
map("n", "<leader>s/", ":Telescope search_history<CR>")
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ File explorer and tools
|
--{{{ File explorer and tools
|
||||||
map('n', '<leader>n', ':NvimTreeToggle<CR>', opts)
|
map("n", "<leader>n", ":NvimTreeToggle<CR>", opts)
|
||||||
map('n', '<leader>D', ':Dotenv .env<CR>', opts)
|
map("n", "<leader>D", ":Dotenv .env<CR>", opts)
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ Git mappings
|
--{{{ Git mappings
|
||||||
map('n', '<leader>gc', ':Telescope git_commits<CR>', opts)
|
map("n", "<leader>gc", ":Telescope git_commits<CR>", opts)
|
||||||
map('n', '<leader>gf', ':Telescope git_files<CR>', opts)
|
map("n", "<leader>gf", ":Telescope git_files<CR>", opts)
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ Misc utilities
|
--{{{ Misc utilities
|
||||||
map('n', '<leader>x', '<cmd>!chmod +x %<CR>', opts)
|
map("n", "<leader>x", "<cmd>!chmod +x %<CR>", opts)
|
||||||
map('n', '<leader>y', '"+', opts)
|
map("n", "<leader>y", '"+', opts)
|
||||||
map('v', '<leader>y', '"+', opts)
|
map("v", "<leader>y", '"+', opts)
|
||||||
map('n', '<leader>sc', ':nohls<CR>')
|
map("n", "<leader>sc", ":nohls<CR>")
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ Goto Preview
|
--{{{ Goto Preview
|
||||||
map('n', "gpc", ':lua require("goto-preview").close_all_win()<CR>')
|
map("n", "gpc", ':lua require("goto-preview").close_all_win()<CR>')
|
||||||
map('n', "gpd", ':lua require("goto-preview").goto_preview_definition()<CR>')
|
map("n", "gpd", ':lua require("goto-preview").goto_preview_definition()<CR>')
|
||||||
map('n', "gpi", ':lua require("goto-preview").goto_preview_implementation()<CR>')
|
map("n", "gpi", ':lua require("goto-preview").goto_preview_implementation()<CR>')
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ Workspace management
|
--{{{ Workspace management
|
||||||
map('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
|
map("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, opts)
|
||||||
map('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
|
map("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, opts)
|
||||||
map('n', '<leader>wl', function()
|
map("n", "<leader>wl", function()
|
||||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||||
end, opts)
|
end, opts)
|
||||||
--}}}
|
--}}}
|
||||||
|
|
||||||
--{{{ LSP
|
--{{{ LSP
|
||||||
map('n', '<leader>ld', ':Telescope lsp_definitions<CR>')
|
map("n", "<leader>ld", ":Telescope lsp_definitions<CR>")
|
||||||
map('n', '<leader>lD', ':Telescope diagnostic<CR>')
|
map("n", "<leader>lD", ":Telescope diagnostic<CR>")
|
||||||
map('n', '<leader>la', ':lua vim.lsp.buf.code_action()<CR>')
|
map("n", "<leader>la", ":lua vim.lsp.buf.code_action()<CR>")
|
||||||
map('n', '<leader>lci', ':Telescope lsp_incoming_calls<CR>')
|
map("n", "<leader>lci", ":Telescope lsp_incoming_calls<CR>")
|
||||||
map('n', '<leader>lco', ':Telescope lsp_outgoing_calls<CR>')
|
map("n", "<leader>lco", ":Telescope lsp_outgoing_calls<CR>")
|
||||||
map('n', '<leader>lh', ':lua vim.lsp.buf.signature_help()<CR>')
|
map("n", "<leader>lh", ":lua vim.lsp.buf.signature_help()<CR>")
|
||||||
map('n', '<leader>li', ':Telescope lsp_implementations<CR>')
|
map("n", "<leader>li", ":Telescope lsp_implementations<CR>")
|
||||||
map('n', '<leader>lr', ':Telescope lsp_references<CR>')
|
map("n", "<leader>lr", ":Telescope lsp_references<CR>")
|
||||||
map('n', '<leader>lR', ':lua vim.lsp.buf.rename()<CR>')
|
map("n", "<leader>lR", ":lua vim.lsp.buf.rename()<CR>")
|
||||||
map('n', '<leader>ls', ':Telescope lsp_document_symbols<CR>')
|
map("n", "<leader>ls", ":Telescope lsp_document_symbols<CR>")
|
||||||
map('n', '<leader>lt', ':Telescope lsp_type_definitions<CR>')
|
map("n", "<leader>lt", ":Telescope lsp_type_definitions<CR>")
|
||||||
map('n', '<leader>lw', ':Telescope lsp_dynamic_workspace_symbols<CR>')
|
map("n", "<leader>lw", ":Telescope lsp_dynamic_workspace_symbols<CR>")
|
||||||
--}}}
|
--}}}
|
||||||
|
|||||||
@ -1,281 +1,326 @@
|
|||||||
local lsp_dev = {}
|
local lsp_dev = {}
|
||||||
|
|
||||||
vim.cmd [[packadd packer.nvim]]
|
vim.cmd([[packadd packer.nvim]])
|
||||||
require('packer').startup(function(use)
|
require("packer").startup(function(use)
|
||||||
use 'wbthomason/packer.nvim'
|
use("wbthomason/packer.nvim")
|
||||||
use 'nvim-lua/plenary.nvim'
|
use("nvim-lua/plenary.nvim")
|
||||||
use {
|
use({
|
||||||
'nvim-treesitter/nvim-treesitter',
|
"nvim-treesitter/nvim-treesitter",
|
||||||
run = function()
|
run = function()
|
||||||
require('nvim-treesitter.install').update({ with_sync = true })
|
require("nvim-treesitter.install").update({ with_sync = true })
|
||||||
end
|
end,
|
||||||
}
|
})
|
||||||
use { 'nvim-treesitter/nvim-treesitter-context' }
|
use({ "nvim-treesitter/nvim-treesitter-context" })
|
||||||
|
|
||||||
-- TELESCOPE {{{
|
use({
|
||||||
|
"kndndrj/nvim-dbee",
|
||||||
|
requires = {
|
||||||
|
"MunifTanjim/nui.nvim",
|
||||||
|
},
|
||||||
|
run = function()
|
||||||
|
-- Install tries to automatically detect the install method.
|
||||||
|
-- if it fails, try calling it with one of these parameters:
|
||||||
|
-- "curl", "wget", "bitsadmin", "go"
|
||||||
|
require("dbee").install()
|
||||||
|
end,
|
||||||
|
config = function()
|
||||||
|
require("dbee").setup( --[[optional config]])
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
use { 'nvim-telescope/telescope.nvim' }
|
-- TELESCOPE {{{
|
||||||
use { 'nvim-telescope/telescope-file-browser.nvim' }
|
|
||||||
use 'nvim-telescope/telescope-dap.nvim'
|
|
||||||
use { 'ghassan0/telescope-glyph.nvim' }
|
|
||||||
use { 'nat-418/telescope-color-names.nvim' }
|
|
||||||
use {
|
|
||||||
'nvim-telescope/telescope-fzf-native.nvim',
|
|
||||||
run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'
|
|
||||||
}
|
|
||||||
|
|
||||||
-- }}}
|
use({ "nvim-telescope/telescope.nvim" })
|
||||||
|
use({ "nvim-telescope/telescope-file-browser.nvim" })
|
||||||
|
use("nvim-telescope/telescope-dap.nvim")
|
||||||
|
use({ "ghassan0/telescope-glyph.nvim" })
|
||||||
|
use({ "nat-418/telescope-color-names.nvim" })
|
||||||
|
use({
|
||||||
|
"nvim-telescope/telescope-fzf-native.nvim",
|
||||||
|
run = "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build",
|
||||||
|
})
|
||||||
|
|
||||||
-- LSP/DEV {{{
|
-- }}}
|
||||||
use {
|
|
||||||
"zbirenbaum/copilot.lua",
|
|
||||||
cmd = "Copilot",
|
|
||||||
event = "InsertEnter",
|
|
||||||
config = function()
|
|
||||||
require("copilot").setup({
|
|
||||||
panel = {
|
|
||||||
enabled = true,
|
|
||||||
auto_refresh = false,
|
|
||||||
keymap = {
|
|
||||||
jump_prev = "[[",
|
|
||||||
jump_next = "]]",
|
|
||||||
accept = "<CR>",
|
|
||||||
refresh = "gr",
|
|
||||||
open = "<M-CR>"
|
|
||||||
},
|
|
||||||
layout = {
|
|
||||||
position = "bottom", -- | top | left | right | horizontal | vertical
|
|
||||||
ratio = 0.4
|
|
||||||
},
|
|
||||||
},
|
|
||||||
suggestion = {
|
|
||||||
enabled = false,
|
|
||||||
auto_trigger = false,
|
|
||||||
hide_during_completion = true,
|
|
||||||
debounce = 75,
|
|
||||||
keymap = {
|
|
||||||
accept = "<M-l>",
|
|
||||||
accept_word = false,
|
|
||||||
accept_line = false,
|
|
||||||
next = "<M-]>",
|
|
||||||
prev = "<M-[>",
|
|
||||||
dismiss = "<C-]>",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- filetypes = {
|
|
||||||
-- yaml = false,
|
|
||||||
-- markdown = false,
|
|
||||||
-- help = false,
|
|
||||||
-- gitcommit = false,
|
|
||||||
-- gitrebase = false,
|
|
||||||
-- hgcommit = false,
|
|
||||||
-- svn = false,
|
|
||||||
-- cvs = false,
|
|
||||||
-- ["."] = false,
|
|
||||||
-- },
|
|
||||||
copilot_node_command = 'node', -- Node.js version must be > 18.x
|
|
||||||
server_opts_overrides = {
|
|
||||||
trace = "verbose",
|
|
||||||
settings = {
|
|
||||||
advanced = {
|
|
||||||
listCount = 10, -- #completions for panel
|
|
||||||
inlineSuggestCount = 3, -- #completions for getCompletions
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
use { "zbirenbaum/copilot-cmp" }
|
|
||||||
|
|
||||||
use({
|
-- LSP/DEV {{{
|
||||||
"olimorris/codecompanion.nvim",
|
use({
|
||||||
requires = {
|
"zbirenbaum/copilot.lua",
|
||||||
"nvim-lua/plenary.nvim",
|
cmd = "Copilot",
|
||||||
"nvim-treesitter/nvim-treesitter",
|
event = "InsertEnter",
|
||||||
"j-hui/fidget.nvim"
|
config = function()
|
||||||
},
|
require("copilot").setup({
|
||||||
init = function()
|
panel = {
|
||||||
require("plugins.codecompanion.fidget-spinner"):init()
|
enabled = true,
|
||||||
end,
|
auto_refresh = false,
|
||||||
})
|
keymap = {
|
||||||
|
jump_prev = "[[",
|
||||||
|
jump_next = "]]",
|
||||||
|
accept = "<CR>",
|
||||||
|
refresh = "gr",
|
||||||
|
open = "<M-CR>",
|
||||||
|
},
|
||||||
|
layout = {
|
||||||
|
position = "bottom", -- | top | left | right | horizontal | vertical
|
||||||
|
ratio = 0.4,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
suggestion = {
|
||||||
|
enabled = false,
|
||||||
|
auto_trigger = false,
|
||||||
|
hide_during_completion = true,
|
||||||
|
debounce = 75,
|
||||||
|
keymap = {
|
||||||
|
accept = "<M-l>",
|
||||||
|
accept_word = false,
|
||||||
|
accept_line = false,
|
||||||
|
next = "<M-]>",
|
||||||
|
prev = "<M-[>",
|
||||||
|
dismiss = "<C-]>",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- filetypes = {
|
||||||
|
-- yaml = false,
|
||||||
|
-- markdown = false,
|
||||||
|
-- help = false,
|
||||||
|
-- gitcommit = false,
|
||||||
|
-- gitrebase = false,
|
||||||
|
-- hgcommit = false,
|
||||||
|
-- svn = false,
|
||||||
|
-- cvs = false,
|
||||||
|
-- ["."] = false,
|
||||||
|
-- },
|
||||||
|
copilot_node_command = "node", -- Node.js version must be > 18.x
|
||||||
|
server_opts_overrides = {
|
||||||
|
trace = "verbose",
|
||||||
|
settings = {
|
||||||
|
advanced = {
|
||||||
|
listCount = 10, -- #completions for panel
|
||||||
|
inlineSuggestCount = 3, -- #completions for getCompletions
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
use({ "zbirenbaum/copilot-cmp" })
|
||||||
|
|
||||||
use({
|
use({
|
||||||
"iamcco/markdown-preview.nvim",
|
"olimorris/codecompanion.nvim",
|
||||||
run = function() vim.fn["mkdp#util#install"]() end
|
requires = {
|
||||||
})
|
"nvim-lua/plenary.nvim",
|
||||||
use {
|
"nvim-treesitter/nvim-treesitter",
|
||||||
"L3MON4D3/LuaSnip",
|
"j-hui/fidget.nvim",
|
||||||
-- tag = "v2.*",
|
},
|
||||||
run = "make install_jsregexp",
|
init = function()
|
||||||
dependencies = { "rafamadriz/friendly-snippets" }
|
require("plugins.codecompanion.fidget-spinner"):init()
|
||||||
}
|
end,
|
||||||
use { 'folke/neodev.nvim' }
|
})
|
||||||
use { 'saadparwaiz1/cmp_luasnip' }
|
|
||||||
use { 'hrsh7th/cmp-buffer' }
|
|
||||||
use { 'hrsh7th/cmp-cmdline' }
|
|
||||||
use { 'hrsh7th/cmp-nvim-lsp' }
|
|
||||||
use { 'hrsh7th/cmp-nvim-lsp-document-symbol' }
|
|
||||||
use { 'hrsh7th/cmp-nvim-lsp-signature-help' }
|
|
||||||
use { 'hrsh7th/cmp-nvim-lua' }
|
|
||||||
use { 'hrsh7th/cmp-path' }
|
|
||||||
use { 'hrsh7th/nvim-cmp' }
|
|
||||||
use { 'https://git.sr.ht/~whynothugo/lsp_lines.nvim' }
|
|
||||||
-- use { 'jose-elias-alvarez/null-ls.nvim' }
|
|
||||||
use { 'nvimtools/none-ls.nvim' }
|
|
||||||
use { 'neovim/nvim-lspconfig' }
|
|
||||||
use { 'onsails/lspkind-nvim' }
|
|
||||||
use {
|
|
||||||
"https://git.sr.ht/~nedia/auto-format.nvim",
|
|
||||||
config = function()
|
|
||||||
require("auto-format").setup()
|
|
||||||
end
|
|
||||||
}
|
|
||||||
use 'mfussenegger/nvim-lint'
|
|
||||||
|
|
||||||
use 'nvim-neotest/nvim-nio'
|
use({
|
||||||
|
"iamcco/markdown-preview.nvim",
|
||||||
|
run = function()
|
||||||
|
vim.fn["mkdp#util#install"]()
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
use({
|
||||||
|
"L3MON4D3/LuaSnip",
|
||||||
|
-- tag = "v2.*",
|
||||||
|
run = "make install_jsregexp",
|
||||||
|
dependencies = { "rafamadriz/friendly-snippets" },
|
||||||
|
})
|
||||||
|
use({ "folke/neodev.nvim" })
|
||||||
|
use({ "saadparwaiz1/cmp_luasnip" })
|
||||||
|
use({ "hrsh7th/cmp-buffer" })
|
||||||
|
use({ "hrsh7th/cmp-cmdline" })
|
||||||
|
use({ "hrsh7th/cmp-nvim-lsp" })
|
||||||
|
use({ "hrsh7th/cmp-nvim-lsp-document-symbol" })
|
||||||
|
use({ "hrsh7th/cmp-nvim-lsp-signature-help" })
|
||||||
|
use({ "hrsh7th/cmp-nvim-lua" })
|
||||||
|
use({ "hrsh7th/cmp-path" })
|
||||||
|
use({ "hrsh7th/nvim-cmp" })
|
||||||
|
use({ "https://git.sr.ht/~whynothugo/lsp_lines.nvim" })
|
||||||
|
-- use { 'jose-elias-alvarez/null-ls.nvim' }
|
||||||
|
use({ "nvimtools/none-ls.nvim" })
|
||||||
|
use({ "neovim/nvim-lspconfig" })
|
||||||
|
use({ "onsails/lspkind-nvim" })
|
||||||
|
use({
|
||||||
|
"https://git.sr.ht/~nedia/auto-format.nvim",
|
||||||
|
config = function()
|
||||||
|
require("auto-format").setup()
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
use("mfussenegger/nvim-lint")
|
||||||
|
|
||||||
-- DADBOD {{{
|
use("nvim-neotest/nvim-nio")
|
||||||
|
-- }}}
|
||||||
|
|
||||||
-- use { 'tpope/vim-dadbod' }
|
-- DADBOD {{{
|
||||||
-- use { 'kristijanhusak/vim-dadbod-ui' }
|
|
||||||
-- use { 'kristijanhusak/vim-dadbod-completion' }
|
|
||||||
|
|
||||||
-- }}}
|
-- use { 'tpope/vim-dadbod' }
|
||||||
|
-- use { 'kristijanhusak/vim-dadbod-ui' }
|
||||||
|
-- use { 'kristijanhusak/vim-dadbod-completion' }
|
||||||
|
|
||||||
-- }}}
|
-- }}}
|
||||||
|
|
||||||
-- UI {{{
|
-- UI {{{
|
||||||
|
|
||||||
use { "akinsho/toggleterm.nvim", tag = '*' }
|
use({ "akinsho/toggleterm.nvim", tag = "*" })
|
||||||
use { 'HiPhish/rainbow-delimiters.nvim' }
|
use({ "HiPhish/rainbow-delimiters.nvim" })
|
||||||
use {
|
use({
|
||||||
"lukas-reineke/indent-blankline.nvim",
|
"lukas-reineke/indent-blankline.nvim",
|
||||||
-- config = function()
|
})
|
||||||
-- opts = {}
|
|
||||||
-- -- Other blankline configuration here
|
|
||||||
-- require("ibl").setup(require("indent-rainbowline").make_opts(opts))
|
|
||||||
-- end,
|
|
||||||
-- requires = { "TheGLander/indent-rainbowline.nvim" }
|
|
||||||
}
|
|
||||||
|
|
||||||
use {
|
--{{{ DASHBOARD
|
||||||
'glepnir/dashboard-nvim',
|
use({
|
||||||
-- event = 'VimEnter',
|
"nvimdev/dashboard-nvim",
|
||||||
requires = { 'nvim-tree/nvim-web-devicons' }
|
event = "VimEnter",
|
||||||
}
|
config = function()
|
||||||
use {
|
require("dashboard").setup({
|
||||||
'j-hui/fidget.nvim',
|
theme = "hyper",
|
||||||
tag = 'legacy',
|
config = {
|
||||||
config = function()
|
week_header = {
|
||||||
require("fidget").setup {
|
enable = true,
|
||||||
-- options
|
},
|
||||||
}
|
shortcut = {
|
||||||
end
|
{ desc = " Update", group = "@property", action = "Lazy update", key = "u" },
|
||||||
}
|
{
|
||||||
use {
|
icon = " ",
|
||||||
'nvim-lualine/lualine.nvim',
|
icon_hl = "@variable",
|
||||||
requires = { 'kyazdani42/nvim-web-devicons', opt = true }
|
desc = "Files",
|
||||||
}
|
group = "Label",
|
||||||
use { 'AndreM222/copilot-lualine' }
|
action = "Telescope find_files",
|
||||||
use { 'kyazdani42/nvim-web-devicons' }
|
key = "f",
|
||||||
use { 'norcalli/nvim-colorizer.lua' }
|
},
|
||||||
use { 'akinsho/nvim-bufferline.lua' }
|
{
|
||||||
use { 'andweeb/presence.nvim' }
|
desc = " Apps",
|
||||||
use { 'folke/which-key.nvim' }
|
group = "DiagnosticHint",
|
||||||
use { 'kyazdani42/nvim-tree.lua' }
|
action = "Telescope app",
|
||||||
use { 'lewis6991/gitsigns.nvim' }
|
key = "a",
|
||||||
use { 'rcarriga/nvim-notify' }
|
},
|
||||||
use { 'stevearc/dressing.nvim' }
|
{
|
||||||
use { 'echasnovski/mini.nvim' }
|
desc = " dotfiles",
|
||||||
|
group = "Number",
|
||||||
|
action = "Telescope ~/.config",
|
||||||
|
key = "d",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
requires = { "nvim-tree/nvim-web-devicons" },
|
||||||
|
})
|
||||||
|
--}}}
|
||||||
|
|
||||||
-- }}}
|
use({
|
||||||
|
"j-hui/fidget.nvim",
|
||||||
|
tag = "legacy",
|
||||||
|
config = function()
|
||||||
|
require("fidget").setup({
|
||||||
|
-- options
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
use({
|
||||||
|
"nvim-lualine/lualine.nvim",
|
||||||
|
requires = { "kyazdani42/nvim-web-devicons", opt = true },
|
||||||
|
})
|
||||||
|
use({ "AndreM222/copilot-lualine" })
|
||||||
|
use({ "kyazdani42/nvim-web-devicons" })
|
||||||
|
use({ "norcalli/nvim-colorizer.lua" })
|
||||||
|
use({ "akinsho/nvim-bufferline.lua" })
|
||||||
|
use({ "andweeb/presence.nvim" })
|
||||||
|
use({ "folke/which-key.nvim" })
|
||||||
|
use({ "kyazdani42/nvim-tree.lua" })
|
||||||
|
use({ "lewis6991/gitsigns.nvim" })
|
||||||
|
use({ "rcarriga/nvim-notify" })
|
||||||
|
use({ "stevearc/dressing.nvim" })
|
||||||
|
use({ "echasnovski/mini.nvim" })
|
||||||
|
|
||||||
-- EXTRAS {{{
|
-- }}}
|
||||||
|
|
||||||
use {
|
-- EXTRAS {{{
|
||||||
"nvim-neorg/neorg",
|
|
||||||
-- tag = "*",
|
|
||||||
ft = "norg",
|
|
||||||
after = "nvim-treesitter", -- You may want to specify Telescope here as well
|
|
||||||
config = function()
|
|
||||||
require('neorg').setup {
|
|
||||||
load = {
|
|
||||||
["core.defaults"] = {}, -- Loads default behaviour
|
|
||||||
["core.concealer"] = {}, -- Adds pretty icons to your documents
|
|
||||||
["core.completion"] = { config = { engine = "nvim-cmp" } }, -- Adds completion
|
|
||||||
["core.dirman"] = { -- Manages Neorg workspaces
|
|
||||||
config = { workspaces = { notes = "~/notes" } }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
|
||||||
}
|
|
||||||
use 'jiangmiao/auto-pairs'
|
|
||||||
use 'pechorin/any-jump.vim'
|
|
||||||
use 'tpope/vim-commentary'
|
|
||||||
use 'tpope/vim-dotenv'
|
|
||||||
use 'tpope/vim-surround'
|
|
||||||
-- use 'voldikss/vim-floaterm'
|
|
||||||
use 'wakatime/vim-wakatime'
|
|
||||||
use 'rmagatti/goto-preview'
|
|
||||||
|
|
||||||
-- }}}
|
use({
|
||||||
|
"nvim-neorg/neorg",
|
||||||
|
-- tag = "*",
|
||||||
|
ft = "norg",
|
||||||
|
after = "nvim-treesitter", -- You may want to specify Telescope here as well
|
||||||
|
config = function()
|
||||||
|
require("neorg").setup({
|
||||||
|
load = {
|
||||||
|
["core.defaults"] = {}, -- Loads default behaviour
|
||||||
|
["core.concealer"] = {}, -- Adds pretty icons to your documents
|
||||||
|
["core.completion"] = { config = { engine = "nvim-cmp" } }, -- Adds completion
|
||||||
|
["core.dirman"] = { -- Manages Neorg workspaces
|
||||||
|
config = { workspaces = { notes = "~/notes" } },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
use("jiangmiao/auto-pairs")
|
||||||
|
use("pechorin/any-jump.vim")
|
||||||
|
use("tpope/vim-commentary")
|
||||||
|
use("tpope/vim-dotenv")
|
||||||
|
use("tpope/vim-surround")
|
||||||
|
-- use 'voldikss/vim-floaterm'
|
||||||
|
use("wakatime/vim-wakatime")
|
||||||
|
use("rmagatti/goto-preview")
|
||||||
|
|
||||||
-- COLORSCHEMES {{{
|
-- }}}
|
||||||
|
|
||||||
use { 'Mofiqul/dracula.nvim' }
|
-- COLORSCHEMES {{{
|
||||||
-- use({
|
|
||||||
-- 'NTBBloodbath/doom-one.nvim',
|
|
||||||
-- setup = function()
|
|
||||||
-- -- Add color to cursor
|
|
||||||
-- vim.g.doom_one_cursor_coloring = false
|
|
||||||
-- -- Set :terminal colors
|
|
||||||
-- vim.g.doom_one_terminal_colors = true
|
|
||||||
-- -- Enable italic comments
|
|
||||||
-- vim.g.doom_one_italic_comments = false
|
|
||||||
-- -- Enable TS support
|
|
||||||
-- vim.g.doom_one_enable_treesitter = true
|
|
||||||
-- -- Color whole diagnostic text or only underline
|
|
||||||
-- vim.g.doom_one_diagnostics_text_color = false
|
|
||||||
-- -- Enable transparent background
|
|
||||||
-- vim.g.doom_one_transparent_background = false
|
|
||||||
|
|
||||||
-- -- Pumblend transparency
|
use({ "Mofiqul/dracula.nvim" })
|
||||||
-- vim.g.doom_one_pumblend_enable = false
|
-- use({
|
||||||
-- vim.g.doom_one_pumblend_transparency = 20
|
-- 'NTBBloodbath/doom-one.nvim',
|
||||||
|
-- setup = function()
|
||||||
|
-- -- Add color to cursor
|
||||||
|
-- vim.g.doom_one_cursor_coloring = false
|
||||||
|
-- -- Set :terminal colors
|
||||||
|
-- vim.g.doom_one_terminal_colors = true
|
||||||
|
-- -- Enable italic comments
|
||||||
|
-- vim.g.doom_one_italic_comments = false
|
||||||
|
-- -- Enable TS support
|
||||||
|
-- vim.g.doom_one_enable_treesitter = true
|
||||||
|
-- -- Color whole diagnostic text or only underline
|
||||||
|
-- vim.g.doom_one_diagnostics_text_color = false
|
||||||
|
-- -- Enable transparent background
|
||||||
|
-- vim.g.doom_one_transparent_background = false
|
||||||
|
|
||||||
-- -- Plugins integration
|
-- -- Pumblend transparency
|
||||||
-- vim.g.doom_one_plugin_neorg = true
|
-- vim.g.doom_one_pumblend_enable = false
|
||||||
-- vim.g.doom_one_plugin_barbar = false
|
-- vim.g.doom_one_pumblend_transparency = 20
|
||||||
-- vim.g.doom_one_plugin_telescope = true
|
|
||||||
-- vim.g.doom_one_plugin_neogit = true
|
|
||||||
-- vim.g.doom_one_plugin_nvim_tree = true
|
|
||||||
-- vim.g.doom_one_plugin_dashboard = true
|
|
||||||
-- vim.g.doom_one_plugin_startify = true
|
|
||||||
-- vim.g.doom_one_plugin_whichkey = true
|
|
||||||
-- vim.g.doom_one_plugin_indent_blankline = true
|
|
||||||
-- vim.g.doom_one_plugin_vim_illuminate = false
|
|
||||||
-- vim.g.doom_one_plugin_lspsaga = false
|
|
||||||
-- end
|
|
||||||
-- config = function()
|
|
||||||
-- vim.cmd("colorscheme doom-one")
|
|
||||||
-- vim.cmd(
|
|
||||||
-- "highlight Pmenu ctermfg=white ctermbg=black gui=NONE guifg=white guibg=#282C34")
|
|
||||||
-- vim.cmd("highlight PmenuSel guifg=purple guibg=red")
|
|
||||||
-- end
|
|
||||||
-- })
|
|
||||||
use { 'olimorris/onedarkpro.nvim' }
|
|
||||||
|
|
||||||
use {
|
-- -- Plugins integration
|
||||||
"catppuccin/nvim",
|
-- vim.g.doom_one_plugin_neorg = true
|
||||||
as = "catppuccin",
|
-- vim.g.doom_one_plugin_barbar = false
|
||||||
config = function()
|
-- vim.g.doom_one_plugin_telescope = true
|
||||||
vim.cmd("colorscheme catppuccin-macchiato")
|
-- vim.g.doom_one_plugin_neogit = true
|
||||||
end
|
-- vim.g.doom_one_plugin_nvim_tree = true
|
||||||
|
-- vim.g.doom_one_plugin_dashboard = true
|
||||||
|
-- vim.g.doom_one_plugin_startify = true
|
||||||
|
-- vim.g.doom_one_plugin_whichkey = true
|
||||||
|
-- vim.g.doom_one_plugin_indent_blankline = true
|
||||||
|
-- vim.g.doom_one_plugin_vim_illuminate = false
|
||||||
|
-- vim.g.doom_one_plugin_lspsaga = false
|
||||||
|
-- end
|
||||||
|
-- config = function()
|
||||||
|
-- vim.cmd("colorscheme doom-one")
|
||||||
|
-- vim.cmd(
|
||||||
|
-- "highlight Pmenu ctermfg=white ctermbg=black gui=NONE guifg=white guibg=#282C34")
|
||||||
|
-- vim.cmd("highlight PmenuSel guifg=purple guibg=red")
|
||||||
|
-- end
|
||||||
|
-- })
|
||||||
|
use({ "olimorris/onedarkpro.nvim" })
|
||||||
|
|
||||||
}
|
use({
|
||||||
|
"catppuccin/nvim",
|
||||||
|
as = "catppuccin",
|
||||||
|
config = function()
|
||||||
|
vim.cmd("colorscheme catppuccin-macchiato")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- }}}
|
-- }}}
|
||||||
end)
|
end)
|
||||||
|
|||||||
@ -32,7 +32,7 @@ require("null-ls").setup({
|
|||||||
null_ls.builtins.diagnostics.mypy,
|
null_ls.builtins.diagnostics.mypy,
|
||||||
null_ls.builtins.diagnostics.markdownlint,
|
null_ls.builtins.diagnostics.markdownlint,
|
||||||
null_ls.builtins.diagnostics.pylint,
|
null_ls.builtins.diagnostics.pylint,
|
||||||
null_ls.builtins.diagnostics.pycodestyle,
|
null_ls.builtins.diagnostics.pydoclint,
|
||||||
null_ls.builtins.formatting.stylua,
|
null_ls.builtins.formatting.stylua,
|
||||||
null_ls.builtins.formatting.markdownlint,
|
null_ls.builtins.formatting.markdownlint,
|
||||||
null_ls.builtins.formatting.prettier, -- handled by lsp server
|
null_ls.builtins.formatting.prettier, -- handled by lsp server
|
||||||
|
|||||||
@ -1,93 +0,0 @@
|
|||||||
local home = os.getenv('HOME')
|
|
||||||
local db = require('dashboard')
|
|
||||||
-- macos
|
|
||||||
-- db.preview_command = 'cat | lolcat -F 0.3'
|
|
||||||
-- linux
|
|
||||||
-- db.preview_command = 'ueberzug'
|
|
||||||
-- db.preview_file_path = home .. '/.config/nvim/static/neovim.cat'
|
|
||||||
-- db.preview_file_height = 11
|
|
||||||
-- db.preview_file_width = 70
|
|
||||||
vim.cmd('source $HOME/.config/nvim/static/nvim-dashboard.vim')
|
|
||||||
db.custom_center = {
|
|
||||||
{
|
|
||||||
icon = ' ',
|
|
||||||
desc = 'Recently latest session ',
|
|
||||||
shortcut = 'SPC s l',
|
|
||||||
action = 'SessionLoad'
|
|
||||||
}, {
|
|
||||||
icon = ' ',
|
|
||||||
desc = 'Recently opened files ',
|
|
||||||
action = 'Telescope oldfiles',
|
|
||||||
shortcut = 'SPC f h'
|
|
||||||
}, {
|
|
||||||
desc = 'Find File ',
|
|
||||||
icon = ' ',
|
|
||||||
action = 'Telescope find_files find_command=rg,--hidden,--files',
|
|
||||||
shortcut = 'SPC f f'
|
|
||||||
}, {
|
|
||||||
icon = ' ',
|
|
||||||
desc = 'File Browser ',
|
|
||||||
action = 'Telescope file_browser',
|
|
||||||
shortcut = 'SPC f b'
|
|
||||||
}, {
|
|
||||||
icon = ' ',
|
|
||||||
desc = 'Find word ',
|
|
||||||
action = 'Telescope live_grep',
|
|
||||||
shortcut = 'SPC f w'
|
|
||||||
}, {
|
|
||||||
icon = ' ',
|
|
||||||
desc = 'Open Personal dotfiles ',
|
|
||||||
action = ':e ~/.config/nvim/init.vim',
|
|
||||||
shortcut = 'SPC f d'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
require('dashboard').setup {
|
|
||||||
theme = 'doom', -- theme is doom and hyper default is hyper
|
|
||||||
disable_move = false, -- default is false disable move keymap for hyper
|
|
||||||
shortcut_type = 'number', -- shorcut type 'letter' or 'number'
|
|
||||||
change_to_vcs_root = false, -- default is false,for open file in hyper mru. it will change to the root of vcs
|
|
||||||
config = {
|
|
||||||
header = { "NVIM DASHBOARD" }, -- your header
|
|
||||||
center = {
|
|
||||||
{
|
|
||||||
icon = ' ',
|
|
||||||
icon_hl = 'Title',
|
|
||||||
desc = 'Open Recent',
|
|
||||||
desc_hl = 'String',
|
|
||||||
key = '1',
|
|
||||||
keymap = 'SPC f r',
|
|
||||||
key_hl = 'Number',
|
|
||||||
action = 'lua print(1)'
|
|
||||||
}, {
|
|
||||||
icon = ' ',
|
|
||||||
icon_hl = 'Title',
|
|
||||||
desc = 'Find File',
|
|
||||||
desc_hl = 'String',
|
|
||||||
key = '2',
|
|
||||||
key_hl = 'Number',
|
|
||||||
keymap = 'SPC f f',
|
|
||||||
action = 'lua print(2)'
|
|
||||||
}
|
|
||||||
|
|
||||||
-- {
|
|
||||||
-- icon = ' ',
|
|
||||||
-- desc = 'Find Dotfiles',
|
|
||||||
-- key = 'f',
|
|
||||||
-- keymap = 'SPC f d',
|
|
||||||
-- action = 'lua print(3)'
|
|
||||||
-- }
|
|
||||||
},
|
|
||||||
footer = {} -- your footer
|
|
||||||
},
|
|
||||||
hide = {
|
|
||||||
statusline = true, -- hide statusline default is true
|
|
||||||
tabline = true, -- hide the tabline
|
|
||||||
winbar = true -- hide winbar
|
|
||||||
}
|
|
||||||
-- preview = {
|
|
||||||
-- command = "bat", -- preview command
|
|
||||||
-- file_path -- preview file path
|
|
||||||
-- file_height -- preview file height
|
|
||||||
-- file_width -- preview file width
|
|
||||||
-- },
|
|
||||||
}
|
|
||||||
@ -1,27 +1,30 @@
|
|||||||
local highlight = {
|
local highlight = {
|
||||||
"RainbowRed",
|
"RainbowRed",
|
||||||
"RainbowYellow",
|
"RainbowYellow",
|
||||||
"RainbowBlue",
|
"RainbowBlue",
|
||||||
"RainbowOrange",
|
"RainbowOrange",
|
||||||
"RainbowGreen",
|
"RainbowGreen",
|
||||||
"RainbowViolet",
|
"RainbowViolet",
|
||||||
"RainbowCyan",
|
"RainbowCyan",
|
||||||
}
|
}
|
||||||
|
|
||||||
local hooks = require "ibl.hooks"
|
local hooks = require("ibl.hooks")
|
||||||
-- create the highlight groups in the highlight setup hook, so they are reset
|
-- create the highlight groups in the highlight setup hook, so they are reset
|
||||||
-- every time the colorscheme changes
|
-- every time the colorscheme changes
|
||||||
hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
|
hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
|
||||||
vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#ED8796" })
|
vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#ED8796" })
|
||||||
vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#EED49F" })
|
vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#EED49F" })
|
||||||
vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#8AADF4" })
|
vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#8AADF4" })
|
||||||
vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#F5A97F" })
|
vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#F5A97F" })
|
||||||
vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#A6DA95" })
|
vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#A6DA95" })
|
||||||
vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C6A0F6" })
|
vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C6A0F6" })
|
||||||
vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#8BD5CA" })
|
vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#8BD5CA" })
|
||||||
end)
|
end)
|
||||||
|
|
||||||
vim.g.rainbow_delimiters = { highlight = highlight }
|
vim.g.rainbow_delimiters = { highlight = highlight }
|
||||||
require("ibl").setup { scope = { highlight = highlight } }
|
require("ibl").setup({
|
||||||
|
scope = { highlight = highlight },
|
||||||
|
exclude = { filetypes = { "dashboard" } },
|
||||||
|
})
|
||||||
|
|
||||||
hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark)
|
hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark)
|
||||||
|
|||||||
@ -1,19 +1,17 @@
|
|||||||
require('plugins.ui.bufferline')
|
require("plugins.ui.bufferline")
|
||||||
require('plugins.ui.copilot-lualine')
|
require("plugins.ui.copilot-lualine")
|
||||||
require('plugins.ui.dashboard-nvim')
|
require("plugins.ui.fidget")
|
||||||
require('plugins.ui.fidget')
|
require("plugins.ui.gitsigns")
|
||||||
-- require('plugins.ui.git-blame')
|
require("plugins.ui.lualine")
|
||||||
require('plugins.ui.gitsigns')
|
require("plugins.ui.nvim-colorizer")
|
||||||
require('plugins.ui.lualine')
|
require("plugins.ui.nvim-notify")
|
||||||
require('plugins.ui.nvim-colorizer')
|
require("plugins.ui.nvimtree")
|
||||||
require('plugins.ui.nvim-notify')
|
require("plugins.ui.presence")
|
||||||
require('plugins.ui.nvimtree')
|
require("plugins.ui.rainbow-delimiters")
|
||||||
require('plugins.ui.presence')
|
require("plugins.ui.telescope-file-browser")
|
||||||
require('plugins.ui.rainbow-delimiters')
|
require("plugins.ui.telescope")
|
||||||
require('plugins.ui.telescope-file-browser')
|
require("plugins.ui.treesitter-context")
|
||||||
require('plugins.ui.telescope')
|
require("plugins.ui.treesitter")
|
||||||
require('plugins.ui.treesitter-context')
|
require("plugins.ui.whichkey")
|
||||||
require('plugins.ui.treesitter')
|
require("plugins.ui.indent-blankline")
|
||||||
require('plugins.ui.whichkey')
|
require("plugins.ui.toggleterm")
|
||||||
require('plugins.ui.indent-blankline')
|
|
||||||
require('plugins.ui.toggleterm')
|
|
||||||
|
|||||||
@ -1,8 +0,0 @@
|
|||||||
let g:dashboard_custom_header = [
|
|
||||||
\ ' ███╗ ██╗ ███████╗ ██████╗ ██╗ ██╗ ██╗ ███╗ ███╗',
|
|
||||||
\ ' ████╗ ██║ ██╔════╝██╔═══██╗ ██║ ██║ ██║ ████╗ ████║',
|
|
||||||
\ ' ██╔██╗ ██║ █████╗ ██║ ██║ ██║ ██║ ██║ ██╔████╔██║',
|
|
||||||
\ ' ██║╚██╗██║ ██╔══╝ ██║ ██║ ╚██╗ ██╔╝ ██║ ██║╚██╔╝██║',
|
|
||||||
\ ' ██║ ╚████║ ███████╗╚██████╔╝ ╚████╔╝ ██║ ██║ ╚═╝ ██║',
|
|
||||||
\ ' ╚═╝ ╚═══╝ ╚══════╝ ╚═════╝ ╚═══╝ ╚═╝ ╚═╝ ╚═╝',
|
|
||||||
\]
|
|
||||||
Loading…
x
Reference in New Issue
Block a user