diff --git a/lsp.vimrc b/lsp.vimrc index 0f9c17a..acfd473 100644 --- a/lsp.vimrc +++ b/lsp.vimrc @@ -3,6 +3,7 @@ filetype on syntax on set nocompatible hidden laststatus=2 +set backspace=indent,eol,start let g:mapleader=" " let g:just_installed = 0 @@ -49,7 +50,12 @@ if g:just_installed == 1 endif call plug#begin() -Plug 'junegunn/seoul256.vim' + +if has('termguicolors') + Plug 'catppuccin/vim' +else + Plug 'junegunn/seoul256.vim' +endif Plug 'prabirshrestha/asyncomplete.vim' Plug 'prabirshrestha/vim-lsp' @@ -168,15 +174,22 @@ endif " Goyo and themes -let g:seoul256_background = 234 -set termguicolors -set background=dark -colorscheme seoul256 +if has('termguicolors') + set termguicolors + set background=dark + colorscheme catppuccin_mocha + let g:airline_theme = "catppuccin_mocha" +else + echo 'no termguicolors, falling back to seoul256' + let g:seoul256_background = 234 + let g:airline_theme = "seoul256" + set background=dark + colorscheme seoul256 +endif autocmd! User GoyoEnter Limelight autocmd! User GoyoLeave Limelight! -let g:airline_theme = "seoul256" let g:airline_powerline_fonts = 1 let g:airline#extensions#tabline#enabled = 1 @@ -242,7 +255,7 @@ if executable('texlab') autocmd User lsp_setup call lsp#register_server({ \'name': 'texlab', \'cmd': {server_info->['texlab']}, - \'whitelist': ['tex'] + \'whitelist': ['tex', 'bib'] \}) endif diff --git a/minimal.vimrc b/minimal.vimrc index 68b43c6..999e731 100644 --- a/minimal.vimrc +++ b/minimal.vimrc @@ -4,6 +4,7 @@ syntax on let g:mapleader=" " let g:just_installed = 0 +set backspace=indent,eol,start function! InstallPlug() @@ -47,7 +48,12 @@ if g:just_installed == 1 endif call plug#begin() + +if has('termguicolors') + Plug 'catppuccin/vim' +else Plug 'junegunn/seoul256.vim' +endif Plug 'Townk/vim-autoclose' Plug 'tpope/vim-fugitive' @@ -156,16 +162,22 @@ if g:just_installed == 1 PlugInstall endif -set termguicolors -set background=dark -colorscheme seoul256 -let g:seoul256_background = 233 +if has('termguicolors') + set termguicolors + set background=dark + colorscheme catppuccin_mocha + let g:airline_theme = "catppuccin_mocha" +else + echo 'no termguicolors, falling back to seoul256' + let g:seoul256_background = 234 + let g:airline_theme = "seoul256" + set background=dark + colorscheme seoul256 +endif autocmd! User GoyoEnter Limelight autocmd! User GoyoLeave Limelight! -let g:airline_theme = "seoul256" -let g:airline_powerline_fonts = 1 let g:airline#extensions#tabline#enabled = 1 nnoremap z :Goyo diff --git a/noplug.vimrc b/noplug.vimrc index 7c65b98..7665b2b 100644 --- a/noplug.vimrc +++ b/noplug.vimrc @@ -7,6 +7,8 @@ if exists('syntax on') endif let g:mapleader=" " +set backspace=indent,eol,start + " options set nu set rnu