Skip to content

Commit

Permalink
happy new year
Browse files Browse the repository at this point in the history
  • Loading branch information
kepbod committed Feb 16, 2018
1 parent d7e748d commit d30987d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
@@ -1,5 +1,5 @@
ivim - An easy & highly customizable vim configuration
Copyright (C) 2012-2017 Xiao-Ou Zhang
Copyright (C) 2012-2018 Xiao-Ou Zhang

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the "Software"),
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -212,4 +212,4 @@ Welcome to contribute to ivim, see [issue #31](https://github.com/kepbod/ivim/is

## License

Copyright (C) 2012-2017 Xiao-Ou Zhang. See the [LICENSE](https://github.com/kepbod/ivim/blob/master/LICENSE.txt) file for license rights and limitations (MIT).
Copyright (C) 2012-2018 Xiao-Ou Zhang. See the [LICENSE](https://github.com/kepbod/ivim/blob/master/LICENSE.txt) file for license rights and limitations (MIT).
21 changes: 13 additions & 8 deletions vimrc_mini
Expand Up @@ -9,7 +9,7 @@
" Main Contributor: Xiao-Ou Zhang (kepbod) <kepbod@gmail.com>
" Version: 3.0
" Created: 2015-09-24
" Last Modified: 2017-10-27
" Last Modified: 2018-02-16
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

Expand Down Expand Up @@ -143,14 +143,14 @@ Plug 'prabirshrestha/asyncomplete-lsp.vim' " Language server protocol
Plug 'prabirshrestha/asyncomplete-tags.vim' " Tag completions
Plug 'yami-beta/asyncomplete-omni.vim' " Omni completion
Plug 'prabirshrestha/asyncomplete-buffer.vim' " Buffer completion
Plug 'prabirshrestha/asyncomplete-file.vim' " File completion
Plug 'prabirshrestha/asyncomplete-neosnippet.vim' " Neosnippet autocompletion
Plug 'Shougo/neosnippet.vim' " Snippet engine
Plug 'Shougo/neosnippet-snippets' " Snippets
Plug 'wellle/tmux-complete.vim' " Completion for tmux panes
Plug 'w0rp/ale' " Lint engine
Plug 'tpope/vim-fugitive' " Git wrapper
Plug 'airblade/vim-gitgutter' " Git diff sign
Plug 'tweekmonster/braceless.vim', { 'for': 'python' } " Setting for Python
Plug 'mattn/emmet-vim', { 'for': ['html', 'css'] } " Emmet
Plug 'sheerun/vim-polyglot' " Language Support

Expand Down Expand Up @@ -231,14 +231,15 @@ syntax on " Enable syntax
set background=dark " Set background
set t_Co=256 " Use 256 colors

" Load a colorscheme
colorscheme nord

" Enable italic
let g:nord_italic=1
let g:nord_italic_comments=1
let &t_ZH="\e[3m"
let &t_ZR="\e[23m"

" Load a colorscheme
colorscheme nord

""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

"-------------------------------------------------
Expand Down Expand Up @@ -416,6 +417,13 @@ call asyncomplete#register_source(asyncomplete#sources#buffer#get_source_options
\ 'blacklist': ['go'],
\ 'completor': function('asyncomplete#sources#buffer#completor'),
\ }))
" File
au User asyncomplete_setup call asyncomplete#register_source(asyncomplete#sources#file#get_source_options({
\ 'name': 'file',
\ 'whitelist': ['*'],
\ 'priority': 10,
\ 'completor': function('asyncomplete#sources#file#completor')
\ }))
" Python
if executable('pyls')
au User lsp_setup call lsp#register_server({
Expand Down Expand Up @@ -498,9 +506,6 @@ nmap <silent> ]w <Plug>(ale_next)
highlight ALEErrorSign guibg=NONE guifg=red
highlight ALEWarningSign guibg=NONE guifg=yellow

" -> Braceless
autocmd FileType python BracelessEnable +indent

" -> Emmet
let g:user_emmet_leader_key='<C-Z>'
let g:user_emmet_settings={'indentation':' '}
Expand Down

0 comments on commit d30987d

Please sign in to comment.