From 7263eaadd5262f6e1b222e2c862fe8cf2b2f24f7 Mon Sep 17 00:00:00 2001 From: Julian T Date: Mon, 5 Apr 2021 11:35:37 +0200 Subject: Move vim stuff into neovim only --- vim-core/.config/nvim/init.vim | 121 +++++++++++++++++++++++- vim-core/.vim/vimrc | 118 ----------------------- vim-extra/.config/nvim/UltiSnips/latex.snippets | 10 ++ vim-extra/.config/nvim/extra.vim | 107 +++++++++++++++++++++ vim-extra/.vim/bundle/Vundle.vim | 1 - vim-extra/.vim/extra.vim | 97 ------------------- 6 files changed, 235 insertions(+), 219 deletions(-) delete mode 100644 vim-core/.vim/vimrc create mode 100644 vim-extra/.config/nvim/UltiSnips/latex.snippets create mode 100644 vim-extra/.config/nvim/extra.vim delete mode 160000 vim-extra/.vim/bundle/Vundle.vim delete mode 100644 vim-extra/.vim/extra.vim diff --git a/vim-core/.config/nvim/init.vim b/vim-core/.config/nvim/init.vim index dbf8872..9dc64d5 100644 --- a/vim-core/.config/nvim/init.vim +++ b/vim-core/.config/nvim/init.vim @@ -1,3 +1,118 @@ -set runtimepath^=~/.vim runtimepath+=~/.vim/after -let &packpath = &runtimepath -source ~/.vim/vimrc +set nocompatible " be iMproved, required +filetype plugin on +set shellslash + +runtime extra.vim +filetype plugin indent on " required + +" General vim settings + syntax enable + set number + set relativenumber + + " More sensible splitting + set splitbelow splitright + + set tabstop=4 + set shiftwidth=4 + set expandtab + set colorcolumn=80 + + set softtabstop=4 + + set autoindent + set smartindent + + " Show 5 lines above and below cursor + set scrolloff=3 + set list + set listchars=tab:>\ ,trail:-,nbsp:+ + + " Configure statusline + set laststatus=1 + + set incsearch + + if exists('&inccommand') + " Preview substitution + set inccommand=split + endif + + set background=dark + + set hidden + + " Case insensitive search if all letters are small + set smartcase + set ignorecase + + " Persistent undo + set undofile + + set autoread + + " Exit insert mode on inactivity + " au CursorHoldI * stopinsert + +" Language specific + autocmd FileType python set et + +" Latex stuff + let g:tex_flavor='latex' + + let g:vimtex_quickfix_blgparser = {'disable': 1} + let g:vimtex_quickfix_open_on_warning = 0 + let g:vimtex_compiler_latexmk = { + \ 'backend' : 'nvim', + \ 'background' : 0, + \ 'build_dir' : '', + \ 'callback' : 1, + \ 'continuous' : 0, + \ 'executable' : 'latexmk', + \ 'hooks' : [], + \ 'options' : [ + \ '-file-line-error', + \ '-synctex=1', + \ ], + \} + +" File management + " Fuzzy like menu + set path+=** + set wildmenu + + let g:netrw_liststyle=2 + +" Keymapping + " Tab for cycling the completion meny, in insert mode + inoremap pumvisible() ? "\" : "\" + + " When moving more lines make it a jump. If couns i 2 it will run m'2j, + " thus storing it on the jumplist and then jumping + nnoremap j (v:count > 1 ? "m'" . v:count : '' ) . 'j' + nnoremap k (v:count > 1 ? "m'" . v:count : '' ) . 'k' + + " Leader stuff + let mapleader=" " + + map mm :make V=1 + map mf :make flash V=1 + +" Style enforcement + autocmd FileType go setlocal noet + autocmd FileType nix setlocal shiftwidth=4 + +" Enforcing filetypes + autocmd BufRead,BufNewFile *.ino set filetype=c + autocmd BufRead,BufNewFile *.asc set filetype=asciidoc + autocmd BufRead,BufNewFile *.nix set filetype=nix + + autocmd BufRead,BufNewFile *.tsx set filetype=typescript + +" Highlightning And colors + set termguicolors + +" Spell check + set spelllang=en + " autocmd FileType mail,tex,markdown,rst set spell + diff --git a/vim-core/.vim/vimrc b/vim-core/.vim/vimrc deleted file mode 100644 index 60b2e6b..0000000 --- a/vim-core/.vim/vimrc +++ /dev/null @@ -1,118 +0,0 @@ -set nocompatible " be iMproved, required -filetype plugin on -set shellslash - -runtime extra.vim -filetype plugin indent on " required - -" General vim settings - syntax enable - set number - set relativenumber - - " More sensible splitting - set splitbelow splitright - - set tabstop=4 - set shiftwidth=4 - set expandtab - set colorcolumn=80 - - set softtabstop=4 - - set autoindent - set smartindent - - " Show 5 lines above and below cursor - set scrolloff=3 - set list - set listchars=tab:>\ ,trail:-,nbsp:+ - - " Configure statusline - set laststatus=1 - - set incsearch - - if has('nvim') - " Preview substitution - set inccommand=split - endif - - set background=dark - - set hidden - - " Case insensitive search if all letters are small - set smartcase - set ignorecase - - " Persistent undo - set undofile - - set autoread - - " Exit insert mode on inactivity - " au CursorHoldI * stopinsert - -" Language specific - autocmd FileType python set et - -" Latex stuff - let g:tex_flavor='latex' - - let g:vimtex_quickfix_blgparser = {'disable': 1} - let g:vimtex_quickfix_open_on_warning = 0 - let g:vimtex_compiler_latexmk = { - \ 'backend' : 'nvim', - \ 'background' : 0, - \ 'build_dir' : '', - \ 'callback' : 1, - \ 'continuous' : 0, - \ 'executable' : 'latexmk', - \ 'hooks' : [], - \ 'options' : [ - \ '-file-line-error', - \ '-synctex=1', - \ ], - \} - -" File management - " Fuzzy like menu - set path+=** - set wildmenu - - let g:netrw_liststyle=2 - -" Keymapping - " Tab for cycling the completion meny, in insert mode - inoremap pumvisible() ? "\" : "\" - - " When moving more lines make it a jump. If couns i 2 it will run m'2j, - " thus storing it on the jumplist and then jumping - nnoremap j (v:count > 1 ? "m'" . v:count : '' ) . 'j' - nnoremap k (v:count > 1 ? "m'" . v:count : '' ) . 'k' - - " Leader stuff - let mapleader=" " - - map mm :make V=1 - map mf :make flash V=1 - -" Style enforcement - autocmd FileType go setlocal noet - -" Enforcing filetypes - autocmd BufRead,BufNewFile *.ino set filetype=c - autocmd BufRead,BufNewFile *.asc set filetype=asciidoc - autocmd BufRead,BufNewFile *.nix set filetype=nix - - autocmd BufRead,BufNewFile *.tsx set filetype=typescript - -" Highlightning And colors - set termguicolors - - -" Spell check - set spelllang=en - " autocmd FileType mail,tex,markdown,rst set spell - diff --git a/vim-extra/.config/nvim/UltiSnips/latex.snippets b/vim-extra/.config/nvim/UltiSnips/latex.snippets new file mode 100644 index 0000000..a3e508f --- /dev/null +++ b/vim-extra/.config/nvim/UltiSnips/latex.snippets @@ -0,0 +1,10 @@ +# https://castel.dev/post/lecture-notes-1/ +snippet beg "begin{} / end{}" bA +\begin{$1} + $0 +\end{$1} +endsnippet + +snippet mk "Inline math" wA +$${1}$ +end diff --git a/vim-extra/.config/nvim/extra.vim b/vim-extra/.config/nvim/extra.vim new file mode 100644 index 0000000..a51bb2d --- /dev/null +++ b/vim-extra/.config/nvim/extra.vim @@ -0,0 +1,107 @@ +" Plugins + " set the runtime path to include Vundle and initialize + set rtp+=~/.config/nvim/bundle/Vundle.vim + call vundle#begin("~/.config/nvim/bundle") + " alternatively, pass a path where Vundle should install plugins + "call vundle#begin('~/some/path/here') + + " let Vundle manage Vundle, required + Plugin 'VundleVim/Vundle.vim' + + " Completion + "Plugin 'Shougo/deoplete.nvim' + Plugin 'ajh17/VimCompletesMe' + " Plugin 'prabirshrestha/vim-lsp' + Plugin 'autozimu/LanguageClient-neovim' + Plugin 'Shougo/echodoc.vim' + + " Installed through vim-core + Plugin 'tpope/vim-surround' + Plugin 'tpope/vim-repeat' + Plugin 'tpope/vim-unimpaired' + Plugin 'tpope/vim-commentary' + + "Plugin 'godlygeek/tabular' + + " Editor config + Plugin 'sgur/vim-editorconfig' + + " Color theme + " Plugin 'agude/vim-eldar' + " Plugin 'ntk148v/vim-horizon' + " Plugin 'rakr/vim-colors-rakr' + " Plugin 'rakr/vim-one' + Plugin 'morhetz/gruvbox' + " Plugin 'ntk148v/vim-horizon' + + " Git + " Plugin 'tpope/vim-fugitive' + + " File support + " Plugin 'cespare/vim-toml' + Plugin 'lervag/vimtex' + " Plugin 'aklt/plantuml-syntax' + Plugin 'LnL7/vim-nix' + Plugin 'dart-lang/dart-vim-plugin' + + " Plugin 'vimwiki/vimwiki' + + " Plugin 'glacambre/firenvim' + + + " Snippits + Plugin 'SirVer/ultisnips' + " Plugin 'honza/vim-snippets' + + call vundle#end() " required + +" Completion + set completeopt+=menuone + set completeopt+=noselect + + if has('nvim') + let g:echodoc#enable_at_startup = 1 + let g:echodoc#type = 'virtual' + endif + + "let g:deoplete#enable_at_startup = 1 + "let g:deoplete#disable_auto_complete = 1 + + let b:vcm_tab_complete = 'omni' + + " Close completion window + autocmd CompleteDone * pclose + + " Lsp options + " let g:LanguageClient_setOmnifunc = 1 + let g:LanguageClient_hoverPreview = "Never" + let g:LanguageClient_useVirtualText = "No" + let g:LanguageClient_loggingFile = "/tmp/lsp.log" + let g:LanguageClient_loggingLevel = "DEBUG" + + + " Setup lsp servers + let g:LanguageClient_serverCommands = { + \ 'c' : ['clangd'], + \ 'cpp' : ['clangd'], + \ 'python' : ['pyls'], + \ 'go' : ['gopls'], + \ 'rust' : ['rls'], + \ 'typescript' : ['tsserver'], + \ } + + " let g:one_allow_italics = 1 + let g:gruvbox_italic = 1 + colorscheme gruvbox + + " Tab is already in use by completion + let g:UltiSnipsExpandTrigger="" + let g:UltiSnipsJumpForwardTrigger="" + + " let g:firenvim_config = { + " \ 'localSettings': { + " \ '.*': { + " \ 'takeover': 'never', + " \ }, + " \ } + " \ } diff --git a/vim-extra/.vim/bundle/Vundle.vim b/vim-extra/.vim/bundle/Vundle.vim deleted file mode 160000 index b255382..0000000 --- a/vim-extra/.vim/bundle/Vundle.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95 diff --git a/vim-extra/.vim/extra.vim b/vim-extra/.vim/extra.vim deleted file mode 100644 index 176cdeb..0000000 --- a/vim-extra/.vim/extra.vim +++ /dev/null @@ -1,97 +0,0 @@ -" Plugins - " set the runtime path to include Vundle and initialize - set rtp+=~/.vim/bundle/Vundle.vim - call vundle#begin() - " alternatively, pass a path where Vundle should install plugins - "call vundle#begin('~/some/path/here') - - " let Vundle manage Vundle, required - Plugin 'VundleVim/Vundle.vim' - - " Completion - "Plugin 'Shougo/deoplete.nvim' - Plugin 'ajh17/VimCompletesMe' - " Plugin 'prabirshrestha/vim-lsp' - Plugin 'autozimu/LanguageClient-neovim' - Plugin 'Shougo/echodoc.vim' - - " Installed through vim-core - Plugin 'tpope/vim-surround' - Plugin 'tpope/vim-repeat' - Plugin 'tpope/vim-unimpaired' - Plugin 'tpope/vim-commentary' - - "Plugin 'godlygeek/tabular' - - " Editor config - Plugin 'sgur/vim-editorconfig' - - " Color theme - " Plugin 'agude/vim-eldar' - " Plugin 'ntk148v/vim-horizon' - " Plugin 'rakr/vim-colors-rakr' - " Plugin 'rakr/vim-one' - Plugin 'morhetz/gruvbox' - " Plugin 'ntk148v/vim-horizon' - - " Git - " Plugin 'tpope/vim-fugitive' - - " File support - " Plugin 'cespare/vim-toml' - Plugin 'lervag/vimtex' - " Plugin 'aklt/plantuml-syntax' - " Plugin 'LnL7/vim-nix' - Plugin 'dart-lang/dart-vim-plugin' - - " Plugin 'vimwiki/vimwiki' - - - " Snippits - Plugin 'SirVer/ultisnips' - " Plugin 'honza/vim-snippets' - - call vundle#end() " required - -" Completion - set completeopt+=menuone - set completeopt+=noselect - - if has('nvim') - let g:echodoc#enable_at_startup = 1 - let g:echodoc#type = 'virtual' - endif - - "let g:deoplete#enable_at_startup = 1 - "let g:deoplete#disable_auto_complete = 1 - - let b:vcm_tab_complete = 'omni' - - " Close completion window - autocmd CompleteDone * pclose - - " Lsp options - " let g:LanguageClient_setOmnifunc = 1 - let g:LanguageClient_hoverPreview = "Never" - let g:LanguageClient_useVirtualText = "No" - let g:LanguageClient_loggingFile = "/tmp/lsp.log" - let g:LanguageClient_loggingLevel = "DEBUG" - - - " Setup lsp servers - let g:LanguageClient_serverCommands = { - \ 'c' : ['clangd'], - \ 'cpp' : ['clangd'], - \ 'python' : ['pyls'], - \ 'go' : ['gopls'], - \ 'rust' : ['rls'], - \ 'typescript' : ['tsserver'], - \ } - - " let g:one_allow_italics = 1 - let g:gruvbox_italic = 1 - colorscheme gruvbox - - " Tab is already in use by completion - let g:UltiSnipsExpandTrigger="" - let g:UltiSnipsJumpForwardTrigger="" -- cgit v1.2.3