Improve macos config

[rbdr/dotfiles] / vimrc

diff --git a/vimrc b/vimrc
index 652ec92a736ab845be147fd34dacaf23e9212ea2..1923fcf3c97292b9d36948da5aade28238a7ee1e 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>


@@ -118,6 +118,9 @@ let g:ale_fixers = {
       \}
 let g:ale_fix_on_save = 1
 
       \}
 let g:ale_fix_on_save = 1
 

+" Svelte Config
+let g:vim_svelte_plugin_use_typescript = 1
+

 " Deoplete config
 let g:deoplete#enable_at_startup = 1
 inoremap <expr><tab> pumvisible() ? "\<c-n>" : "\<tab>"
 " Deoplete config
 let g:deoplete#enable_at_startup = 1
 inoremap <expr><tab> pumvisible() ? "\<c-n>" : "\<tab>"


@@ -185,6 +188,20 @@ 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
+
+let g:limelight_conceal_ctermfg = 'gray'
+let g:limelight_conceal_guifg = 'DarkGray'
+
+autocmd! User GoyoEnter Limelight
+autocmd! User GoyoLeave Limelight!
+nnoremap <leader>f :Limelight!!<CR>==
+inoremap <leader>f <Esc>:Limelight!!<CR>==gi
+vnoremap <leader>f :<C-u>Limelight!!<CR>gv=gv
+nnoremap <leader>g :Goyo<CR>==
+inoremap <leader>g <Esc>:Goyo<CR>==gi
+vnoremap <leader>g :<C-u>Goyo<CR>gv=gv
+

 "
 " Plug Config
 "
 "
 " Plug Config
 "


@@ -198,25 +215,31 @@ Plug 'mustache/vim-mode'
 Plug 'othree/yajs.vim'
 Plug 'ARM9/snes-syntax-vim'
 Plug 'posva/vim-vue'
 Plug 'othree/yajs.vim'
 Plug 'ARM9/snes-syntax-vim'
 Plug 'posva/vim-vue'

+Plug 'leafgarland/typescript-vim'

 Plug 'leafOfTree/vim-svelte-plugin'
 Plug 'bumaociyuan/vim-swift'
 Plug 'udalov/kotlin-vim'
 Plug 'leafOfTree/vim-svelte-plugin'
 Plug 'bumaociyuan/vim-swift'
 Plug 'udalov/kotlin-vim'

+Plug 'tikhomirov/vim-glsl'
+Plug 'jparise/vim-graphql'
+Plug 'digitaltoad/vim-pug'
+Plug 'https://git.sr.ht/~torresjrjr/gemini.vim'
+Plug 'rust-lang/rust.vim'
+Plug 'dart-lang/dart-vim-plugin'

 
 " Editing
 
 " Editing

-Plug 'jiangmiao/auto-pairs'

 Plug 'tpope/vim-endwise'
 Plug 'tpope/vim-endwise'

+Plug 'rstacruz/vim-closer'

 Plug 'michaeljsmith/vim-indent-object'
 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 'vim-scripts/LargeFile'
 Plug 'tpope/vim-fugitive'
 Plug 'milkypostman/vim-togglelist'


@@ -224,3 +247,7 @@ Plug 'jremmen/vim-ripgrep'
 
 " 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()

+
+if filereadable(expand('~/.vimrc.local'))
+  exe 'source' '~/.vimrc.local'
+endif