Merge pull request #1 from shazow/main
WIP: Migrating nvim to lazy.nvim
This commit is contained in:
Tyrel Souza
GitHub
commit
8cd735c5f8
|
|
@ -1,175 +1,19 @@
|
|||
require("settings")
|
||||
|
||||
-- TODO: Probably don't need this anymore?
|
||||
vim.g.python3_host_prog = '/opt/nvimpython/.nvim.pythonenv/bin/python3'
|
||||
|
||||
-- Install Packer automatically:
|
||||
local ensure_packer = function()
|
||||
local fn = vim.fn
|
||||
local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
|
||||
if fn.empty(fn.glob(install_path)) > 0 then
|
||||
fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
|
||||
vim.cmd [[packadd packer.nvim]]
|
||||
return true
|
||||
end
|
||||
return false
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
return require('packer').startup(function(use)
|
||||
-- Packer can manage itself
|
||||
use("wbthomason/packer.nvim")
|
||||
|
||||
require("plugins")(use)
|
||||
|
||||
local packer_bootstrap = ensure_packer()
|
||||
if packer_bootstrap then
|
||||
require('packer').sync()
|
||||
end
|
||||
|
||||
require("mason").setup()
|
||||
|
||||
local rt = require("rust-tools")
|
||||
rt.setup({
|
||||
server = {
|
||||
on_attach = function(_, bufnr)
|
||||
-- Hover actions
|
||||
vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr })
|
||||
-- Code action groups
|
||||
vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
|
||||
end,
|
||||
},
|
||||
})
|
||||
-- LSP Diagnostics Options Setup
|
||||
local sign = function(opts)
|
||||
vim.fn.sign_define(opts.name, {
|
||||
texthl = opts.name,
|
||||
text = opts.text,
|
||||
numhl = ''
|
||||
})
|
||||
end
|
||||
|
||||
sign({name = 'DiagnosticSignError', text = ''})
|
||||
sign({name = 'DiagnosticSignWarn', text = ''})
|
||||
sign({name = 'DiagnosticSignHint', text = ''})
|
||||
sign({name = 'DiagnosticSignInfo', text = ''})
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false,
|
||||
signs = true,
|
||||
update_in_insert = true,
|
||||
underline = true,
|
||||
severity_sort = false,
|
||||
float = {
|
||||
border = 'rounded',
|
||||
source = 'always',
|
||||
header = '',
|
||||
prefix = '',
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd([[
|
||||
set signcolumn=yes
|
||||
autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
|
||||
]])
|
||||
|
||||
|
||||
-- Completion Plugin Setup
|
||||
local cmp = require'cmp'
|
||||
cmp.setup({
|
||||
-- Enable LSP snippets
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
||||
-- Add tab support
|
||||
['<S-Tab>'] = cmp.mapping.select_prev_item(),
|
||||
['<Tab>'] = cmp.mapping.select_next_item(),
|
||||
['<C-S-f>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<C-e>'] = cmp.mapping.close(),
|
||||
['<CR>'] = cmp.mapping.confirm({
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true,
|
||||
})
|
||||
},
|
||||
-- Installed sources:
|
||||
sources = {
|
||||
{ name = 'path' }, -- file paths
|
||||
{ name = 'nvim_lsp', keyword_length = 3 }, -- from language server
|
||||
{ name = 'nvim_lsp_signature_help'}, -- display function signatures with current parameter emphasized
|
||||
{ name = 'nvim_lua', keyword_length = 2}, -- complete neovim's Lua runtime API such vim.lsp.*
|
||||
{ name = 'buffer', keyword_length = 2 }, -- source current buffer
|
||||
{ name = 'vsnip', keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
|
||||
{ name = 'calc'}, -- source for math calculation
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
formatting = {
|
||||
fields = {'menu', 'abbr', 'kind'},
|
||||
format = function(entry, item)
|
||||
local menu_icon ={
|
||||
nvim_lsp = 'λ',
|
||||
vsnip = '⋗',
|
||||
buffer = 'Ω',
|
||||
path = '🖫',
|
||||
}
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
require("nvim-treesitter.configs").setup({
|
||||
highlight = { enable = true, disable = { "lua" } },
|
||||
indent = { enable = true },
|
||||
refactor = { highlight_definitions = { enable = true } },
|
||||
incremental_selection = { enable = true },
|
||||
matchup = { enable = true },
|
||||
textsubjects = {
|
||||
enable = true,
|
||||
prev_selection = ",",
|
||||
keymaps = {
|
||||
["."] = "textsubjects-smart",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
-- Vimspector
|
||||
-- KEYS
|
||||
vim.cmd([[
|
||||
nmap <Leader><F6> <cmd>call vimspector#Launch()<cr>
|
||||
nmap <Leader><F7> <cmd>call vimspector#StepOver()<cr>
|
||||
nmap <Leader><F4> <cmd>call vimspector#Reset()<cr>
|
||||
nmap <Leader><F11> <cmd>call vimspector#StepOver()<cr>
|
||||
nmap <Leader><F12> <cmd>call vimspector#StepOut()<cr>
|
||||
nmap <Leader><F10> <cmd>call vimspector#StepInto()<cr>
|
||||
nmap <Leader>Db <cmd>:call vimspector#ToggleBreakpoint()<cr>
|
||||
nmap <Leader>Dw <cmd>:call vimspector#AddWatch()<cr>
|
||||
nmap <Leader>De <cmd>:call vimspector#Evaluate()<cr>
|
||||
]])
|
||||
-- OPTS
|
||||
vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'}
|
||||
vim.opt.shortmess = vim.opt.shortmess + { c = true}
|
||||
vim.api.nvim_set_option('updatetime', 300)
|
||||
-- Fixed column for diagnostics to appear
|
||||
-- Show autodiagnostic popup on cursor hover_range
|
||||
-- Goto previous / next diagnostic warning / error
|
||||
-- Show inlay_hints more frequently
|
||||
vim.cmd([[
|
||||
set signcolumn=yes
|
||||
autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
|
||||
]])
|
||||
vim.cmd([[
|
||||
let g:vimspector_sidebar_width = 85
|
||||
let g:vimspector_bottombar_height = 15
|
||||
let g:vimspector_terminal_maxwidth = 70
|
||||
]])
|
||||
end)
|
||||
|
||||
require("settings")
|
||||
require("lazy").setup("plugins")
|
||||
|
|
|
|||
|
|
@ -1,111 +0,0 @@
|
|||
vim.cmd([[autocmd BufWritePost plugins.lua PackerCompile]])
|
||||
|
||||
return function(use)
|
||||
use({'SirVer/ultisnips'})
|
||||
use({'honza/vim-snippets'})
|
||||
|
||||
use({'williamboman/mason.nvim'})
|
||||
use({'williamboman/mason-lspconfig.nvim'})
|
||||
use({'neovim/nvim-lspconfig'})
|
||||
require'lspconfig'.gopls.setup{ 'gopls' }
|
||||
|
||||
use({'simrat39/rust-tools.nvim'})
|
||||
use({'hrsh7th/nvim-cmp'})
|
||||
use({'hrsh7th/cmp-nvim-lsp'})
|
||||
use({'hrsh7th/cmp-nvim-lua'})
|
||||
use({'hrsh7th/cmp-nvim-lsp-signature-help'})
|
||||
use({'hrsh7th/cmp-vsnip'})
|
||||
use({'hrsh7th/cmp-path'})
|
||||
use({'hrsh7th/cmp-buffer'})
|
||||
use({'hrsh7th/vim-vsnip'})
|
||||
|
||||
use({'atelierbram/vim-colors_atelier-schemes'})
|
||||
-- use({'liuchengxu/space-vim-dark'})
|
||||
|
||||
use({'robertmeta/nofrils'})
|
||||
use({'vim-test/vim-test'})
|
||||
use({'hashivim/vim-terraform'})
|
||||
use({'rmagatti/auto-session'})
|
||||
use({'ludovicchabant/vim-gutentags'})
|
||||
use({'preservim/nerdtree'})
|
||||
use({'junegunn/fzf', dir='~/.fzf'})
|
||||
use({'junegunn/fzf.vim'})
|
||||
use({'mhinz/vim-startify'})
|
||||
use({'jeetsukumaran/vim-buffergator'})
|
||||
use({'ap/vim-buftabline'})
|
||||
use({'airblade/vim-gitgutter'})
|
||||
use({'majutsushi/tagbar'})
|
||||
use {'nvim-lualine/lualine.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true } }
|
||||
use({'arkav/lualine-lsp-progress'})
|
||||
require('lualine').setup({
|
||||
options = { theme = 'palenight' },
|
||||
sections = {
|
||||
lualine_b ={ {'filename', path=1} },
|
||||
lualine_c = {
|
||||
'lsp_progress'
|
||||
}
|
||||
},
|
||||
inactive_sections = {
|
||||
lualine_a = {},
|
||||
lualine_b ={ {'filename', path=1} },
|
||||
lualine_c = {},
|
||||
lualine_d = {},
|
||||
lualine_e = {},
|
||||
}
|
||||
})
|
||||
use({'voldikss/vim-floaterm'})
|
||||
use({'fatih/vim-go'})
|
||||
use({'whatyouhide/vim-gotham'})
|
||||
use({'nanotech/jellybeans.vim'})
|
||||
use({'sickill/vim-monokai'})
|
||||
use({'tpope/vim-fugitive'})
|
||||
use({'tpope/vim-rhubarb'})
|
||||
use({'gf3/peg.vim'})
|
||||
use({'nvim-lua/plenary.nvim'})
|
||||
|
||||
use({ 'nvim-telescope/telescope.nvim', config = function () require('telescope').setup{ file_ignore_patterns = {'node_modules','./venv/'} } end })
|
||||
use({'nvim-telescope/telescope-project.nvim'})
|
||||
-- require'telescope'.load_extension('project')
|
||||
|
||||
use({'puremourning/vimspector'})
|
||||
use({'airblade/vim-rooter'})
|
||||
|
||||
-- Debugging
|
||||
use 'mfussenegger/nvim-dap'
|
||||
|
||||
local rt = require('rust-tools')
|
||||
rt.setup({
|
||||
server = {
|
||||
on_attach = function(_, bufnr)
|
||||
-- Hover actions
|
||||
vim.keymap.set('n', '<C-space>', rt.hover_actions.hover_actions, { buffer = bufnr })
|
||||
-- Code action groups
|
||||
vim.keymap.set('n', '<Leader>a', rt.code_action_group.code_action_group, { buffer = bufnr })
|
||||
end,
|
||||
},
|
||||
})
|
||||
use({'lukas-reineke/indent-blankline.nvim'})
|
||||
|
||||
use({'fredeeb/tardis.nvim', config = true })
|
||||
require('tardis-nvim').setup({
|
||||
keymap = {
|
||||
next = '<C-n>', -- next entry in log (older)
|
||||
prev = '<C-m>', -- previous entry in log (newer)
|
||||
quit = 'q', -- quit all
|
||||
commit_message = 'm', -- show commit message for current commit in buffer
|
||||
},
|
||||
commits = 32, -- max number of commits to read
|
||||
})
|
||||
|
||||
use({'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' })
|
||||
use({'nvim-treesitter/nvim-treesitter-refactor'})
|
||||
use({'RRethy/nvim-treesitter-textsubjects'})
|
||||
require("nvim-treesitter.configs").setup({
|
||||
highlight = { enable = true, disable = { "lua" } },
|
||||
indent = { enable = true },
|
||||
refactor = { highlight_definitions = { enable = true } },
|
||||
matchup = { enable = true },
|
||||
})
|
||||
|
||||
|
||||
end
|
||||
|
|
@ -0,0 +1,209 @@
|
|||
-- NOTE: lazy.nvim reads plugins/*.lua, so feel free to break these up into convenient chunks
|
||||
|
||||
return {
|
||||
{ 'SirVer/ultisnips' },
|
||||
{ 'honza/vim-snippets' },
|
||||
|
||||
{
|
||||
'williamboman/mason.nvim',
|
||||
config = function()
|
||||
require("mason").setup()
|
||||
end
|
||||
},
|
||||
{ 'williamboman/mason-lspconfig.nvim' },
|
||||
{
|
||||
'neovim/nvim-lspconfig',
|
||||
config = function()
|
||||
require 'lspconfig'.gopls.setup { 'gopls' }
|
||||
end
|
||||
},
|
||||
|
||||
{
|
||||
'simrat39/rust-tools.nvim',
|
||||
config = function()
|
||||
local rt = require('rust-tools')
|
||||
rt.setup({
|
||||
server = {
|
||||
on_attach = function(_, bufnr)
|
||||
-- Hover actions
|
||||
vim.keymap.set('n', '<C-space>', rt.hover_actions.hover_actions, { buffer = bufnr })
|
||||
-- Code action groups
|
||||
vim.keymap.set('n', '<Leader>a', rt.code_action_group.code_action_group, { buffer = bufnr })
|
||||
end,
|
||||
},
|
||||
})
|
||||
end
|
||||
},
|
||||
{
|
||||
'hrsh7th/nvim-cmp',
|
||||
config = function()
|
||||
-- Completion Plugin Setup
|
||||
local cmp = require 'cmp'
|
||||
cmp.setup({
|
||||
-- Enable LSP snippets
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
||||
-- Add tab support
|
||||
['<S-Tab>'] = cmp.mapping.select_prev_item(),
|
||||
['<Tab>'] = cmp.mapping.select_next_item(),
|
||||
['<C-S-f>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<C-e>'] = cmp.mapping.close(),
|
||||
['<CR>'] = cmp.mapping.confirm({
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true,
|
||||
})
|
||||
},
|
||||
-- Installed sources:
|
||||
sources = {
|
||||
{ name = 'path' }, -- file paths
|
||||
{ name = 'nvim_lsp', keyword_length = 3 }, -- from language server
|
||||
{ name = 'nvim_lsp_signature_help' }, -- display function signatures with current parameter emphasized
|
||||
{ name = 'nvim_lua', keyword_length = 2 }, -- complete neovim's Lua runtime API such vim.lsp.*
|
||||
{ name = 'buffer', keyword_length = 2 }, -- source current buffer
|
||||
{ name = 'vsnip', keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
|
||||
{ name = 'calc' }, -- source for math calculation
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
formatting = {
|
||||
fields = { 'menu', 'abbr', 'kind' },
|
||||
format = function(entry, item)
|
||||
local menu_icon = {
|
||||
nvim_lsp = 'λ',
|
||||
vsnip = '⋗',
|
||||
buffer = 'Ω',
|
||||
path = '🖫',
|
||||
}
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
},
|
||||
})
|
||||
end
|
||||
},
|
||||
{ 'hrsh7th/cmp-nvim-lsp' },
|
||||
{ 'hrsh7th/cmp-nvim-lua' },
|
||||
{ 'hrsh7th/cmp-nvim-lsp-signature-help' },
|
||||
{ 'hrsh7th/cmp-vsnip' },
|
||||
{ 'hrsh7th/cmp-path' },
|
||||
{ 'hrsh7th/cmp-buffer' },
|
||||
{ 'hrsh7th/vim-vsnip' },
|
||||
|
||||
{ 'atelierbram/vim-colors_atelier-schemes' },
|
||||
-- {'liuchengxu/space-vim-dark'},
|
||||
|
||||
{ 'robertmeta/nofrils' },
|
||||
{ 'vim-test/vim-test' },
|
||||
{ 'hashivim/vim-terraform' },
|
||||
{ 'rmagatti/auto-session' },
|
||||
{ 'ludovicchabant/vim-gutentags' },
|
||||
{ 'preservim/nerdtree' },
|
||||
{ 'junegunn/fzf' }, -- FIXME: Not sure what this does? dir = '~/.fzf'
|
||||
{ 'junegunn/fzf.vim' },
|
||||
{ 'mhinz/vim-startify' },
|
||||
{ 'jeetsukumaran/vim-buffergator' },
|
||||
{ 'ap/vim-buftabline' },
|
||||
{ 'airblade/vim-gitgutter' },
|
||||
{ 'majutsushi/tagbar' },
|
||||
{
|
||||
'nvim-lualine/lualine.nvim',
|
||||
dependencies = {
|
||||
{ 'kyazdani42/nvim-web-devicons', lazy = true },
|
||||
}
|
||||
},
|
||||
{
|
||||
'arkav/lualine-lsp-progress',
|
||||
config = function()
|
||||
require('lualine').setup({
|
||||
options = { theme = 'palenight' },
|
||||
sections = {
|
||||
lualine_b = { { 'filename', path = 1 } },
|
||||
lualine_c = {
|
||||
'lsp_progress'
|
||||
}
|
||||
},
|
||||
inactive_sections = {
|
||||
lualine_a = {},
|
||||
lualine_b = { { 'filename', path = 1 } },
|
||||
lualine_c = {},
|
||||
lualine_d = {},
|
||||
lualine_e = {},
|
||||
}
|
||||
})
|
||||
end
|
||||
},
|
||||
{ 'voldikss/vim-floaterm' },
|
||||
{ 'fatih/vim-go' },
|
||||
{ 'whatyouhide/vim-gotham' },
|
||||
{ 'nanotech/jellybeans.vim' },
|
||||
{ 'sickill/vim-monokai' },
|
||||
{ 'tpope/vim-fugitive' },
|
||||
{ 'tpope/vim-rhubarb' },
|
||||
{ 'gf3/peg.vim' },
|
||||
{ 'nvim-lua/plenary.nvim' },
|
||||
{
|
||||
'nvim-telescope/telescope.nvim',
|
||||
config = function()
|
||||
require('telescope').setup { file_ignore_patterns = {
|
||||
'node_modules', './venv/' } }
|
||||
end
|
||||
},
|
||||
{ 'nvim-telescope/telescope-project.nvim' },
|
||||
-- require'telescope'.load_extension('project')
|
||||
|
||||
{ 'puremourning/vimspector' },
|
||||
{ 'airblade/vim-rooter' },
|
||||
|
||||
-- Debugging
|
||||
{ 'mfussenegger/nvim-dap' },
|
||||
|
||||
{ 'lukas-reineke/indent-blankline.nvim' },
|
||||
|
||||
{
|
||||
'fredeeb/tardis.nvim',
|
||||
config = function()
|
||||
require('tardis-nvim').setup({
|
||||
keymap = {
|
||||
next = '<C-n>', -- next entry in log (older)
|
||||
prev = '<C-m>', -- previous entry in log (newer)
|
||||
quit = 'q', -- quit all
|
||||
commit_message = 'm', -- show commit message for current commit in buffer
|
||||
},
|
||||
commits = 32, -- max number of commits to read
|
||||
})
|
||||
end
|
||||
},
|
||||
|
||||
{
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
build = ':TSUpdate',
|
||||
config = function()
|
||||
require("nvim-treesitter.configs").setup({
|
||||
highlight = { enable = true, disable = { "lua" } },
|
||||
indent = { enable = true },
|
||||
refactor = { highlight_definitions = { enable = true } },
|
||||
incremental_selection = { enable = true },
|
||||
matchup = { enable = true },
|
||||
textsubjects = {
|
||||
enable = true,
|
||||
prev_selection = ",",
|
||||
keymaps = {
|
||||
["."] = "textsubjects-smart",
|
||||
},
|
||||
},
|
||||
})
|
||||
end
|
||||
},
|
||||
{ 'nvim-treesitter/nvim-treesitter-refactor' },
|
||||
{ 'RRethy/nvim-treesitter-textsubjects' },
|
||||
}
|
||||
|
|
@ -131,5 +131,70 @@ vim.api.nvim_set_keymap("i", "<F1>", "<Esc>", {silent = true })
|
|||
vim.api.nvim_set_keymap("n", "<F8>", ":Tagbar<CR>", {silent = true })
|
||||
|
||||
|
||||
-- LSP Diagnostics Options Setup
|
||||
local sign = function(opts)
|
||||
vim.fn.sign_define(opts.name, {
|
||||
texthl = opts.name,
|
||||
text = opts.text,
|
||||
numhl = ''
|
||||
})
|
||||
end
|
||||
|
||||
sign({name = 'DiagnosticSignError', text = ''})
|
||||
sign({name = 'DiagnosticSignWarn', text = ''})
|
||||
sign({name = 'DiagnosticSignHint', text = ''})
|
||||
sign({name = 'DiagnosticSignInfo', text = ''})
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false,
|
||||
signs = true,
|
||||
update_in_insert = true,
|
||||
underline = true,
|
||||
severity_sort = false,
|
||||
float = {
|
||||
border = 'rounded',
|
||||
source = 'always',
|
||||
header = '',
|
||||
prefix = '',
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd([[
|
||||
set signcolumn=yes
|
||||
autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
|
||||
]])
|
||||
|
||||
|
||||
|
||||
|
||||
-- Vimspector
|
||||
-- KEYS
|
||||
vim.cmd([[
|
||||
nmap <Leader><F6> <cmd>call vimspector#Launch()<cr>
|
||||
nmap <Leader><F7> <cmd>call vimspector#StepOver()<cr>
|
||||
nmap <Leader><F4> <cmd>call vimspector#Reset()<cr>
|
||||
nmap <Leader><F11> <cmd>call vimspector#StepOver()<cr>
|
||||
nmap <Leader><F12> <cmd>call vimspector#StepOut()<cr>
|
||||
nmap <Leader><F10> <cmd>call vimspector#StepInto()<cr>
|
||||
nmap <Leader>Db <cmd>:call vimspector#ToggleBreakpoint()<cr>
|
||||
nmap <Leader>Dw <cmd>:call vimspector#AddWatch()<cr>
|
||||
nmap <Leader>De <cmd>:call vimspector#Evaluate()<cr>
|
||||
]])
|
||||
-- OPTS
|
||||
vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'}
|
||||
vim.opt.shortmess = vim.opt.shortmess + { c = true}
|
||||
vim.api.nvim_set_option('updatetime', 300)
|
||||
-- Fixed column for diagnostics to appear
|
||||
-- Show autodiagnostic popup on cursor hover_range
|
||||
-- Goto previous / next diagnostic warning / error
|
||||
-- Show inlay_hints more frequently
|
||||
vim.cmd([[
|
||||
set signcolumn=yes
|
||||
autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
|
||||
]])
|
||||
vim.cmd([[
|
||||
let g:vimspector_sidebar_width = 85
|
||||
let g:vimspector_bottombar_height = 15
|
||||
let g:vimspector_terminal_maxwidth = 70
|
||||
]])
|
||||
|
||||
|
|
|
|||
|
|
@ -1,350 +0,0 @@
|
|||
-- Automatically generated packer.nvim plugin loader code
|
||||
|
||||
if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
|
||||
vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
|
||||
return
|
||||
end
|
||||
|
||||
vim.api.nvim_command('packadd packer.nvim')
|
||||
|
||||
local no_errors, error_msg = pcall(function()
|
||||
|
||||
_G._packer = _G._packer or {}
|
||||
_G._packer.inside_compile = true
|
||||
|
||||
local time
|
||||
local profile_info
|
||||
local should_profile = false
|
||||
if should_profile then
|
||||
local hrtime = vim.loop.hrtime
|
||||
profile_info = {}
|
||||
time = function(chunk, start)
|
||||
if start then
|
||||
profile_info[chunk] = hrtime()
|
||||
else
|
||||
profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
|
||||
end
|
||||
end
|
||||
else
|
||||
time = function(chunk, start) end
|
||||
end
|
||||
|
||||
local function save_profiles(threshold)
|
||||
local sorted_times = {}
|
||||
for chunk_name, time_taken in pairs(profile_info) do
|
||||
sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
|
||||
end
|
||||
table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
|
||||
local results = {}
|
||||
for i, elem in ipairs(sorted_times) do
|
||||
if not threshold or threshold and elem[2] > threshold then
|
||||
results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
|
||||
end
|
||||
end
|
||||
if threshold then
|
||||
table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
|
||||
end
|
||||
|
||||
_G._packer.profile_output = results
|
||||
end
|
||||
|
||||
time([[Luarocks path setup]], true)
|
||||
local package_path_str = "/Users/tyrel/.cache/nvim/packer_hererocks/2.1.1696795921/share/lua/5.1/?.lua;/Users/tyrel/.cache/nvim/packer_hererocks/2.1.1696795921/share/lua/5.1/?/init.lua;/Users/tyrel/.cache/nvim/packer_hererocks/2.1.1696795921/lib/luarocks/rocks-5.1/?.lua;/Users/tyrel/.cache/nvim/packer_hererocks/2.1.1696795921/lib/luarocks/rocks-5.1/?/init.lua"
|
||||
local install_cpath_pattern = "/Users/tyrel/.cache/nvim/packer_hererocks/2.1.1696795921/lib/lua/5.1/?.so"
|
||||
if not string.find(package.path, package_path_str, 1, true) then
|
||||
package.path = package.path .. ';' .. package_path_str
|
||||
end
|
||||
|
||||
if not string.find(package.cpath, install_cpath_pattern, 1, true) then
|
||||
package.cpath = package.cpath .. ';' .. install_cpath_pattern
|
||||
end
|
||||
|
||||
time([[Luarocks path setup]], false)
|
||||
time([[try_loadstring definition]], true)
|
||||
local function try_loadstring(s, component, name)
|
||||
local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
|
||||
if not success then
|
||||
vim.schedule(function()
|
||||
vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
|
||||
end)
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
time([[try_loadstring definition]], false)
|
||||
time([[Defining packer_plugins]], true)
|
||||
_G.packer_plugins = {
|
||||
["auto-session"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/auto-session",
|
||||
url = "https://github.com/rmagatti/auto-session"
|
||||
},
|
||||
["cmp-buffer"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/cmp-buffer",
|
||||
url = "https://github.com/hrsh7th/cmp-buffer"
|
||||
},
|
||||
["cmp-nvim-lsp"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
|
||||
url = "https://github.com/hrsh7th/cmp-nvim-lsp"
|
||||
},
|
||||
["cmp-nvim-lsp-signature-help"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help",
|
||||
url = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help"
|
||||
},
|
||||
["cmp-nvim-lua"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua",
|
||||
url = "https://github.com/hrsh7th/cmp-nvim-lua"
|
||||
},
|
||||
["cmp-path"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/cmp-path",
|
||||
url = "https://github.com/hrsh7th/cmp-path"
|
||||
},
|
||||
["cmp-vsnip"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/cmp-vsnip",
|
||||
url = "https://github.com/hrsh7th/cmp-vsnip"
|
||||
},
|
||||
fzf = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/fzf",
|
||||
url = "https://github.com/junegunn/fzf"
|
||||
},
|
||||
["fzf.vim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/fzf.vim",
|
||||
url = "https://github.com/junegunn/fzf.vim"
|
||||
},
|
||||
["indent-blankline.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
|
||||
url = "https://github.com/lukas-reineke/indent-blankline.nvim"
|
||||
},
|
||||
["jellybeans.vim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/jellybeans.vim",
|
||||
url = "https://github.com/nanotech/jellybeans.vim"
|
||||
},
|
||||
["lualine-lsp-progress"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/lualine-lsp-progress",
|
||||
url = "https://github.com/arkav/lualine-lsp-progress"
|
||||
},
|
||||
["lualine.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/lualine.nvim",
|
||||
url = "https://github.com/nvim-lualine/lualine.nvim"
|
||||
},
|
||||
["mason-lspconfig.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
|
||||
url = "https://github.com/williamboman/mason-lspconfig.nvim"
|
||||
},
|
||||
["mason.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/mason.nvim",
|
||||
url = "https://github.com/williamboman/mason.nvim"
|
||||
},
|
||||
nerdtree = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/nerdtree",
|
||||
url = "https://github.com/preservim/nerdtree"
|
||||
},
|
||||
nofrils = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/nofrils",
|
||||
url = "https://github.com/robertmeta/nofrils"
|
||||
},
|
||||
["nvim-cmp"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/nvim-cmp",
|
||||
url = "https://github.com/hrsh7th/nvim-cmp"
|
||||
},
|
||||
["nvim-dap"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/nvim-dap",
|
||||
url = "https://github.com/mfussenegger/nvim-dap"
|
||||
},
|
||||
["nvim-lspconfig"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
||||
url = "https://github.com/neovim/nvim-lspconfig"
|
||||
},
|
||||
["nvim-treesitter"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
||||
url = "https://github.com/nvim-treesitter/nvim-treesitter"
|
||||
},
|
||||
["nvim-treesitter-refactor"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/nvim-treesitter-refactor",
|
||||
url = "https://github.com/nvim-treesitter/nvim-treesitter-refactor"
|
||||
},
|
||||
["nvim-treesitter-textsubjects"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/nvim-treesitter-textsubjects",
|
||||
url = "https://github.com/RRethy/nvim-treesitter-textsubjects"
|
||||
},
|
||||
["nvim-web-devicons"] = {
|
||||
loaded = false,
|
||||
needs_bufread = false,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons",
|
||||
url = "https://github.com/kyazdani42/nvim-web-devicons"
|
||||
},
|
||||
["packer.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
||||
url = "https://github.com/wbthomason/packer.nvim"
|
||||
},
|
||||
["peg.vim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/peg.vim",
|
||||
url = "https://github.com/gf3/peg.vim"
|
||||
},
|
||||
["plenary.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
||||
url = "https://github.com/nvim-lua/plenary.nvim"
|
||||
},
|
||||
["rust-tools.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/rust-tools.nvim",
|
||||
url = "https://github.com/simrat39/rust-tools.nvim"
|
||||
},
|
||||
["space-vim-dark"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/space-vim-dark",
|
||||
url = "https://github.com/liuchengxu/space-vim-dark"
|
||||
},
|
||||
tagbar = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/tagbar",
|
||||
url = "https://github.com/majutsushi/tagbar"
|
||||
},
|
||||
["telescope-project.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/telescope-project.nvim",
|
||||
url = "https://github.com/nvim-telescope/telescope-project.nvim"
|
||||
},
|
||||
["telescope.nvim"] = {
|
||||
config = { "\27LJ\2\nt\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\25file_ignore_patterns\1\0\0\1\3\0\0\17node_modules\f./venv/\nsetup\14telescope\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
||||
url = "https://github.com/nvim-telescope/telescope.nvim"
|
||||
},
|
||||
ultisnips = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/ultisnips",
|
||||
url = "https://github.com/SirVer/ultisnips"
|
||||
},
|
||||
["vim-buffergator"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-buffergator",
|
||||
url = "https://github.com/jeetsukumaran/vim-buffergator"
|
||||
},
|
||||
["vim-buftabline"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-buftabline",
|
||||
url = "https://github.com/ap/vim-buftabline"
|
||||
},
|
||||
["vim-colors_atelier-schemes"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-colors_atelier-schemes",
|
||||
url = "https://github.com/atelierbram/vim-colors_atelier-schemes"
|
||||
},
|
||||
["vim-floaterm"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-floaterm",
|
||||
url = "https://github.com/voldikss/vim-floaterm"
|
||||
},
|
||||
["vim-fugitive"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-fugitive",
|
||||
url = "https://github.com/tpope/vim-fugitive"
|
||||
},
|
||||
["vim-gitgutter"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-gitgutter",
|
||||
url = "https://github.com/airblade/vim-gitgutter"
|
||||
},
|
||||
["vim-go"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-go",
|
||||
url = "https://github.com/fatih/vim-go"
|
||||
},
|
||||
["vim-gotham"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-gotham",
|
||||
url = "https://github.com/whatyouhide/vim-gotham"
|
||||
},
|
||||
["vim-gutentags"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-gutentags",
|
||||
url = "https://github.com/ludovicchabant/vim-gutentags"
|
||||
},
|
||||
["vim-monokai"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-monokai",
|
||||
url = "https://github.com/sickill/vim-monokai"
|
||||
},
|
||||
["vim-rhubarb"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-rhubarb",
|
||||
url = "https://github.com/tpope/vim-rhubarb"
|
||||
},
|
||||
["vim-snippets"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-snippets",
|
||||
url = "https://github.com/honza/vim-snippets"
|
||||
},
|
||||
["vim-startify"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-startify",
|
||||
url = "https://github.com/mhinz/vim-startify"
|
||||
},
|
||||
["vim-terraform"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-terraform",
|
||||
url = "https://github.com/hashivim/vim-terraform"
|
||||
},
|
||||
["vim-test"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-test",
|
||||
url = "https://github.com/vim-test/vim-test"
|
||||
},
|
||||
["vim-vsnip"] = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vim-vsnip",
|
||||
url = "https://github.com/hrsh7th/vim-vsnip"
|
||||
},
|
||||
vimspector = {
|
||||
loaded = true,
|
||||
path = "/Users/tyrel/.local/share/nvim/site/pack/packer/start/vimspector",
|
||||
url = "https://github.com/puremourning/vimspector"
|
||||
}
|
||||
}
|
||||
|
||||
time([[Defining packer_plugins]], false)
|
||||
-- Config for: telescope.nvim
|
||||
time([[Config for telescope.nvim]], true)
|
||||
try_loadstring("\27LJ\2\nt\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\25file_ignore_patterns\1\0\0\1\3\0\0\17node_modules\f./venv/\nsetup\14telescope\frequire\0", "config", "telescope.nvim")
|
||||
time([[Config for telescope.nvim]], false)
|
||||
|
||||
_G._packer.inside_compile = false
|
||||
if _G._packer.needs_bufread == true then
|
||||
vim.cmd("doautocmd BufRead")
|
||||
end
|
||||
_G._packer.needs_bufread = false
|
||||
|
||||
if should_profile then save_profiles() end
|
||||
|
||||
end)
|
||||
|
||||
if not no_errors then
|
||||
error_msg = error_msg:gsub('"', '\\"')
|
||||
vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
|
||||
end
|
||||
Loading…
Reference in New Issue