lksz
/
dotfiles.2022
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup vi support

This commit is contained in:
Gal Szkolnik 2022-06-09 14:22:39 -04:00
parent 1701cc1189
commit dfe6dfe212
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
_home/dot_sz.shrc.d/22_editor.aliases
View File

@ -1,3 +1,16 @@
PREFERED_VI=$(type -fP nvim vim | head -1)
if [[ -z "$PREFERED_VI" ]]; then
PREFERED_VI=$(type -fP vi | head -1)
if [[ -z "$PREFERED_VI" ]]; then
alias my_vi='eval $EDITOR '
else
alias my_vi="$PREFERED_VI"
fi
else
alias my_vi="$PREFERED_VI -p"
fi
if [[ -r "$HOME/.config/_my.emacs/spacemacs/emacs.d/init.el" \ if [[ -r "$HOME/.config/_my.emacs/spacemacs/emacs.d/init.el" \
&& -n "$(type -fP emacsclient)" \ && -n "$(type -fP emacsclient)" \
&& -n "$(type -fP emacs)" \ && -n "$(type -fP emacs)" \
@ -5,22 +18,11 @@ if [[ -r "$HOME/.config/_my.emacs/spacemacs/emacs.d/init.el" \
]]; then ]]; then
alias my_editor='edit-with-spacemacs' alias my_editor='edit-with-spacemacs'
else else
PREFERED_VI=$(type -fP nvim vim | head -1) alias my_editor='my_vi'
if [[ -z "$PREFERED_VI" ]]; then
PREFERED_VI=$(type -fP vi | head -1)
if [[ -z "$PREFERED_VI" ]]; then
alias my_editor='eval $EDITOR '
else
alias my_editor="$PREFERED_VI"
fi
else
alias my_editor="$PREFERED_VI -p"
fi
fi fi
alias nvim="my_editor" alias nvim="my_vi"
alias vim="my_editor" alias vim="my_vi"
alias vi="my_editor" alias vi="my_vi"
alias ed="my_editor" alias ed="my_editor"
alias edit="my_editor" alias edit="my_editor"

31
_home/private_dot_config/nvim/init.vim
View File

@ -1,19 +1,24 @@
set background=dark set background=dark
" Install vim-plug if not found
let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim' if !has("compatible")
if empty(glob(data_dir . '/autoload/plug.vim')) " Install vim-plug if not found
let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
if empty(glob(data_dir . '/autoload/plug.vim'))
silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif
" Run PlugInstall if there are missing plugins
autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)')) | PlugInstall --sync | source $MYVIMRC | endif
" Plugins will be downloaded under the specified directory.
call plug#begin(has('nvim') ? stdpath('data') . '/plugged' : '~/.vim/plugged')
" Declare the list of plugins.
Plug 'tpope/vim-sensible'
Plug 'junegunn/seoul256.vim'
call plug#end()
endif endif
" Run PlugInstall if there are missing plugins
autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)')) | PlugInstall --sync | source $MYVIMRC | endif
" Plugins will be downloaded under the specified directory.
call plug#begin(has('nvim') ? stdpath('data') . '/plugged' : '~/.vim/plugged')
" Declare the list of plugins.
Plug 'tpope/vim-sensible'
Plug 'junegunn/seoul256.vim'
call plug#end()