changes
This commit is contained in:
parent
be2c81ae10
commit
0a3652b01a
@ -141,8 +141,8 @@ return require('packer').startup(function(use)
|
|||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
-- KEYS
|
|
||||||
-- Vimspector
|
-- Vimspector
|
||||||
|
-- KEYS
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
nmap <Leader><F6> <cmd>call vimspector#Launch()<cr>
|
nmap <Leader><F6> <cmd>call vimspector#Launch()<cr>
|
||||||
nmap <Leader><F7> <cmd>call vimspector#StepOver()<cr>
|
nmap <Leader><F7> <cmd>call vimspector#StepOver()<cr>
|
||||||
@ -154,12 +154,10 @@ return require('packer').startup(function(use)
|
|||||||
nmap <Leader>Dw <cmd>:call vimspector#AddWatch()<cr>
|
nmap <Leader>Dw <cmd>:call vimspector#AddWatch()<cr>
|
||||||
nmap <Leader>De <cmd>:call vimspector#Evaluate()<cr>
|
nmap <Leader>De <cmd>:call vimspector#Evaluate()<cr>
|
||||||
]])
|
]])
|
||||||
|
|
||||||
-- OPTS
|
-- OPTS
|
||||||
vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'}
|
vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'}
|
||||||
vim.opt.shortmess = vim.opt.shortmess + { c = true}
|
vim.opt.shortmess = vim.opt.shortmess + { c = true}
|
||||||
vim.api.nvim_set_option('updatetime', 300)
|
vim.api.nvim_set_option('updatetime', 300)
|
||||||
|
|
||||||
-- Fixed column for diagnostics to appear
|
-- Fixed column for diagnostics to appear
|
||||||
-- Show autodiagnostic popup on cursor hover_range
|
-- Show autodiagnostic popup on cursor hover_range
|
||||||
-- Goto previous / next diagnostic warning / error
|
-- Goto previous / next diagnostic warning / error
|
||||||
@ -168,9 +166,6 @@ return require('packer').startup(function(use)
|
|||||||
set signcolumn=yes
|
set signcolumn=yes
|
||||||
autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
|
autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
|
||||||
]])
|
]])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
let g:vimspector_sidebar_width = 85
|
let g:vimspector_sidebar_width = 85
|
||||||
let g:vimspector_bottombar_height = 15
|
let g:vimspector_bottombar_height = 15
|
||||||
|
@ -1,40 +1,34 @@
|
|||||||
vim.cmd([[autocmd BufWritePost plugins.lua PackerCompile]])
|
vim.cmd([[autocmd BufWritePost plugins.lua PackerCompile]])
|
||||||
|
|
||||||
return function(use)
|
return function(use)
|
||||||
use({"SirVer/ultisnips"})
|
use({'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' })
|
||||||
use({"honza/vim-snippets"})
|
use({'SirVer/ultisnips'})
|
||||||
|
use({'honza/vim-snippets'})
|
||||||
|
|
||||||
use({"williamboman/mason.nvim"})
|
use({'williamboman/mason.nvim'})
|
||||||
use({'williamboman/mason-lspconfig.nvim'})
|
use({'williamboman/mason-lspconfig.nvim'})
|
||||||
use({'neovim/nvim-lspconfig'})
|
use({'neovim/nvim-lspconfig'})
|
||||||
require'lspconfig'.gopls.setup{ "gopls" }
|
require'lspconfig'.gopls.setup{ 'gopls' }
|
||||||
|
|
||||||
use({'simrat39/rust-tools.nvim'})
|
use({'simrat39/rust-tools.nvim'})
|
||||||
use({'hrsh7th/nvim-cmp'})
|
use({'hrsh7th/nvim-cmp'})
|
||||||
-- LSP completion source:
|
|
||||||
use({'hrsh7th/cmp-nvim-lsp'})
|
use({'hrsh7th/cmp-nvim-lsp'})
|
||||||
-- Useful completion sources:
|
|
||||||
use({'hrsh7th/cmp-nvim-lua'})
|
use({'hrsh7th/cmp-nvim-lua'})
|
||||||
use({'hrsh7th/cmp-nvim-lsp-signature-help'})
|
use({'hrsh7th/cmp-nvim-lsp-signature-help'})
|
||||||
use({'hrsh7th/cmp-vsnip'})
|
use({'hrsh7th/cmp-vsnip'})
|
||||||
use({'hrsh7th/cmp-path'})
|
use({'hrsh7th/cmp-path'})
|
||||||
use({'hrsh7th/cmp-buffer'})
|
use({'hrsh7th/cmp-buffer'})
|
||||||
use({'hrsh7th/vim-vsnip'})
|
use({'hrsh7th/vim-vsnip'})
|
||||||
use {
|
|
||||||
'nvim-treesitter/nvim-treesitter',
|
|
||||||
run = ':TSUpdate'
|
|
||||||
}
|
|
||||||
|
|
||||||
|
-- use({'atelierbram/vim-colors_atelier-schemes'})
|
||||||
|
-- use({'liuchengxu/space-vim-dark'})
|
||||||
|
|
||||||
use({'atelierbram/vim-colors_atelier-schemes'})
|
|
||||||
use({'robertmeta/nofrils'})
|
use({'robertmeta/nofrils'})
|
||||||
use({'vim-test/vim-test'})
|
use({'vim-test/vim-test'})
|
||||||
use({'hashivim/vim-terraform'})
|
use({'hashivim/vim-terraform'})
|
||||||
use({'rmagatti/auto-session'})
|
use({'rmagatti/auto-session'})
|
||||||
use({'ludovicchabant/vim-gutentags'})
|
use({'ludovicchabant/vim-gutentags'})
|
||||||
-- use({'ervandew/supertab'})
|
|
||||||
use({'preservim/nerdtree'})
|
use({'preservim/nerdtree'})
|
||||||
use({'liuchengxu/space-vim-dark'})
|
|
||||||
use({'junegunn/fzf', dir='~/.fzf'})
|
use({'junegunn/fzf', dir='~/.fzf'})
|
||||||
use({'junegunn/fzf.vim'})
|
use({'junegunn/fzf.vim'})
|
||||||
use({'mhinz/vim-startify'})
|
use({'mhinz/vim-startify'})
|
||||||
@ -42,12 +36,9 @@ return function(use)
|
|||||||
use({'ap/vim-buftabline'})
|
use({'ap/vim-buftabline'})
|
||||||
use({'airblade/vim-gitgutter'})
|
use({'airblade/vim-gitgutter'})
|
||||||
use({'majutsushi/tagbar'})
|
use({'majutsushi/tagbar'})
|
||||||
use {
|
use {'nvim-lualine/lualine.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true } }
|
||||||
'nvim-lualine/lualine.nvim',
|
|
||||||
requires = { 'kyazdani42/nvim-web-devicons', opt = true }
|
|
||||||
}
|
|
||||||
use({'arkav/lualine-lsp-progress'})
|
use({'arkav/lualine-lsp-progress'})
|
||||||
require('lualine').setup {
|
require('lualine').setup({
|
||||||
options = { theme = 'palenight' },
|
options = { theme = 'palenight' },
|
||||||
sections = {
|
sections = {
|
||||||
lualine_b ={ {'filename', path=1} },
|
lualine_b ={ {'filename', path=1} },
|
||||||
@ -62,8 +53,7 @@ return function(use)
|
|||||||
lualine_d = {},
|
lualine_d = {},
|
||||||
lualine_e = {},
|
lualine_e = {},
|
||||||
}
|
}
|
||||||
|
})
|
||||||
}
|
|
||||||
use({'voldikss/vim-floaterm'})
|
use({'voldikss/vim-floaterm'})
|
||||||
use({'fatih/vim-go'})
|
use({'fatih/vim-go'})
|
||||||
use({'whatyouhide/vim-gotham'})
|
use({'whatyouhide/vim-gotham'})
|
||||||
@ -74,44 +64,33 @@ return function(use)
|
|||||||
use({'gf3/peg.vim'})
|
use({'gf3/peg.vim'})
|
||||||
use({'nvim-lua/plenary.nvim'})
|
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.nvim',
|
|
||||||
--commit="c1a2af0",
|
|
||||||
config = function () require('telescope').setup{ file_ignore_patterns = {"node_modules","./venv/"} } end
|
|
||||||
})
|
|
||||||
use({'nvim-telescope/telescope-project.nvim'})
|
use({'nvim-telescope/telescope-project.nvim'})
|
||||||
-- require'telescope'.load_extension('project')
|
-- require'telescope'.load_extension('project')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
use({'puremourning/vimspector'})
|
use({'puremourning/vimspector'})
|
||||||
use({'nvim-treesitter/nvim-treesitter-refactor'})
|
use({'nvim-treesitter/nvim-treesitter-refactor'})
|
||||||
use({'RRethy/nvim-treesitter-textsubjects'})
|
use({'RRethy/nvim-treesitter-textsubjects'})
|
||||||
-- use({'airblade/vim-rooter'})
|
use({'airblade/vim-rooter'})
|
||||||
|
|
||||||
-- Debugging
|
-- Debugging
|
||||||
use 'mfussenegger/nvim-dap'
|
use 'mfussenegger/nvim-dap'
|
||||||
|
|
||||||
local rt = require("rust-tools")
|
local rt = require('rust-tools')
|
||||||
|
|
||||||
rt.setup({
|
rt.setup({
|
||||||
server = {
|
server = {
|
||||||
on_attach = function(_, bufnr)
|
on_attach = function(_, bufnr)
|
||||||
-- Hover actions
|
-- Hover actions
|
||||||
vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr })
|
vim.keymap.set('n', '<C-space>', rt.hover_actions.hover_actions, { buffer = bufnr })
|
||||||
-- Code action groups
|
-- Code action groups
|
||||||
vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
|
vim.keymap.set('n', '<Leader>a', rt.code_action_group.code_action_group, { buffer = bufnr })
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
use({'lukas-reineke/indent-blankline.nvim'})
|
||||||
|
|
||||||
use({"lukas-reineke/indent-blankline.nvim"})
|
use({'fredeeb/tardis.nvim', config = true })
|
||||||
|
require('tardis-nvim').setup({
|
||||||
|
|
||||||
|
|
||||||
use({"fredeeb/tardis.nvim", config = true })
|
|
||||||
require('tardis-nvim').setup {
|
|
||||||
keymap = {
|
keymap = {
|
||||||
next = '<C-n>', -- next entry in log (older)
|
next = '<C-n>', -- next entry in log (older)
|
||||||
prev = '<C-m>', -- previous entry in log (newer)
|
prev = '<C-m>', -- previous entry in log (newer)
|
||||||
@ -119,6 +98,6 @@ return function(use)
|
|||||||
commit_message = 'm', -- show commit message for current commit in buffer
|
commit_message = 'm', -- show commit message for current commit in buffer
|
||||||
},
|
},
|
||||||
commits = 32, -- max number of commits to read
|
commits = 32, -- max number of commits to read
|
||||||
}
|
})
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -8,3 +8,9 @@ function rl() {
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function gsub() {
|
||||||
|
git submodule update --init --recursive --remote
|
||||||
|
}
|
||||||
|
|
||||||
|
alias portalshell="docker-compose -f docker-compose.yml exec portald bash"
|
||||||
|
Loading…
Reference in New Issue
Block a user