diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml index 50b3fbbf..6836df8c 100644 --- a/home/.chezmoidata.yaml +++ b/home/.chezmoidata.yaml @@ -1896,15 +1896,16 @@ softwarePlugins: - https://github.com/fatih/vim-go.git - https://github.com/github/copilot.vim - https://github.com/hdima/python-syntax.git - - https://github.com/itchyny/lightline.vim.git - https://github.com/junegunn/fzf.git - https://github.com/junegunn/fzf.vim.git - https://github.com/kristijanhusak/vim-carbon-now-sh.git - https://github.com/mxw/vim-jsx.git + - https://github.com/Yggdroot/indentLine - https://github.com/nanotee/zoxide.vim.git - https://github.com/pangloss/vim-javascript.git - https://github.com/pearofducks/ansible-vim.git - https://github.com/plasticboy/vim-markdown.git + - https://github.com/sheerun/vim-polyglot.git - https://github.com/prettier/vim-prettier.git - https://github.com/ryanoasis/vim-devicons.git - https://github.com/scrooloose/nerdtree.git @@ -1912,6 +1913,7 @@ softwarePlugins: - https://github.com/terryma/vim-multiple-cursors.git - https://github.com/tpope/vim-fugitive.git - https://github.com/tpope/vim-sensible.git + - https://github.com/justinmk/vim-sneak.git - https://github.com/tpope/vim-surround.git - https://github.com/vim-airline/vim-airline.git - https://github.com/vim-syntastic/syntastic.git diff --git a/home/dot_config/vim/vimrc b/home/dot_config/vim/vimrc index 38ee233e..3d354226 100644 --- a/home/dot_config/vim/vimrc +++ b/home/dot_config/vim/vimrc @@ -79,6 +79,9 @@ set novisualbell set t_vb= set tm=500 +" No show double status bar for lightline +" set noshowmode + " Add a bit extra margin to the left set foldcolumn=1 @@ -337,7 +340,6 @@ let vim_markdown_folding_disabled = 1 autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab " Install Coc extensions -" TODO: Add https://github.com/yuki-yano/fzf-preview.vim " TODO: Add https://github.com/tpope/vim-fugitive let g:coc_config_home='~/.config/coc' let g:coc_global_extensions = [ @@ -357,6 +359,7 @@ let g:coc_global_extensions = [ \'coc-eslint', \'coc-explorer', \'coc-flutter', + \'coc-fzf-preview', \'coc-git', \'coc-go', \'coc-highlight', @@ -397,6 +400,15 @@ let g:coc_global_extensions = [ \'coc-yank' \] +" Carbon Now settings +let g:carbon_now_sh_options = { + \'ln': 'true', + \'fm': 'Source Code Pro' +\} + +" JavaScript options +let g:javascript_plugin_jsdoc = 1 + " Settings for coc-css extension autocmd FileType scss setl iskeyword+=@-@ @@ -406,7 +418,17 @@ autocmd BufWritePre *.go :silent call CocAction('runCommand', 'editor.action.org syntax enable set background=dark colorscheme Betelgeuse -let g:lightline = { 'colorscheme': 'Betelgeuse' } +" let g:lightline = { 'colorscheme': 'Betelgeuse' } +let g:lightline = { + \ 'colorscheme': 'Betelgeuse', + \ 'active': { + \ 'left': [ [ 'mode', 'paste' ], + \ [ 'gitbranch', 'readonly', 'filename', 'modified' ] ] + \ }, + \ 'component_function': { + \ 'gitbranch': 'FugitiveHead' + \ }, + \ } " Settings for plugin https://github.com/neoclide/coc.nvim.git autocmd FileType json syntax match Comment +\/\/.\+$+ @@ -432,13 +454,14 @@ endif silent! call plug#begin('~/.local/share/vim/plugged') Plug '~/.local/share/vim/plugged/ale' -Plug '~/.local/share/vim/plugged/coc.nvim', {'do': 'npm ci'} +Plug '~/.local/share/vim/plugged/coc.nvim', {'branch': 'release', 'do': 'yarn install --frozen-lockfile'} Plug '~/.local/share/vim/plugged/copilot.vim' Plug '~/.local/share/vim/plugged/dockerfile.vim' Plug '~/.local/share/vim/plugged/editorconfig-vim' +Plug '~/.local/share/vim/plugged/indentLine' Plug '~/.local/share/vim/plugged/fzf.vim' -Plug '~/.local/share/vim/plugged/fzf' -Plug '~/.local/share/vim/plugged/lightline.vim' +Plug '~/.local/share/vim/plugged/fzf', { 'do': { -> fzf#install() } } +Plug '~/.local/share/vim/plugged/fzf-preview.vim', { 'branch': 'release/rpc', 'do': ':UpdateRemotePlugins' } Plug '~/.local/share/vim/plugged/nerdtree' Plug '~/.local/share/vim/plugged/php.vim' Plug '~/.local/share/vim/plugged/python-syntax' @@ -447,14 +470,16 @@ Plug '~/.local/share/vim/plugged/typescript-vim' Plug '~/.local/share/vim/plugged/vim-airline' Plug '~/.local/share/vim/plugged/vim-carbon-now-sh' Plug '~/.local/share/vim/plugged/vim-devicons' -Plug '~/.local/share/vim/plugged/vim-go' +Plug '~/.local/share/vim/plugged/vim-go', { 'do': ':GoUpdateBinaries' } Plug '~/.local/share/vim/plugged/vim-javascript' Plug '~/.local/share/vim/plugged/vim-jsx' Plug '~/.local/share/vim/plugged/vim-markdown' Plug '~/.local/share/vim/plugged/vim-multiple-cursors' -Plug '~/.local/share/vim/plugged/vim-prettier' +Plug '~/.local/share/vim/plugged/vim-polyglot' +Plug '~/.local/share/vim/plugged/vim-prettier', { 'do': 'yarn install --frozen-lockfile --production' } Plug '~/.local/share/vim/plugged/vim-sensible' Plug '~/.local/share/vim/plugged/vim-surround' +Plug '~/.local/share/vim/plugged/vim-sneak' Plug '~/.local/share/vim/plugged/vim-gitgutter' Plug '~/.local/share/vim/plugged/zoxide.vim' Plug '~/.local/share/vim/plugged/ansible-vim', {'do': './UltiSnips/generate.sh'}