Skip to content

Commit

Permalink
handful of updates
Browse files Browse the repository at this point in the history
  • Loading branch information
fuhrysteve committed Jan 26, 2021
1 parent bffbe8f commit bcd668c
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 11 deletions.
2 changes: 1 addition & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ else
echo "Creating symlink $HOME/.config/nvim/init.vim which points to $DIR/init.vim"
ln -s "$DIR/init.vim" "$HOME/.config/nvim/init.vim"
fi

curl -fLo "$HOME/.local/share/nvim/site/autoload/plug.vim" --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
nvim +PlugInstall! +UpdateRemotePlugins! +qall
31 changes: 21 additions & 10 deletions init.vim
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ set nocompatible " Use Vim defaults
let $NVIM_TUI_ENABLE_CURSOR_SHAPE=0
set guicursor=

call plug#begin('~/.local/share/nvim/plugged')
"call plug#begin('~/.local/share/nvim/plugged')
call plug#begin('~/.config/nvim/plugged')

let g:python_host_prog = '/usr/bin/python'
let g:python3_host_prog = '/usr/bin/python3.7'
"let g:python_host_prog = '/usr/bin/python'
let g:python3_host_prog = '/usr/bin/python3'

" Sensible VIM Defaults
Plug 'tpope/vim-sensible'
Expand All @@ -30,10 +31,10 @@ Plug 'romainl/flattened'
" HTML tag matching
Plug 'gregsexton/MatchTag'
" pretty tab bar
Plug 'bling/vim-airline'
Plug 'vim-airline/vim-airline'

" Git/mercurial/others diff icons on the side of the file lines
Plug 'mhinz/vim-signify'
"Plug 'mhinz/vim-signify'

" More up-to-date fork of 'hdima/python-syntax'
Plug 'achimnol/python-syntax'
Expand All @@ -42,15 +43,22 @@ Plug 'groenewege/vim-less'
" auto-format sql files
Plug 'b4b4r07/vim-sqlfmt'
" highlighting for ansible yaml files
Plug 'chase/vim-ansible-yaml'
"Plug 'chase/vim-ansible-yaml'
" async autocomplete for neovim
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
if has('nvim')
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
else
Plug 'Shougo/deoplete.nvim'
Plug 'roxma/nvim-yarp'
Plug 'roxma/vim-hug-neovim-rpc'
endif
let g:deoplete#enable_at_startup = 1
" runs linters such as flake8, mypy, jslint, etc
Plug 'w0rp/ale'
" quick snippet shortcuts
Plug 'SirVer/ultisnips'
"Plug 'SirVer/ultisnips'
" Quick file opener
Plug 'ctrlpvim/ctrlp.vim'
"Plug 'ctrlpvim/ctrlp.vim'

call plug#end()

Expand All @@ -74,7 +82,7 @@ let g:ale_linters = {
\ 'python': ['flake8'],
\}
" \ 'python': ['flake8', 'mypy'],
let b:ale_fixers = {'python': ['black']}
let g:ale_fixers = {'python': ['black']}
let g:airline#extensions#ale#enabled = 1
let g:ale_echo_msg_error_str = 'E'
let g:ale_echo_msg_warning_str = 'W'
Expand All @@ -100,6 +108,9 @@ endif
let g:deoplete#enable_at_startup = 1
" set completeopt-=preview

set foldmethod=syntax
set nofoldenable

" Always show status bar
set laststatus=2
au BufReadPost *.conf set syntax=ini
Expand Down

0 comments on commit bcd668c

Please sign in to comment.