1 files changed, 16 insertions, 2 deletions

diff --git a/vimrc b/vimrc
index 7a9ea91..4f573d4 100644
--- a/vimrc
+++ b/vimrc
@@ -42,13 +42,17 @@ let g:airline_theme='base16'                          | " specifies which colors
 " let g:airline_theme='tomorrow'                      | " specifies which colorscheme should airline uses
 
 " Additional: ========================================.
-Plug 'loremipsum'                                     | " Sample text generator
 Plug 'sheerun/vim-polyglot'                           | " better syntax highlighting/indentation for multiple languages
 Plug 'taglist-plus'                                   | " quick code navigator
 
 " Autocompleter: =====================================.
 Plug 'Valloric/MatchTagAlways'
 Plug 'Valloric/YouCompleteMe'
+let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file
+let g:ycm_use_ultisnips_completer = 1 " Default 1, just ensure
+let g:ycm_seed_identifiers_with_syntax = 1 " Completion for programming language's keyword
+let g:ycm_complete_in_comments = 1 " Completion in comments
+let g:ycm_complete_in_strings = 1 " Completion in string
 Plug 'scrooloose/syntastic'
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
@@ -63,6 +67,16 @@ Plug 'davidhalter/jedi-vim'                           | " jedi gets used to disp
 let g:jedi#completions_enabled              = 0       | " we do not need completions, because we have YouCompleteMe
 let g:jedi#show_call_signatures             = 1       | " which sadly does not support signatures like jedi
 let g:jedi#show_call_signatures_delay       = 0
+let g:jedi#auto_vim_configure               = 0
+Plug 'SirVer/ultisnips'                               | " replaces loremipsum (and many more)
+Plug 'honza/vim-snippets'                             | " dependency of ultisnips
+" Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
+"" Ultisnips
+let g:UltiSnipsExpandTrigger="<c-tab>"
+let g:UltiSnipsListSnippets="<c-s-tab>"
+
+" If you want :UltiSnipsEdit to split your window.
+let g:UltiSnipsEditSplit="vertical"
 
 " Disabled ===========================================.
 " Plug 'Shougo/neocomplete.vim'                       | " alternative to YouCompleteMe in some cases
@@ -103,7 +117,7 @@ nnoremap <C-S-Tab> :bp<CR>|       " use CTRL+Shift+Tab to switch to preview tab
 nnoremap <C-l> :TlistToggle<CR>|  " bind TagList to Hotkey Ctrl+L
 
 " settings ============================================.
-set shell=/bin/bash           | " many scripts rely on bash, so make this the default
+" set shell=/bin/bash           | " many scripts rely on bash, but its path varies why it is commented out here
 set noshowmode                | " because we are using some powerline derivat
 set hidden                    | " allows switiching buffers even if the current buffer contains changes (displays +)
 set confirm                   | " asks 'do you want to save?'