diff --git a/_config/nvim/coc-settings.json b/_config/nvim/coc-settings.json index b672cec..77588cb 100644 --- a/_config/nvim/coc-settings.json +++ b/_config/nvim/coc-settings.json @@ -25,5 +25,5 @@ "port": 6008 } }, - "tsserver.log": "true" + "tsserver.log": "normal" } diff --git a/_config/nvim/ftplugin/gdscript.vim b/_config/nvim/ftplugin/gdscript.vim index 08fa574..d31822a 100644 --- a/_config/nvim/ftplugin/gdscript.vim +++ b/_config/nvim/ftplugin/gdscript.vim @@ -1,6 +1,5 @@ " to use folding provided by plugin -# setlocal foldmethod=expr -setlocal tabstop=4 +setlocal tabstop=2 nnoremap :GodotRunLast nnoremap :GodotRun nnoremap :GodotRunCurrent diff --git a/_config/nvim/init.vim b/_config/nvim/init.vim index 74a00c5..08e2e23 100644 --- a/_config/nvim/init.vim +++ b/_config/nvim/init.vim @@ -79,7 +79,7 @@ Plug 'nanotech/jellybeans.vim', "{{{ " " syntax Plug 'cakebaker/scss-syntax.vim' -Plug 'calviken/vim-gdscript3' +"Plug 'calviken/vim-gdscript3' Plug 'ianks/vim-tsx' Plug 'leafgarland/typescript-vim' Plug 'lepture/vim-jinja' @@ -90,6 +90,7 @@ Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'} Plug 'pantharshit00/vim-prisma' Plug 'alexlafroscia/postcss-syntax.vim' Plug 'cespare/vim-toml' +Plug 'norcalli/nvim-colorizer.lua' " functionality Plug 'tpope/vim-sensible' @@ -117,12 +118,17 @@ Plug 'preservim/tagbar', "{{{ map \t :TagbarToggle "}}} Plug 'neoclide/coc.nvim', {'branch': 'release'}, "{{{ - inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() + " inoremap + " \ pumvisible() ? "\" : + " \ check_back_space() ? "\" : + " \ coc#refresh() - inoremap pumvisible() ? "\" : "\" + " inoremap pumvisible() ? "\" : "\" + inoremap + \ coc#pum#visible() ? coc#pum#next(1) : + \ check_back_space() ? "\" : + \ coc#refresh() + inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" function! s:check_back_space() abort let col = col('.') - 1 @@ -170,7 +176,8 @@ Plug 'neoclide/coc.nvim', {'branch': 'release'}, "{{{ " Use to confirm completion, `u` means break undo chain at current position. " Coc only does snippet and additional edit on confirm. - inoremap pumvisible() ? "\" : "\u\" + inoremap coc#pum#visible() ? coc#pum#confirm() + \: "\u\\=coc#on_enter()\" "}}} Plug 'vim-airline/vim-airline-themes' @@ -185,7 +192,7 @@ Plug 'vim-airline/vim-airline', "{{{ "}}} Plug 'mattn/webapi-vim' Plug 'mattn/gist-vim' -Plug 'airblade/vim-gitgutter' +Plug 'mhinz/vim-signify' Plug 'easymotion/vim-easymotion', "{{{ map (easymotion-prefix) "}}} @@ -260,6 +267,9 @@ autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@