Merge branch 'main' of gitlab.com:rbdr/dotfiles

[rbdr/dotfiles] / vimrc

diff --git a/vimrc b/vimrc
index cbfdad22245b6cdf2178b0490d86d9ea5d718f9d..fdcc9173b4a6278bb15f18e38c96a020d6500f27 100755 (executable)
--- a/vimrc
+++ b/vimrc
@@ -96,7 +96,7 @@ runtime! macros/matchit.vim
 highlight Keyword cterm=italic
 
 " FZF config
 highlight Keyword cterm=italic
 
 " FZF config

-set rtp+=/usr/local/opt/fzf
+set rtp+=$FZF_VIM_PATH

 
 " Inserts the path of the currently edited file into a command
 noremap <C-P> :FZF <CR>
 
 " Inserts the path of the currently edited file into a command
 noremap <C-P> :FZF <CR>


@@ -185,6 +185,17 @@ inoremap <C-S-k> <Esc>:m .-2<CR>==gi
 vnoremap <C-S-j> :m '>+1<CR>gv=gv
 vnoremap <C-S-k> :m '<-2<CR>gv=gv
 
 vnoremap <C-S-j> :m '>+1<CR>gv=gv
 vnoremap <C-S-k> :m '<-2<CR>gv=gv
 

+" Limelight / Goyo config
+
+autocmd! User GoyoEnter Limelight
+autocmd! User GoyoLeave Limelight!
+nnoremap <C-S-l> :Limelight!!<CR>==
+inoremap <C-S-l> <Esc>:Limelight!!<CR>==gi
+vnoremap <C-S-l> :<C-u>Limelight!!<CR>gv=gv
+nnoremap <C-S-g> :Goyo<CR>==
+inoremap <C-S-g> <Esc>:Goyo<CR>==gi
+vnoremap <C-S-g> :<C-u>Goyo<CR>gv=gv
+

 "
 " Plug Config
 "
 "
 " Plug Config
 "


@@ -202,28 +213,27 @@ Plug 'leafOfTree/vim-svelte-plugin'
 Plug 'bumaociyuan/vim-swift'
 Plug 'udalov/kotlin-vim'
 Plug 'tikhomirov/vim-glsl'
 Plug 'bumaociyuan/vim-swift'
 Plug 'udalov/kotlin-vim'
 Plug 'tikhomirov/vim-glsl'

+Plug 'jparise/vim-graphql'
+Plug 'digitaltoad/vim-pug'

 
 " Editing
 Plug 'tpope/vim-endwise'
 Plug 'rstacruz/vim-closer'
 Plug 'michaeljsmith/vim-indent-object'
 
 " Editing
 Plug 'tpope/vim-endwise'
 Plug 'rstacruz/vim-closer'
 Plug 'michaeljsmith/vim-indent-object'

+Plug 'editorconfig/editorconfig-vim'
+
+" Distraction free editing
+Plug 'junegunn/goyo.vim'
+Plug 'junegunn/limelight.vim'

 
 " Tools
 Plug 'editorconfig/editorconfig-vim'
 Plug 'dense-analysis/ale'
 
 " Tools
 Plug 'editorconfig/editorconfig-vim'
 Plug 'dense-analysis/ale'

-if has('nvim')
-  Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-else
-  Plug 'Shougo/deoplete.nvim'
-  Plug 'roxma/nvim-yarp'
-  Plug 'roxma/vim-hug-neovim-rpc'
-endif
+Plug 'neoclide/coc.nvim', {'branch': 'release'}

 Plug 'vim-scripts/LargeFile'
 Plug 'tpope/vim-fugitive'
 Plug 'milkypostman/vim-togglelist'
 Plug 'jremmen/vim-ripgrep'
 
 Plug 'vim-scripts/LargeFile'
 Plug 'tpope/vim-fugitive'
 Plug 'milkypostman/vim-togglelist'
 Plug 'jremmen/vim-ripgrep'
 

-Plug 'jparise/vim-graphql'
-

 " List ends here. Plugins become visible to Vim after this call.
 call plug#end()
 " List ends here. Plugins become visible to Vim after this call.
 call plug#end()