Moving over to Vim-Plug instead of Vundle.

The Vundle project is deleted now, so I am assuming it's 100% dead.
master
Ruben - sauce.nxi.no 2023-02-21 20:25:31 +00:00
parent 779dc64034
commit 4041505c2c
4 changed files with 403 additions and 201 deletions

201
.vimrc
View File

@ -1,201 +0,0 @@
set cursorline
set wildmenu
set incsearch
set hlsearch
set nu rnu
set tabstop=4
set softtabstop=4
set shiftwidth=4
set autoindent
set textwidth=80
set noshowmode
set expandtab
syntax on
set nocompatible
let mapleader=" "
filetype off
set path+=/usr/include/nodejs/src/
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
Plugin 'VundleVim/Vundle.vim'
Plugin 'preservim/nerdtree'
Plugin 'joshdick/onedark.vim'
Plugin 'w0rp/ale'
Plugin 'tiagofumo/vim-nerdtree-syntax-highlight'
Plugin 'ryanoasis/vim-devicons'
Plugin 'airblade/vim-gitgutter'
Plugin 'ctrlpvim/ctrlp.vim'
Plugin 'tpope/vim-commentary'
Plugin 'HerringtonDarkholme/yats.vim'
Plugin 'mhinz/vim-startify'
Plugin 'sbdchd/neoformat'
Plugin 'Raimondi/delimitMate'
Plugin 'itchyny/lightline.vim'
Plugin 'roxma/nvim-yarp'
Plugin 'ncm2/ncm2'
Plugin 'ncm2/ncm2-pyclang'
Plugin 'frazrepo/vim-rainbow'
" colorschemes
Plugin 'nanotech/jellybeans.vim'
Plugin 'morhetz/gruvbox'
Plugin 'zeis/vim-kolor'
Plugin 'sainnhe/edge'
call vundle#end()
filetype plugin on
filetype indent on
" Opens NERDTree when a directory is opened
autocmd StdinReadPre * let s:std_in=1
autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | exe 'cd '.argv()[0] | endif
" Exit NERDTree if all files have closed
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
" Check if NERDTree is open or active
function! IsNERDTreeOpen()
return exists("t:NERDTreeBufName") && (bufwinnr(t:NERDTreeBufName) != -1)
endfunction
" Call NERDTreeFind if NERDTree is active, current window contains a modifiable
" file and we're not in vimdiff
function! s:synctree()
if &modifiable && IsNERDTreeOpen() && strlen(expand('%')) > 0 && !&diff
nerdtreefind
wincmd p
endif
endfunction
function s:refresh()
if IsNERDTreeOpen()
exec "NERDTreeRefreshRoot"
exec "NERDTreeRefreshRoot"
endif
endfunction
map <silent> <F5> :call <SID>refresh()<CR>
set hidden
set updatetime=300
set signcolumn=yes
let g:NERDTreeGitStatusWithFlags = 1
let g:NERDTreeIgnore = ['^node_modules$']
" Create default mappings
let g:NERDCreateDefaultMappings = 1
" Add spaces after comment delimiters by default
let g:NERDSpaceDelims = 1
" Use compact syntax for prettified multi-line comments
let g:NERDCompactSexyComs = 1
" Align line-wise comment delimiters flush left instead of following code indentation
let g:NERDDefaultAlign = 'left'
" Set a language to use its alternate delimiters by default
let g:NERDAltDelims_java = 1
" Add your own custom formats or override the defaults
" let g:NERDCustomDelimiters = { 'c': { 'left': '/**','right': '*/' } }
" Allow commenting and inverting empty lines (useful when commenting a region)
let g:NERDCommentEmptyLines = 1
" Enable trimming of trailing whitespace when uncommenting
let g:NERDTrimTrailingWhitespace = 1
" Enable NERDCommenterToggle to check all selected lines is commented or not
let g:NERDToggleCheckAllLines = 1
let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
let g:ale_linters_explicit = 1
let g:ale_linters = { 'cpp': ['g++'], 'c': ['gcc'] }
let g:ale_cpp_cc_options = "-std=c++17"
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
" Autoformat with clang-format
function! FormatOnSave()
let l:formatdiff = 1
pyf ~/.local/bin/clang-format.py
endfunction
autocmd BufWritePre *.h,*.hpp,*.cc,*.cpp,*.cxx,*.c++,*.c call FormatOnSave()
autocmd BufWritePre,InsertLeave *.js Neoformat
au BufNewFile,BufRead *.ejs set filetype=html
au BufEnter * call ncm2#enable_for_buffer()
set completeopt=noinsert,menuone,noselect
let g:ncm2_pyclang#library_path='/usr/lib/x86_64-linux-gnu/libclang-14.so'
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
nnoremap <silent> K :call <SID>show_documentation()<CR>
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
noremap <silent> <expr> j (v:count == 0 ? 'gj' : 'j')
noremap <silent> <expr> k (v:count == 0 ? 'gk' : 'k')
map <C-n> :NERDTreeToggle<CR>
inoremap jk <ESC>
inoremap JK <ESC>
nnoremap <C-h> <C-w><C-h>
nnoremap <C-j> <C-w><C-j>
nnoremap <C-k> <C-w><C-k>
nnoremap <C-l> <C-w><C-l>
nnoremap ,<space> :nohlsearch<CR>
function s:save_and_source()
exec "w | source %"
endfunction
nnoremap <F10> :call <SID>save_and_source()<CR>
inoremap <F10> <ESC>:call <SID>save_and_source()<CR>
if (has("nvim"))
"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
let $NVIM_TUI_ENABLE_TRUE_COLOR=1
endif
"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
if (has("termguicolors"))
set termguicolors
endif
let g:onedark_hide_endofbuffer = 1
let g:onedark_termcolors = 256
let g:onedark_terminal_italics = 1
au BufNewFile,BufRead *.c,*.cc,*.h,*.vim call rainbow#load()
" au FileType c,cpp,vim call rainbow#load()
" Python tab fix
function! s:fixtab()
set expandtab
set tabstop=4
retab
endfunction
command! FixTab :call s:fixtab()
syntax on
" colorscheme onedark
" colorscheme jellybeans
" colorscheme gruvbox
" colorscheme kolor
colorscheme edge
let g:lightline = {
\ 'colorscheme': g:colors_name,
\ }

1
.vimrc 120000
View File

@ -0,0 +1 @@
.vimrc_plug

199
.vimrc_plug 100644
View File

@ -0,0 +1,199 @@
set cursorline
set wildmenu
set incsearch
set hlsearch
set nu rnu
set tabstop=4
set softtabstop=4
set shiftwidth=4
set autoindent
set textwidth=80
set noshowmode
set expandtab
syntax on
set nocompatible
let mapleader=" "
filetype off
set path+=/usr/include/nodejs/src/
call plug#begin()
Plug 'preservim/nerdtree'
Plug 'joshdick/onedark.vim'
Plug 'w0rp/ale'
Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
Plug 'ryanoasis/vim-devicons'
Plug 'airblade/vim-gitgutter'
Plug 'ctrlpvim/ctrlp.vim'
Plug 'tpope/vim-commentary'
Plug 'HerringtonDarkholme/yats.vim'
Plug 'mhinz/vim-startify'
Plug 'sbdchd/neoformat'
Plug 'Raimondi/delimitMate'
Plug 'itchyny/lightline.vim'
Plug 'roxma/nvim-yarp'
Plug 'ncm2/ncm2'
Plug 'ncm2/ncm2-pyclang'
Plug 'frazrepo/vim-rainbow'
" colorschemes
Plug 'nanotech/jellybeans.vim'
Plug 'morhetz/gruvbox'
Plug 'zeis/vim-kolor'
Plug 'sainnhe/edge'
call plug#end()
filetype plugin on
filetype indent on
" Opens NERDTree when a directory is opened
autocmd StdinReadPre * let s:std_in=1
autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | exe 'cd '.argv()[0] | endif
" Exit NERDTree if all files have closed
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
" Check if NERDTree is open or active
function! IsNERDTreeOpen()
return exists("t:NERDTreeBufName") && (bufwinnr(t:NERDTreeBufName) != -1)
endfunction
" Call NERDTreeFind if NERDTree is active, current window contains a modifiable
" file and we're not in vimdiff
function! s:synctree()
if &modifiable && IsNERDTreeOpen() && strlen(expand('%')) > 0 && !&diff
nerdtreefind
wincmd p
endif
endfunction
function s:refresh()
if IsNERDTreeOpen()
exec "NERDTreeRefreshRoot"
exec "NERDTreeRefreshRoot"
endif
endfunction
map <silent> <F5> :call <SID>refresh()<CR>
set hidden
set updatetime=300
set signcolumn=yes
let g:NERDTreeGitStatusWithFlags = 1
let g:NERDTreeIgnore = ['^node_modules$']
" Create default mappings
let g:NERDCreateDefaultMappings = 1
" Add spaces after comment delimiters by default
let g:NERDSpaceDelims = 1
" Use compact syntax for prettified multi-line comments
let g:NERDCompactSexyComs = 1
" Align line-wise comment delimiters flush left instead of following code indentation
let g:NERDDefaultAlign = 'left'
" Set a language to use its alternate delimiters by default
let g:NERDAltDelims_java = 1
" Add your own custom formats or override the defaults
" let g:NERDCustomDelimiters = { 'c': { 'left': '/**','right': '*/' } }
" Allow commenting and inverting empty lines (useful when commenting a region)
let g:NERDCommentEmptyLines = 1
" Enable trimming of trailing whitespace when uncommenting
let g:NERDTrimTrailingWhitespace = 1
" Enable NERDCommenterToggle to check all selected lines is commented or not
let g:NERDToggleCheckAllLines = 1
let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
let g:ale_linters_explicit = 1
let g:ale_linters = { 'cpp': ['g++'], 'c': ['gcc'] }
let g:ale_cpp_cc_options = "-std=c++17"
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
" Autoformat with clang-format
function! FormatOnSave()
let l:formatdiff = 1
pyf ~/.local/bin/clang-format.py
endfunction
autocmd BufWritePre *.h,*.hpp,*.cc,*.cpp,*.cxx,*.c++,*.c call FormatOnSave()
autocmd BufWritePre,InsertLeave *.js Neoformat
au BufNewFile,BufRead *.ejs set filetype=html
au BufEnter * call ncm2#enable_for_buffer()
set completeopt=noinsert,menuone,noselect
let g:ncm2_pyclang#library_path='/usr/lib/x86_64-linux-gnu/libclang-14.so'
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
nnoremap <silent> K :call <SID>show_documentation()<CR>
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
noremap <silent> <expr> j (v:count == 0 ? 'gj' : 'j')
noremap <silent> <expr> k (v:count == 0 ? 'gk' : 'k')
map <C-n> :NERDTreeToggle<CR>
inoremap jk <ESC>
inoremap JK <ESC>
nnoremap <C-h> <C-w><C-h>
nnoremap <C-j> <C-w><C-j>
nnoremap <C-k> <C-w><C-k>
nnoremap <C-l> <C-w><C-l>
nnoremap ,<space> :nohlsearch<CR>
function s:save_and_source()
exec "w | source %"
endfunction
nnoremap <F10> :call <SID>save_and_source()<CR>
inoremap <F10> <ESC>:call <SID>save_and_source()<CR>
if (has("nvim"))
"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
let $NVIM_TUI_ENABLE_TRUE_COLOR=1
endif
"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
if (has("termguicolors"))
set termguicolors
endif
let g:onedark_hide_endofbuffer = 1
let g:onedark_termcolors = 256
let g:onedark_terminal_italics = 1
au BufNewFile,BufRead *.c,*.cc,*.h,*.vim call rainbow#load()
" au FileType c,cpp,vim call rainbow#load()
" Python tab fix
function! s:fixtab()
set expandtab
set tabstop=4
retab
endfunction
command! FixTab :call s:fixtab()
syntax on
" colorscheme onedark
" colorscheme jellybeans
" colorscheme gruvbox
" colorscheme kolor
colorscheme edge
let g:lightline = {
\ 'colorscheme': g:colors_name,
\ }

201
.vimrc_vundle 100644
View File

@ -0,0 +1,201 @@
set cursorline
set wildmenu
set incsearch
set hlsearch
set nu rnu
set tabstop=4
set softtabstop=4
set shiftwidth=4
set autoindent
set textwidth=80
set noshowmode
set expandtab
syntax on
set nocompatible
let mapleader=" "
filetype off
set path+=/usr/include/nodejs/src/
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
Plugin 'VundleVim/Vundle.vim'
Plugin 'preservim/nerdtree'
Plugin 'joshdick/onedark.vim'
Plugin 'w0rp/ale'
Plugin 'tiagofumo/vim-nerdtree-syntax-highlight'
Plugin 'ryanoasis/vim-devicons'
Plugin 'airblade/vim-gitgutter'
Plugin 'ctrlpvim/ctrlp.vim'
Plugin 'tpope/vim-commentary'
Plugin 'HerringtonDarkholme/yats.vim'
Plugin 'mhinz/vim-startify'
Plugin 'sbdchd/neoformat'
Plugin 'Raimondi/delimitMate'
Plugin 'itchyny/lightline.vim'
Plugin 'roxma/nvim-yarp'
Plugin 'ncm2/ncm2'
Plugin 'ncm2/ncm2-pyclang'
Plugin 'frazrepo/vim-rainbow'
" colorschemes
Plugin 'nanotech/jellybeans.vim'
Plugin 'morhetz/gruvbox'
Plugin 'zeis/vim-kolor'
Plugin 'sainnhe/edge'
call vundle#end()
filetype plugin on
filetype indent on
" Opens NERDTree when a directory is opened
autocmd StdinReadPre * let s:std_in=1
autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | exe 'cd '.argv()[0] | endif
" Exit NERDTree if all files have closed
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
" Check if NERDTree is open or active
function! IsNERDTreeOpen()
return exists("t:NERDTreeBufName") && (bufwinnr(t:NERDTreeBufName) != -1)
endfunction
" Call NERDTreeFind if NERDTree is active, current window contains a modifiable
" file and we're not in vimdiff
function! s:synctree()
if &modifiable && IsNERDTreeOpen() && strlen(expand('%')) > 0 && !&diff
nerdtreefind
wincmd p
endif
endfunction
function s:refresh()
if IsNERDTreeOpen()
exec "NERDTreeRefreshRoot"
exec "NERDTreeRefreshRoot"
endif
endfunction
map <silent> <F5> :call <SID>refresh()<CR>
set hidden
set updatetime=300
set signcolumn=yes
let g:NERDTreeGitStatusWithFlags = 1
let g:NERDTreeIgnore = ['^node_modules$']
" Create default mappings
let g:NERDCreateDefaultMappings = 1
" Add spaces after comment delimiters by default
let g:NERDSpaceDelims = 1
" Use compact syntax for prettified multi-line comments
let g:NERDCompactSexyComs = 1
" Align line-wise comment delimiters flush left instead of following code indentation
let g:NERDDefaultAlign = 'left'
" Set a language to use its alternate delimiters by default
let g:NERDAltDelims_java = 1
" Add your own custom formats or override the defaults
" let g:NERDCustomDelimiters = { 'c': { 'left': '/**','right': '*/' } }
" Allow commenting and inverting empty lines (useful when commenting a region)
let g:NERDCommentEmptyLines = 1
" Enable trimming of trailing whitespace when uncommenting
let g:NERDTrimTrailingWhitespace = 1
" Enable NERDCommenterToggle to check all selected lines is commented or not
let g:NERDToggleCheckAllLines = 1
let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
let g:ale_linters_explicit = 1
let g:ale_linters = { 'cpp': ['g++'], 'c': ['gcc'] }
let g:ale_cpp_cc_options = "-std=c++17"
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
" Autoformat with clang-format
function! FormatOnSave()
let l:formatdiff = 1
pyf ~/.local/bin/clang-format.py
endfunction
autocmd BufWritePre *.h,*.hpp,*.cc,*.cpp,*.cxx,*.c++,*.c call FormatOnSave()
autocmd BufWritePre,InsertLeave *.js Neoformat
au BufNewFile,BufRead *.ejs set filetype=html
au BufEnter * call ncm2#enable_for_buffer()
set completeopt=noinsert,menuone,noselect
let g:ncm2_pyclang#library_path='/usr/lib/x86_64-linux-gnu/libclang-14.so'
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
nnoremap <silent> K :call <SID>show_documentation()<CR>
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
noremap <silent> <expr> j (v:count == 0 ? 'gj' : 'j')
noremap <silent> <expr> k (v:count == 0 ? 'gk' : 'k')
map <C-n> :NERDTreeToggle<CR>
inoremap jk <ESC>
inoremap JK <ESC>
nnoremap <C-h> <C-w><C-h>
nnoremap <C-j> <C-w><C-j>
nnoremap <C-k> <C-w><C-k>
nnoremap <C-l> <C-w><C-l>
nnoremap ,<space> :nohlsearch<CR>
function s:save_and_source()
exec "w | source %"
endfunction
nnoremap <F10> :call <SID>save_and_source()<CR>
inoremap <F10> <ESC>:call <SID>save_and_source()<CR>
if (has("nvim"))
"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
let $NVIM_TUI_ENABLE_TRUE_COLOR=1
endif
"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
if (has("termguicolors"))
set termguicolors
endif
let g:onedark_hide_endofbuffer = 1
let g:onedark_termcolors = 256
let g:onedark_terminal_italics = 1
au BufNewFile,BufRead *.c,*.cc,*.h,*.vim call rainbow#load()
" au FileType c,cpp,vim call rainbow#load()
" Python tab fix
function! s:fixtab()
set expandtab
set tabstop=4
retab
endfunction
command! FixTab :call s:fixtab()
syntax on
" colorscheme onedark
" colorscheme jellybeans
" colorscheme gruvbox
" colorscheme kolor
colorscheme edge
let g:lightline = {
\ 'colorscheme': g:colors_name,
\ }

View File

@ -0,0 +1,2 @@
curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim