More work on the completion front
This commit is contained in:
Daniel Flanagan
parent
b3bf44a483
commit
62db272455
5 changed files with 52 additions and 119 deletions
|
|
@ -132,8 +132,6 @@ nnoremap <C-j> :bprevious<CR>
|
|||
nnoremap <leader>c ciw
|
||||
nnoremap <leader>C ciW
|
||||
|
||||
inoremap <silent> <expr> <CR> ncm2_ultisnips#expand_or("\<CR>", 'n')
|
||||
|
||||
" bash-like deletion
|
||||
inoremap <C-BS> <C-w>
|
||||
inoremap <A-BS> <C-w>
|
||||
|
|
|
|||
|
|
@ -25,9 +25,21 @@ if filereadable(expand('$HOME/.env_init.vim'))
|
|||
source "$HOME/.env_init.vim"
|
||||
endif
|
||||
|
||||
let pluginmanagerfile=$vimdir.'/plugin-manager.vim'
|
||||
exec 'source ' . pluginmanagerfile
|
||||
|
||||
" initialize plugin manager
|
||||
if has('nvim')
|
||||
call plug#begin('~/.config/nvim/bundle')
|
||||
else
|
||||
call plug#begin('~/.vim/bundle')
|
||||
endif
|
||||
|
||||
let pluginsfile=$vimdir.'/plugins.vim'
|
||||
exec 'source ' . pluginsfile
|
||||
|
||||
call plug#end()
|
||||
|
||||
filetype on
|
||||
filetype indent on
|
||||
filetype plugin on
|
||||
|
|
|
|||
|
|
@ -1,28 +1,3 @@
|
|||
" install plugin manager if needed
|
||||
augroup PluginManagerInstaller
|
||||
if has('nvim')
|
||||
if empty(glob('~/.config/nvim/autoload/plug.vim'))
|
||||
silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
autocmd VimEnter * PlugInstall
|
||||
endif
|
||||
else
|
||||
if empty(glob('~/.vim/autoload/plug.vim'))
|
||||
silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
autocmd VimEnter * PlugInstall
|
||||
endif
|
||||
end
|
||||
augroup End
|
||||
|
||||
" initialize plugin manager
|
||||
if has('nvim')
|
||||
call plug#begin('~/.config/nvim/bundle')
|
||||
else
|
||||
call plug#begin('~/.vim/bundle')
|
||||
endif
|
||||
|
||||
" let plugin manager manage itself
|
||||
Plug 'junegunn/vim-plug'
|
||||
|
||||
" check if we're using vim as the manpage viewer before loading session plugins
|
||||
if exists('asmanviewer')
|
||||
let g:prosession_dir = '/dev/null'
|
||||
|
|
@ -32,78 +7,14 @@ else
|
|||
let g:prosession_dir = '~/.config/nvim/session/'
|
||||
endif
|
||||
|
||||
Plug 'autozimu/LanguageClient-neovim', {
|
||||
\ 'branch': 'next',
|
||||
\ 'do': 'bash install.sh',
|
||||
\ }
|
||||
|
||||
Plug 'junegunn/vim-plug' " plugin manager should manage itself
|
||||
Plug 'vim-airline/vim-airline' " status line
|
||||
let g:airline_powerline_fonts = 1
|
||||
let g:airline#extensions#tabline#enabled = 1 " automatically displays all buffers when there's only one tab open
|
||||
let g:airline#extensions#tabline#fnamemod = ':t'
|
||||
" set laststatus=2 " always show statusline
|
||||
" set noshowmode " hides default mode
|
||||
let g:airline#extensions#tabline#left_sep = ''
|
||||
let g:airline#extensions#tabline#left_alt_sep = ''
|
||||
let g:airline_right_alt_sep = ''
|
||||
let g:airline_right_sep = ''
|
||||
let g:airline_left_alt_sep= ''
|
||||
let g:airline_left_sep = ''
|
||||
let g:airline#extensions#tabline#buffers_label = ''
|
||||
|
||||
Plug 'vim-airline/vim-airline-themes' " more minimal status line
|
||||
let g:airline_mode_map = {
|
||||
\ '__' : '-',
|
||||
\ 'n' : 'N',
|
||||
\ 'i' : 'I',
|
||||
\ 'R' : 'R',
|
||||
\ 'c' : 'C',
|
||||
\ 'v' : 'V',
|
||||
\ 'V' : 'V',
|
||||
\ '' : 'V',
|
||||
\ 's' : 'S',
|
||||
\ 'S' : 'S',
|
||||
\ '' : 'S',
|
||||
\ }
|
||||
|
||||
Plug 'nathanaelkane/vim-indent-guides' " indentation guides
|
||||
let g:indent_guide_auto_colors = 1
|
||||
let g:indent_guides_enable_on_vim_startup = 1
|
||||
|
||||
Plug 'w0rp/ale' " syntax checker
|
||||
let g:ale_completion_enabled = 0
|
||||
" let g:ale_sign_column_always = 0
|
||||
" let g:ale_set_signs = 0
|
||||
" highlight clear ALEErrorSign
|
||||
" highlight clear ALEWarningSign
|
||||
|
||||
" Plug 'neomake/neomake' " syntax checker
|
||||
|
||||
" 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
|
||||
|
||||
" Plug 'neoclide/coc.nvim', {'do': { -> coc#util#install()}}
|
||||
|
||||
Plug 'ncm2/ncm2'
|
||||
Plug 'roxma/nvim-yarp'
|
||||
|
||||
Plug 'ncm2/ncm2-bufword'
|
||||
Plug 'ncm2/ncm2-tmux'
|
||||
Plug 'ncm2/ncm2-path'
|
||||
|
||||
Plug 'ncm2/ncm2-ultisnips'
|
||||
Plug 'SirVer/ultisnips'
|
||||
|
||||
Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding
|
||||
Plug 'junegunn/fzf.vim' " helpers for using fzf in vim
|
||||
let g:fzf_layout = { 'window': 'enew' }
|
||||
|
||||
Plug 'bkad/CamelCaseMotion' " camel case and underscore word movements
|
||||
Plug 'vim-scripts/LargeFile' " gracefully handle very large files
|
||||
Plug 'tpope/vim-commentary' " toggle comments in code easily
|
||||
|
|
@ -122,14 +33,4 @@ Plug 'dbakker/vim-projectroot' " adds helper functions for getting to a project'
|
|||
Plug 'junegunn/goyo.vim' " better distraction-free editing
|
||||
Plug 'editorconfig/editorconfig-vim' " loads project-specific editor settings
|
||||
Plug 'sheerun/vim-polyglot' " vim plugin loader for many languages
|
||||
|
||||
" language-specific
|
||||
" Elixir
|
||||
Plug 'slashmili/alchemist.vim', {'for': ['elixir', 'exs', 'ex']}
|
||||
|
||||
" MoonScript
|
||||
Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']}
|
||||
|
||||
call plug#end()
|
||||
|
||||
" call neomake#configure#automake('nrwi', 500)
|
||||
|
|
|
|||
|
|
@ -1,23 +1,45 @@
|
|||
scriptencoding utf8
|
||||
|
||||
" configuration for language servers
|
||||
let g:LanguageClient_serverCommands = {
|
||||
\ 'rust': ['rustup', 'run', 'stable', 'rls'],
|
||||
\ 'javascript': ['/usr/local/bin/javascript-typescript-stdio'],
|
||||
\ 'javascript.jsx': ['tcp://127.0.0.1:2089'],
|
||||
\ 'haskell': ['/usr/bin/hie-wrapper'],
|
||||
\ 'python': ['/usr/local/bin/pyls'],
|
||||
\ }
|
||||
let g:airline_powerline_fonts = 1
|
||||
let g:airline#extensions#tabline#enabled = 1 " automatically displays all buffers when there's only one tab open
|
||||
let g:airline#extensions#tabline#fnamemod = ':t'
|
||||
" set laststatus=2 " always show statusline
|
||||
" set noshowmode " hides default mode
|
||||
let g:airline#extensions#tabline#left_sep = ''
|
||||
let g:airline#extensions#tabline#left_alt_sep = ''
|
||||
let g:airline_right_alt_sep = ''
|
||||
let g:airline_right_sep = ''
|
||||
let g:airline_left_alt_sep= ''
|
||||
let g:airline_left_sep = ''
|
||||
let g:airline#extensions#tabline#buffers_label = ''
|
||||
|
||||
" call deoplete#custom#source('javacomplete2', 'max_abbr_width', 1000)
|
||||
" call deoplete#custom#source('javacomplete2', 'max_kind_width', 1000)
|
||||
" call deoplete#custom#source('javacomplete2', 'max_menu_width', 1000)
|
||||
"
|
||||
" call deoplete#custom#source('rust', 'max_kind_width', 1000)
|
||||
" call deoplete#custom#source('rust', 'max_abbr_width', 1000)
|
||||
" call deoplete#custom#source('rust', 'max_menu_width', 1000)
|
||||
let g:airline_mode_map = {
|
||||
\ '__' : '-',
|
||||
\ 'n' : 'N',
|
||||
\ 'i' : 'I',
|
||||
\ 'R' : 'R',
|
||||
\ 'c' : 'C',
|
||||
\ 'v' : 'V',
|
||||
\ 'V' : 'V',
|
||||
\ '' : 'V',
|
||||
\ 's' : 'S',
|
||||
\ 'S' : 'S',
|
||||
\ '' : 'S',
|
||||
\ }
|
||||
|
||||
let g:indent_guide_auto_colors = 1
|
||||
let g:indent_guides_enable_on_vim_startup = 1
|
||||
|
||||
let g:ale_completion_enabled = 1
|
||||
let g:ale_elixir_elixir_ls_release = '/home/daniel/code/open-source/elixir-ls/release'
|
||||
|
||||
let g:ale_sign_column_always = 0
|
||||
let g:ale_set_signs = 0
|
||||
highlight clear ALEErrorSign
|
||||
highlight clear ALEWarningSign
|
||||
|
||||
let g:fzf_layout = { 'window': 'enew' }
|
||||
|
||||
autocmd BufEnter * call ncm2#enable_for_buffer()
|
||||
set completeopt=noinsert,menuone,noselect
|
||||
|
||||
" fix neovim cursor
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ font-2 = ${env:BAR_ICON_FONT_2_DECLARATION}
|
|||
|
||||
modules-left = bspwm
|
||||
modules-center = date
|
||||
modules-right = volume xbacklight xkeyboard temperature filesystem memory cpu battery
|
||||
modules-right = cpu filesystem memory volume xbacklight xkeyboard temperature battery
|
||||
|
||||
tray-position = right
|
||||
tray-padding = 0
|
||||
|
|
|
|||
Reference in a new issue