From 17d8688a6f15648712e198f47a7a7b1cebb3fbaa Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sat, 13 May 2017 00:21:55 +0200 Subject: Compatibility with FreeBSD vim-nox11 --- vimrc-full | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/vimrc-full b/vimrc-full index f4f6f29..50de3b6 100644 --- a/vimrc-full +++ b/vimrc-full @@ -1,5 +1,6 @@ -" vim: tabstop=2 softtabstop=2 shiftwidth=2 textwidth=160 colorcolum=120 +" vim: tabstop=2 softtabstop=2 shiftwidth=2 textwidth=160 +set encoding=utf-8 | " set up vim's cosole encoding (not file encoding, for which there is fileencoding=) set t_Co=256 | " required on some ssh sessions " set background=light | " " set term=xtermc | " may be required on solaris @@ -129,17 +130,6 @@ let g:airline#themes#base16#constant = 0 " Autocompleter: =====================================. " -" ULTISNIPS: code snippet ============================================================================================== -Plug 'honza/vim-snippets' " dependency of ultisnips (see below) -Plug 'SirVer/ultisnips' " replaces loremipsum (and many more) -"let g:UltiSnipsExpandTrigger = ''| " Trigger configuration. Do not use if you use https://github.com/Valloric/YouCompleteMe. -"let g:UltiSnipsJumpForwardTrigger = ''| " \ -"let g:UltiSnipsJumpBackwardTrigger = ''| " \ -"let g:UltiSnipsListSnippets = ''| " YouCompleteMe includes those, so this isn't necessary -"let g:UltiSnipsExpandTrigger = ''| " Trigger configuration. Do not use if you use https://github.com/Valloric/YouCompleteMe. -"let g:UltiSnipsJumpForwardTrigger = ''| " \ -"let g:UltiSnipsJumpBackwardTrigger = ''| " \ -"let g:UltiSnipsListSnippets = ''| " YouCompleteMe includes those, so this isn't necessary " if has("python") @@ -188,6 +178,18 @@ if has("python") let g:syntastic_warning_symbol = '➔' let g:syntastic_style_warning_symbol = '≈' + " ULTISNIPS: code snippet ============================================================================================== + Plug 'honza/vim-snippets' " dependency of ultisnips (see below) + Plug 'SirVer/ultisnips' " replaces loremipsum (and many more) + "let g:UltiSnipsExpandTrigger = ''| " Trigger configuration. Do not use if you use https://github.com/Valloric/YouCompleteMe. + "let g:UltiSnipsJumpForwardTrigger = ''| " \ + "let g:UltiSnipsJumpBackwardTrigger = ''| " \ + "let g:UltiSnipsListSnippets = ''| " YouCompleteMe includes those, so this isn't necessary + "let g:UltiSnipsExpandTrigger = ''| " Trigger configuration. Do not use if you use https://github.com/Valloric/YouCompleteMe. + "let g:UltiSnipsJumpForwardTrigger = ''| " \ + "let g:UltiSnipsJumpBackwardTrigger = ''| " \ + "let g:UltiSnipsListSnippets = ''| " YouCompleteMe includes those, so this isn't necessary + " JEDI: ============================================================================================================== Plug 'davidhalter/jedi-vim' " jedi gets used to display python function signatures let g:jedi#completions_enabled = 0 " we do not need completions, because we have YouCompleteMe @@ -198,7 +200,6 @@ if has("python") " autocmd FileType python jedi.preload_module('os', 'sys', 'math') " let g:pymode_options_max_line_length = 120 " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301' - endif @@ -236,7 +237,10 @@ endfunction autocmd ColorScheme * call ExtendColorTheme() -let g:base16_shell_path="~/.config/base16-shell/scripts" +if filereadable(expand("~/.config/base16-shell/colortest")) + let g:base16_shell_path="~/.config/base16-shell/scripts" +endif + let base16colorspace=256 if filereadable(expand("~/.vimrc_background")) source ~/.vimrc_background @@ -251,15 +255,19 @@ endif " GENERAL: "======================================================================================================================= +if filereadable("/bin/bash") + set shell=/bin/bash | " many scripts rely on bash, but its path varies why it is commented out here +endif + "======================================================================================================================= " SPELL_CHECKING: "======================================================================================================================= +let g:spellfile_URL='http://ftp.vim.org/vim/runtime/spell' set spell | " enable spell checker set spelllang=en,de | " languages for the spell checker set spellsuggest=10 | " how many words will z= suggest? set thesaurus+=/home/max/.vim/thesaurus/php.txt -let g:spellfile_URL='http://ftp.vim.org/vim/runtime/spell' set dictionary=/usr/share/dict/cracklib-small set complete+=k " make default completer respect the dictionary @@ -268,7 +276,6 @@ set complete+=k " make default completer respect the dictionary " SETTINGS: "======================================================================================================================= set noautochdir | " When on, Vim will change the current working directory -set shell=/bin/bash | " many scripts rely on bash, but its path varies why it is commented out here set breakindent | " Every wrapped line will continue visually indented set clipboard=unnamedplus | " makes copy and paste work (autoselectplus might work as well) set cmdheight=2 | " sets the command line's height @@ -278,7 +285,6 @@ set concealcursor=nc | " limits the display of concealed text to normal set conceallevel=2 | " replace escaped chars by their utf-8 representation (useful for LaTeX) set confirm | " asks 'do you want to save?' set cpoptions+=P | " makes :w filename set the current buffer to filename -set encoding=utf-8 | " set up vim's cosole encoding (not file encoding, for which there is fileencoding=) set hidden | " allows switiching buffers even if the current buffer contains changes (displays +) set hlsearch | " highlights all search matches (not as performant!) set ignorecase smartcase | " search with ignorecase by default, but use case sensitive search when one captical char is contained -- cgit v1.2.3