merge with master
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
lua << EOF
|
||||
vim.g.loaded = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
EOF
|
||||
|
||||
let plug_install = 0
|
||||
let autoload_plug_path = stdpath('config') . '/autoload/plug.vim'
|
||||
|
||||
@@ -9,137 +14,124 @@ if !filereadable(autoload_plug_path)
|
||||
endif
|
||||
unlet autoload_plug_path
|
||||
|
||||
|
||||
call plug#begin('~/.config/nvim/plugins')
|
||||
|
||||
" Code development helpers {{{
|
||||
Plug 'neovim/nvim-lspconfig'
|
||||
Plug 'p00f/clangd_extensions.nvim'
|
||||
"Plug 'nvim-treesitter/nvim-treesitter-textobjects'
|
||||
"Plug 'nvim-treesitter/playground'
|
||||
"Plug 'p00f/nvim-ts-rainbow'
|
||||
"Plug 'ray-x/lsp_signature.nvim'
|
||||
Plug 'matsui54/denops-signature_help'
|
||||
Plug 'jubnzv/virtual-types.nvim'
|
||||
Plug 'RRethy/vim-illuminate'
|
||||
Plug 'mizlan/iswap.nvim'
|
||||
Plug 'Saecki/crates.nvim' | Plug 'jose-elias-alvarez/null-ls.nvim'
|
||||
|
||||
"Plug 'dbeniamine/cheat.sh-vim'
|
||||
"Plug 'puremourning/vimspector'
|
||||
"Plug 'vim-test/vim-test'
|
||||
Plug 'lukas-reineke/indent-blankline.nvim'
|
||||
Plug 'liuchengxu/vista.vim'
|
||||
|
||||
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
|
||||
Plug 'nvim-treesitter/playground'
|
||||
Plug 'p00f/nvim-ts-rainbow'
|
||||
Plug 'romgrk/nvim-treesitter-context'
|
||||
|
||||
Plug 'RRethy/vim-illuminate'
|
||||
Plug 'Saecki/crates.nvim' | Plug 'jose-elias-alvarez/null-ls.nvim'
|
||||
Plug 'andrewferrier/debugprint.nvim'
|
||||
Plug 'cdelledonne/vim-cmake'
|
||||
|
||||
Plug 'andymass/vim-matchup'
|
||||
Plug 'numToStr/Comment.nvim'
|
||||
Plug 'danymat/neogen'
|
||||
|
||||
Plug 'jubnzv/virtual-types.nvim'
|
||||
Plug 'krady21/compiler-explorer.nvim'
|
||||
Plug 'liuchengxu/vista.vim'
|
||||
Plug 'matsui54/denops-signature_help'
|
||||
Plug 'mizlan/iswap.nvim'
|
||||
Plug 'neovim/nvim-lspconfig'
|
||||
Plug 'numToStr/Comment.nvim'
|
||||
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
|
||||
Plug 'p00f/clangd_extensions.nvim'
|
||||
Plug 'ray-x/lsp_signature.nvim'
|
||||
Plug 'romgrk/nvim-treesitter-context'
|
||||
" }}}
|
||||
|
||||
" Completion {{{
|
||||
Plug 'ms-jpq/coq_nvim'
|
||||
Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
|
||||
Plug 'ms-jpq/coq_nvim'
|
||||
" }}}
|
||||
|
||||
" Files switch, jump and grep-like tools {{{
|
||||
Plug 'kyazdani42/nvim-web-devicons'
|
||||
Plug 'kyazdani42/nvim-tree.lua'
|
||||
Plug 'nvim-lua/popup.nvim'
|
||||
Plug 'nvim-lua/plenary.nvim'
|
||||
Plug 'nvim-telescope/telescope.nvim'
|
||||
Plug 'fhill2/telescope-ultisnips.nvim'
|
||||
Plug 'stevearc/dressing.nvim'
|
||||
"Plug 'inside/vim-search-pulse'
|
||||
Plug 'MunifTanjim/nui.nvim'
|
||||
Plug 'inside/vim-search-pulse'
|
||||
Plug 'wellle/targets.vim'
|
||||
Plug 'numToStr/FTerm.nvim'
|
||||
Plug 'fhill2/telescope-ultisnips.nvim'
|
||||
Plug 'ggandor/leap.nvim'
|
||||
Plug 'kyazdani42/nvim-tree.lua'
|
||||
Plug 'kyazdani42/nvim-web-devicons'
|
||||
Plug 'numToStr/FTerm.nvim'
|
||||
Plug 'nvim-lua/plenary.nvim'
|
||||
Plug 'nvim-lua/popup.nvim'
|
||||
Plug 'nvim-telescope/telescope.nvim'
|
||||
Plug 'wellle/targets.vim'
|
||||
" }}}
|
||||
|
||||
" Git integration {{{
|
||||
Plug 'tpope/vim-fugitive'
|
||||
Plug 'APZelos/blamer.nvim'
|
||||
"Plug 'APZelos/blamer.nvim'
|
||||
Plug 'lewis6991/gitsigns.nvim'
|
||||
Plug 'tpope/vim-fugitive'
|
||||
" }}}
|
||||
|
||||
" Support for random filetypes {{{
|
||||
"Plug 'weirongxu/plantuml-previewer.vim' |
|
||||
Plug 'kergoth/vim-bitbake' " Bitbake templates and syntax
|
||||
Plug 'aklt/plantuml-syntax'
|
||||
Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
|
||||
"Plug 'chrisbra/csv.vim'
|
||||
"Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
|
||||
"Plug 'vim-pandoc/vim-pandoc'
|
||||
Plug 'chrisbra/csv.vim'
|
||||
"Plug 'weirongxu/plantuml-previewer.vim' |
|
||||
Plug 'aklt/plantuml-syntax'
|
||||
Plug 'kergoth/vim-bitbake' " Bitbake templates and syntax
|
||||
" }}}
|
||||
|
||||
" Other plugins (external tools, etc) {{{
|
||||
"Plug 'MortenStabenau/matlab-vim'
|
||||
"Plug 'junegunn/goyo.vim'
|
||||
Plug 'lukas-reineke/virt-column.nvim'
|
||||
Plug 'folke/which-key.nvim'
|
||||
"Plug 'glacambre/firenvim'
|
||||
"Plug 'JMcKiern/vim-shoot'
|
||||
"Plug 'protex/better-digraphs.nvim'
|
||||
"Plug 'MortenStabenau/matlab-vim'
|
||||
"Plug 'glacambre/firenvim'
|
||||
"Plug 'junegunn/goyo.vim'
|
||||
Plug 'folke/which-key.nvim'
|
||||
Plug 'lukas-reineke/virt-column.nvim'
|
||||
Plug 'nvim-lualine/lualine.nvim'
|
||||
Plug 'protex/better-digraphs.nvim'
|
||||
" }}}
|
||||
|
||||
" Note taking {{{
|
||||
"Plug 'vimwiki/vimwiki'
|
||||
"Plug 'michal-h21/vimwiki-sync'
|
||||
" select one note taking app
|
||||
"Plug 'SidOfc/mkdx'
|
||||
"Plug 'michal-h21/vim-zettel'
|
||||
"Plug 'michal-h21/vimwiki-sync'
|
||||
"Plug 'nvim-neorg/neorg'
|
||||
"Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
|
||||
Plug 'jakewvincent/mkdnflow.nvim'
|
||||
" }}}
|
||||
|
||||
" Colorschemes {{{
|
||||
Plug 'vim-airline/vim-airline' | Plug 'vim-airline/vim-airline-themes'
|
||||
" Appearance {{{
|
||||
"Plug 'jaredgorski/spacecamp'
|
||||
"Plug 'lifepillar/vim-gruvbox8'
|
||||
"Plug 'dylanaraps/wal'
|
||||
"Plug 'tanvirtin/monokai.nvim'
|
||||
"Plug 'marko-cerovac/material.nvim'
|
||||
"Plug 'srcery-colors/srcery-vim'
|
||||
"Plug 'tanvirtin/monokai.nvim'
|
||||
Plug 'stevearc/dressing.nvim'
|
||||
" }}}
|
||||
|
||||
" Testing phase {{{
|
||||
Plug 'nvim-neorg/neorg'
|
||||
Plug 'themercorp/themer.lua'
|
||||
"Plug 'mfussenegger/nvim-dap'
|
||||
Plug 'frabjous/knap'
|
||||
Plug 'kevinhwang91/nvim-ufo' | Plug 'kevinhwang91/promise-async'
|
||||
Plug 'ziontee113/icon-picker.nvim'
|
||||
Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
|
||||
Plug 'anuvyklack/pretty-fold.nvim'
|
||||
Plug 'anuvyklack/fold-preview.nvim' | Plug 'anuvyklack/keymap-amend.nvim'
|
||||
Plug 'anuvyklack/windows.nvim' | Plug 'anuvyklack/middleclass' | Plug 'anuvyklack/animation.nvim'
|
||||
"Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
|
||||
"Plug 'https://git.sr.ht/%7Ewhynothugo/lsp_lines.nvim'
|
||||
"Plug 'kevinhwang91/nvim-ufo' | Plug 'kevinhwang91/promise-async'
|
||||
"Plug 'mfussenegger/nvim-dap'
|
||||
"Plug 'mfussenegger/nvim-dap'
|
||||
"Plug 'nguyenvukhang/nvim-toggler'
|
||||
"Plug 'smolovk/projector.nvim'
|
||||
Plug 'AckslD/nvim-FeMaco.lua'
|
||||
Plug 'Pocco81/true-zen.nvim'
|
||||
Plug 'anuvyklack/fold-preview.nvim' | Plug 'anuvyklack/keymap-amend.nvim'
|
||||
Plug 'anuvyklack/pretty-fold.nvim'
|
||||
Plug 'anuvyklack/windows.nvim' | Plug 'anuvyklack/middleclass' | Plug 'anuvyklack/animation.nvim'
|
||||
Plug 'euclio/vim-markdown-composer', {'do': ':!cargo build --release --locked'}
|
||||
Plug 'frabjous/knap'
|
||||
Plug 'ftilde/vim-ugdb'
|
||||
Plug 'gorbit99/codewindow.nvim'
|
||||
Plug 'https://gitlab.com/yorickpeterse/nvim-window.git'
|
||||
Plug 'kevinhwang91/nvim-ufo' | Plug 'kevinhwang91/promise-async'
|
||||
Plug 'nvim-neorg/neorg'
|
||||
Plug 'samodostal/image.nvim'
|
||||
Plug 'ziontee113/icon-picker.nvim'
|
||||
" }}}
|
||||
|
||||
call plug#end()
|
||||
|
||||
lua << EOF
|
||||
|
||||
require('fold-preview').setup()
|
||||
|
||||
require('pretty-fold').ft_setup('cpp', {
|
||||
process_comment_signs = false,
|
||||
comment_signs = {
|
||||
'/**', -- C++ Doxygen comments
|
||||
},
|
||||
stop_words = {
|
||||
-- ╟─ "*" ──╭───────╮── "@brief" ──╭───────╮──╢
|
||||
-- ╰─ WSP ─╯ ╰─ WSP ─╯
|
||||
'%*%s*@brief%s*',
|
||||
},
|
||||
})
|
||||
|
||||
--require('lsp_lines').setup()
|
||||
|
||||
require('compiler-explorer').setup()
|
||||
EOF
|
||||
|
||||
set termguicolors
|
||||
set shell=bash
|
||||
set shell=/bin/bash
|
||||
|
||||
if plug_install
|
||||
PlugInstall --sync
|
||||
@@ -147,6 +139,8 @@ endif
|
||||
unlet plug_install
|
||||
|
||||
set number
|
||||
set relativenumber
|
||||
set numberwidth=1
|
||||
set clipboard+=unnamedplus
|
||||
|
||||
set noshowmode
|
||||
@@ -161,11 +155,11 @@ EOF
|
||||
set colorcolumn=80
|
||||
|
||||
set background=dark
|
||||
"Wal scheme:
|
||||
"colorscheme wal
|
||||
"Material scheme:
|
||||
"let g:material_style = "deep ocean"
|
||||
"colorscheme material
|
||||
colorscheme enfocado
|
||||
|
||||
lua require('lualine').setup { options = { theme = 'enfocado' } }
|
||||
|
||||
"highlight MatchParen cterm=underline ctermbg=black ctermfg=NONE
|
||||
"highlight VirtColumn ctermfg=DarkGrey ctermbg=NONE
|
||||
@@ -186,7 +180,7 @@ set smartcase
|
||||
set gdefault
|
||||
|
||||
set textwidth=80
|
||||
set formatoptions+=t
|
||||
set formatoptions+=tlo/qj
|
||||
set scrolloff=10
|
||||
set nowrap
|
||||
set sidescroll=5
|
||||
@@ -240,7 +234,8 @@ set nobackup
|
||||
set nowritebackup
|
||||
|
||||
" New dynamic window height
|
||||
set cmdheight=0
|
||||
"set cmdheight=0
|
||||
set cmdheight=1
|
||||
|
||||
" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
|
||||
" delays and poor user experience.
|
||||
@@ -250,11 +245,14 @@ set updatetime=300
|
||||
set shortmess+=c
|
||||
set shortmess-=F
|
||||
|
||||
set signcolumn=number
|
||||
set signcolumn=auto
|
||||
|
||||
set wildmode=longest,list,full
|
||||
set completeopt=menuone,noselect
|
||||
|
||||
match Error /\s\+$\|DU\cPA/
|
||||
set mouse=
|
||||
|
||||
"match Error /\s\+$\|DU\cPA/
|
||||
|
||||
setglobal virtualedit=block
|
||||
setglobal shiftround
|
||||
@@ -276,3 +274,35 @@ let g:blamer_relative_time = 0
|
||||
""""""""""""""""""
|
||||
set guifont=IBM\ Plex\ Mono\ Text:h8
|
||||
let g:neovide_cursor_vfx_mode = "pixiedust"
|
||||
|
||||
lua << EOF
|
||||
vim.o.splitbelow = true
|
||||
vim.o.splitright = true
|
||||
|
||||
require('fold-preview').setup()
|
||||
require('pretty-fold').ft_setup('cpp', {
|
||||
process_comment_signs = false,
|
||||
comment_signs = {
|
||||
'/**', -- C++ Doxygen comments
|
||||
},
|
||||
stop_words = {
|
||||
-- ╟─ "*" ──╭───────╮── "@brief" ──╭───────╮──╢
|
||||
-- ╰─ WSP ─╯ ╰─ WSP ─╯
|
||||
'%*%s*@brief%s*',
|
||||
},
|
||||
})
|
||||
--require('lsp_lines').setup()
|
||||
require('compiler-explorer').setup()
|
||||
|
||||
require('image').setup {
|
||||
render = {
|
||||
min_padding = 5,
|
||||
show_label = true,
|
||||
use_dither = true,
|
||||
},
|
||||
events = {
|
||||
update_on_nvim_resize = true,
|
||||
},
|
||||
}
|
||||
|
||||
EOF
|
||||
|
||||
Reference in New Issue
Block a user