Skip to content

Commit

Permalink
Lazy load all the plugins. Set keymaps with lazy.nvim
Browse files Browse the repository at this point in the history
  • Loading branch information
kuznetsss committed Jun 29, 2024
1 parent 186bdb5 commit c8b167f
Show file tree
Hide file tree
Showing 33 changed files with 492 additions and 317 deletions.
2 changes: 0 additions & 2 deletions ftplugin/http.lua

This file was deleted.

1 change: 0 additions & 1 deletion init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ require 'options'
require 'init_lazy'
require 'lsp'
require 'mappings'
require 'setup_dap'
require 'autocmd'
require 'neovide'
---
Expand Down
48 changes: 25 additions & 23 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,53 @@
{
"ChatGPT.nvim": { "branch": "main", "commit": "df53728e05129278d6ea26271ec086aa013bed90" },
"LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
"ChatGPT.nvim": { "branch": "main", "commit": "f081338f07216a46d3915ce46c1fcb083bcb5016" },
"LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
"alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
"copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
"copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" },
"copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" },
"cspell.nvim": { "branch": "main", "commit": "508b64a23bd8f9473c59d083a92712486f6f138d" },
"diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
"dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
"gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" },
"delegate.nvim": { "branch": "main", "commit": "b7c40a72019d799e3a49cb6be2791688a3de4fa4" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
"gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" },
"icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
"indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
"indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
"lazy-reload.nvim": { "branch": "main", "commit": "5b781fbd4e5eaa4002f5bd52ceb1febf07d5ecbf" },
"lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" },
"lazy.nvim": { "branch": "main", "commit": "0507e19289539396313503f6eb6b02bbe8a5e483" },
"lazydev.nvim": { "branch": "main", "commit": "78d8a11fbd02ad4eafa07dd8a43a959a69fb3bf8" },
"lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
"meadow.nvim": { "branch": "master", "commit": "6ae047827ff9b5062e6119acafa8a7b88f388308" },
"neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" },
"neogit": { "branch": "master", "commit": "4b9d1893bc303ba9c2a9fe7d42b59ba7eb70184a" },
"noice.nvim": { "branch": "main", "commit": "b828b575805f1b303c2f4b768744609835140739" },
"none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" },
"nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
"neogit": { "branch": "master", "commit": "76380b650ce2bb752cebf34a15583b9f2f141d62" },
"noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" },
"none-ls.nvim": { "branch": "main", "commit": "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91" },
"nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
"nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
"nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
"nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" },
"nvim-lspconfig": { "branch": "master", "commit": "7edfd6692ba17f8d4fe08d84142781898ab0a672" },
"nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
"nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
"nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
"nvim-treesitter": { "branch": "master", "commit": "26171d8f105d97746371d1b6c07c8d88bf13fec2" },
"nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" },
"nvim-treesitter": { "branch": "master", "commit": "f0e3b5c5fe38d0012c63368db90017fef87c85a2" },
"nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
"obsidian.nvim": { "branch": "main", "commit": "c6bd6d93e4724ac2dc0cae73ebe1d568bf406537" },
"octo.nvim": { "branch": "master", "commit": "22f34582a4eb1fb221eafd0daa9eb1b2bacfb813" },
"oil.nvim": { "branch": "master", "commit": "76bfc25520e4edc98d089d023b4ed06013639849" },
"obsidian.nvim": { "branch": "main", "commit": "f0bc495b4a3852a83b48636e9f564586f5e2d29e" },
"octo.nvim": { "branch": "master", "commit": "7731ca4e31b32c176a383642ffcd7d593ac17774" },
"oil.nvim": { "branch": "master", "commit": "65c53dbe4f2140236590a7568a5f22a77d16be39" },
"openingh.nvim": { "branch": "main", "commit": "613c18967d42202f3e2a9ac788caf62a402e7c1a" },
"persistence.nvim": { "branch": "main", "commit": "95d03ad5450389ad7dc2a0fab14ebb3d46bc2c96" },
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "073e45546acaff6b4248e3faea8e67b399d3e864" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "5c9660801ce345cd3835e1947c12b54290ab7e71" },
"rest.nvim": { "branch": "main", "commit": "1ce984c694345f3801bc656072f9a8dd51286a04" },
"telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
"telescope.nvim": { "branch": "master", "commit": "f12b15e1b3a33524eb06a1ae7bc852fb1fd92197" },
"toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
"vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }
"telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" },
"toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" }
}
2 changes: 1 addition & 1 deletion lua/autocmd.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ vim.api.nvim_create_autocmd({ 'TermOpen' }, {
-- })

vim.api.nvim_create_autocmd({ 'FileType' }, {
pattern = { 'lua,c,cpp,python,bash' },
pattern = { 'rust,go,lua,c,cpp,python,bash' },
callback = function()
vim.opt_local.colorcolumn = '81,82,83'
end,
Expand Down
1 change: 1 addition & 0 deletions lua/init_lazy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ end
vim.opt.rtp:prepend(lazypath)

require('lazy').setup('plugins', { dev = { path = '~/Documents/lua' } })
require('utils').nmap('<leader>ll', require('lazy').log)
101 changes: 1 addition & 100 deletions lua/mappings.lua
Original file line number Diff line number Diff line change
@@ -1,40 +1,13 @@
--[[
nnoremap <leader>r :source ~/.vim/vimrc<CR>
c>-]]
local map = require('utils').map
local nmap = require('utils').nmap
local imap = require('utils').imap
local press_key = require('utils').press_key

-- Disable help by F1
nmap('<F1>', '<Nop>')
imap('<F1>', '<Nop>')

-- nmap('<C-k>', ':bnext<CR>')
-- nmap('<C-j>', ':bprev<CR>')

nmap('<C-t>', function()
vim.cmd.ToggleTerm()
end)
map('t', '<C-t>', function()
press_key '<Esc>'
vim.cmd '1ToggleTerm'
end)
nmap('<A-t>', function()
local pathStr = vim.api.nvim_buf_get_name(0)
local path = require('plenary.path'):new(pathStr)
if not path:is_path() then
vim.notify('Current buffer is not a file', vim.log.levels.WARN)
return
end
vim.cmd.ToggleTerm('dir=' .. path:parent():expand())
end)

nmap('<C-h>', '<C-o>')
nmap('<C-l>', '<C-i>')

imap('<C-l>', '<C-^>')

vim.keymap.set(
't',
'<Esc>',
Expand All @@ -43,18 +16,15 @@ vim.keymap.set(
)

vim.api.nvim_create_user_command('LspLog', function()
vim.cmd.tabnew()
vim.cmd.edit(vim.lsp.get_log_path())
end, {})

-- Plugins

------ LSP
local telescope = require 'telescope.builtin'
nmap('gd', vim.lsp.buf.declaration)
nmap('gf', vim.lsp.buf.definition)
nmap('gs', vim.cmd.ClangdSwitchSourceHeader)
nmap('K', vim.lsp.buf.hover)
nmap('gr', telescope.lsp_references)
nmap('<leader>lh', function()
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
end)
Expand Down Expand Up @@ -86,77 +56,8 @@ nmap(']h', function()
vim.diagnostic.goto_next { severity = { max = vim.diagnostic.severity.INFO } }
end)

nmap('<leader>ds', telescope.lsp_document_symbols)
nmap('<leader>dS', telescope.lsp_workspace_symbols)
nmap('<leader>qf', vim.lsp.buf.code_action)
nmap('<leader>rn', vim.lsp.buf.rename)
nmap('<leader>cf', function()
vim.lsp.buf.format { async = true }
end)

-- DAP and debug
nmap('<F10>', require('dap').continue)
nmap('<F11>', require('dap').step_over)
nmap('<F12>', require('dap').step_into)
nmap('<leader>db', require('dap').toggle_breakpoint)

-- Gitsigns
local gs = require 'gitsigns'
nmap(']c', gs.next_hunk)
nmap('[c', gs.prev_hunk)
nmap('<leader>gp', gs.preview_hunk)
nmap('<leader>gr', gs.reset_hunk)
nmap('<leader>ga', gs.stage_hunk)

-- Neogit
local neogit = require 'neogit'
nmap('<leader>gg', function()
neogit.open { kind = 'split' }
end)

-- DiffView
nmap('<leader>gd', require('diffview').open)

------ nvim-tree
local nvim_tree_toggle = function()
require('nvim-tree.api').tree.toggle { find_file = true, update_root = true }
end
nmap('<F2>', nvim_tree_toggle)
imap('<F2>', function()
press_key '<Esc>'
nvim_tree_toggle()
end)

-- Telescope
nmap('<C-y>', function()
telescope.buffers { show_all_buffers = true }
end)
nmap('<leader>tc', telescope.commands)
nmap('<leader>th', telescope.command_history)
nmap('<leader>tH', telescope.highlights)
nmap('<leader>tk', telescope.keymaps)
nmap('<leader>tr', telescope.registers)
nmap('<leader>to', telescope.vim_options)
nmap('<leader>tm', telescope.help_tags)
nmap('<leader>ti', telescope.highlights)
nmap('<leader>tg', telescope.live_grep)
nmap('<leader>tw', telescope.grep_string)
nmap('<leader>ts', telescope.spell_suggest)
nmap('<leader>tq', telescope.quickfix)
nmap('<leader>tf', telescope.oldfiles)
nmap('<C-p>', telescope.find_files)
nmap('<leader>gb', telescope.git_branches)
nmap('<leader>gs', telescope.git_stash)
nmap('<leader>gc', telescope.git_commits)

-- Lazy mapping
nmap('<leader>ll', require('lazy').log)

-- ChatGPT
nmap('<leader>cg', vim.cmd.ChatGPT)

-- Restore session
nmap('<leader>ss', require('persistence').load)
nmap('<leader>sl', function()
require('persistence').load { last = true }
end)
1 change: 0 additions & 1 deletion lua/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ vim.opt.conceallevel = 0
vim.opt.list = true
vim.opt.listchars = { trail = '_', tab = '>-' }

vim.opt.grepprg = 'rg --vimgrep'
vim.g.mapleader = ' '

vim.opt.mouse = 'r'
Expand Down
3 changes: 2 additions & 1 deletion lua/plugins/copilot_lua.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ return {
require('copilot.command').disable()
end
end,
'Toggle copilot',
desc = 'Toggle copilot',
},
},
cmd = 'Copilot'
}
111 changes: 111 additions & 0 deletions lua/plugins/dap.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
local setup_dap = function()
local dap = require 'dap'
dap.adapters.lldb = {
type = 'executable',
command = '/opt/homebrew/opt/llvm@18/bin/lldb-dap',
name = 'lldb',
}

dap.configurations.cpp = {
{
name = 'Launch',
type = 'lldb',
request = 'launch',
program = function()
return vim.fn.input(
'Path to executable: ',
vim.fn.getcwd() .. '/',
'file'
)
end,
cwd = '${workspaceFolder}',
stopOnEntry = false,
args = function()
return vim.split(vim.fn.input 'Input args: ', ' ')
end,
initCommands = { 'command source ~/.lldbinit' },
},
{
-- If you get an "Operation not permitted" error using this, try disabling YAMA:
-- echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope
name = 'Attach to process',
type = 'lldb', -- Adjust this to match your adapter name (`dap.adapters.<name>`)
request = 'attach',
pid = require('dap.utils').pick_process,
args = {},
},
{
name = 'Load core file',
type = 'lldb',
request = 'attach',
program = function()
return vim.fn.input(
'Path to executable: ',
vim.fn.getcwd() .. '/',
'file'
)
end,
cwd = '${workspaceFolder}',
stopOnEntry = false,
coreFile = function()
return vim.fn.input('Corefile: ', vim.fn.getcwd() .. '/', 'file')
end,
},
}
dap.configurations.c = dap.configurations.cpp
end

return {
{
'mfussenegger/nvim-dap',
dependencies = {
'rcarriga/nvim-dap-ui',
'nvim-telescope/telescope-dap.nvim',
'nvim-neotest/nvim-nio',
},
lazy = true,
config = function()
local dap, dapui = require 'dap', require 'dapui'
dapui.setup()
dap.listeners.after.event_initialized['dapui_config'] = function()
dapui.open()
end
dap.listeners.before.event_exited['dapui_config'] = function()
dapui.close()
end
setup_dap()
vim.api.nvim_create_user_command('DapUiToggle', function()
dapui.toggle()
end, {})
end,
keys = {
{
'<F10>',
function()
require('dap').continue()
end,
},
{
'<F11>',
function()
require('dap').step_over()
end,
},
{
'<F12>',
function()
require('dap').step_into()
end,
},
{
'<leader>db',
function()
require('dap').toggle_breakpoint()
end,
},
},
cmd = {
'DapUiToggle',
},
},
}
26 changes: 0 additions & 26 deletions lua/plugins/debug.lua

This file was deleted.

Loading

0 comments on commit c8b167f

Please sign in to comment.