|
@ -10,19 +10,23 @@ function! InstallPlug() |
|
|
if !filereadable(expand("~/.vim/autoload/plug.vim")) |
|
|
if !filereadable(expand("~/.vim/autoload/plug.vim")) |
|
|
" try to install plug using curl and wget |
|
|
" try to install plug using curl and wget |
|
|
" If installation succeeds, we should source vim plug. |
|
|
" If installation succeeds, we should source vim plug. |
|
|
|
|
|
if executable('curl') |
|
|
let result = system('curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim') |
|
|
let result = system('curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim') |
|
|
if v:shell_error == 0 |
|
|
if v:shell_error == 0 |
|
|
let g:just_installed = 1 |
|
|
let g:just_installed = 1 |
|
|
return |
|
|
return |
|
|
endif |
|
|
endif |
|
|
|
|
|
endif |
|
|
|
|
|
|
|
|
echom 'curl failed, trying wget. ' . result |
|
|
echom 'curl failed, trying wget. ' . result |
|
|
|
|
|
|
|
|
|
|
|
if executable('wget') && executable('mkdir') |
|
|
let result = system('mkdir -p ~/.vim/autoload && wget -O ~/.vim/autoload/plug.vim https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim') |
|
|
let result = system('mkdir -p ~/.vim/autoload && wget -O ~/.vim/autoload/plug.vim https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim') |
|
|
if v:shell_error == 0 |
|
|
if v:shell_error == 0 |
|
|
let g:just_installed = 1 |
|
|
let g:just_installed = 1 |
|
|
return |
|
|
return |
|
|
endif |
|
|
endif |
|
|
|
|
|
endif |
|
|
|
|
|
|
|
|
echom 'wget failed too. ' . result |
|
|
echom 'wget failed too. ' . result |
|
|
finish |
|
|
finish |
|
@ -37,7 +41,7 @@ if g:just_installed == 1 |
|
|
endif |
|
|
endif |
|
|
|
|
|
|
|
|
call plug#begin() |
|
|
call plug#begin() |
|
|
Plug 'arcticicestudio/nord-vim' |
|
|
|
|
|
|
|
|
Plug 'catppuccin/vim' |
|
|
|
|
|
|
|
|
Plug 'Townk/vim-autoclose' |
|
|
Plug 'Townk/vim-autoclose' |
|
|
Plug 'tpope/vim-fugitive' |
|
|
Plug 'tpope/vim-fugitive' |
|
@ -151,15 +155,13 @@ endif |
|
|
|
|
|
|
|
|
set termguicolors |
|
|
set termguicolors |
|
|
set background=dark |
|
|
set background=dark |
|
|
colorscheme nord |
|
|
|
|
|
|
|
|
colorscheme catppuccin_macchiato |
|
|
|
|
|
|
|
|
autocmd! User GoyoEnter Limelight |
|
|
autocmd! User GoyoEnter Limelight |
|
|
autocmd! User GoyoLeave Limelight! |
|
|
autocmd! User GoyoLeave Limelight! |
|
|
|
|
|
|
|
|
let g:airline_theme = "nord" |
|
|
|
|
|
let g:airline_powerline_fonts = 1 |
|
|
|
|
|
|
|
|
let g:airline_theme = "catppuccin_macchiato" |
|
|
let g:airline#extensions#tabline#enabled = 1 |
|
|
let g:airline#extensions#tabline#enabled = 1 |
|
|
let g:airline_solarized_bg='dark' |
|
|
|
|
|
|
|
|
|
|
|
nnoremap <leader>z :Goyo <CR> |
|
|
nnoremap <leader>z :Goyo <CR> |
|
|
nnoremap <leader>gs :Git <CR> |
|
|
nnoremap <leader>gs :Git <CR> |