aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Root2017-05-13 00:21:55 +0200
committerCharlie Root2017-05-13 00:21:55 +0200
commit17d8688a6f15648712e198f47a7a7b1cebb3fbaa (patch)
tree1d2d71eb775280230685a4da4193caf5ee514700
parent0ddb7f6ffdae9fb5c7d5936aa0992ef46c8123ca (diff)
downloadvim-karlmarks-17d8688a6f15648712e198f47a7a7b1cebb3fbaa.tar.bz2
vim-karlmarks-17d8688a6f15648712e198f47a7a7b1cebb3fbaa.zip
Compatibility with FreeBSD vim-nox11
-rw-r--r--vimrc-full40
1 files 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 @@
1" vim: tabstop=2 softtabstop=2 shiftwidth=2 textwidth=160 colorcolum=120 1" vim: tabstop=2 softtabstop=2 shiftwidth=2 textwidth=160
2 2
3set encoding=utf-8 | " set up vim's cosole encoding (not file encoding, for which there is fileencoding=)
3set t_Co=256 | " required on some ssh sessions 4set t_Co=256 | " required on some ssh sessions
4" set background=light | " 5" set background=light | "
5" set term=xtermc | " may be required on solaris 6" set term=xtermc | " may be required on solaris
@@ -129,17 +130,6 @@ let g:airline#themes#base16#constant = 0
129 130
130" Autocompleter: =====================================. 131" Autocompleter: =====================================.
131" 132"
132" ULTISNIPS: code snippet ==============================================================================================
133Plug 'honza/vim-snippets' " dependency of ultisnips (see below)
134Plug 'SirVer/ultisnips' " replaces loremipsum (and many more)
135"let g:UltiSnipsExpandTrigger = '<C-j>'| " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
136"let g:UltiSnipsJumpForwardTrigger = '<C-j>'| " \
137"let g:UltiSnipsJumpBackwardTrigger = '<C-k>'| " \
138"let g:UltiSnipsListSnippets = '<C-`>'| " YouCompleteMe includes those, so this isn't necessary
139"let g:UltiSnipsExpandTrigger = '<leader><tab>'| " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
140"let g:UltiSnipsJumpForwardTrigger = '<PageDown>'| " \
141"let g:UltiSnipsJumpBackwardTrigger = '<PageUp>'| " \
142"let g:UltiSnipsListSnippets = '<leader><leader>'| " YouCompleteMe includes those, so this isn't necessary
143" 133"
144 134
145if has("python") 135if has("python")
@@ -188,6 +178,18 @@ if has("python")
188 let g:syntastic_warning_symbol = '➔' 178 let g:syntastic_warning_symbol = '➔'
189 let g:syntastic_style_warning_symbol = '≈' 179 let g:syntastic_style_warning_symbol = '≈'
190 180
181 " ULTISNIPS: code snippet ==============================================================================================
182 Plug 'honza/vim-snippets' " dependency of ultisnips (see below)
183 Plug 'SirVer/ultisnips' " replaces loremipsum (and many more)
184 "let g:UltiSnipsExpandTrigger = '<C-j>'| " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
185 "let g:UltiSnipsJumpForwardTrigger = '<C-j>'| " \
186 "let g:UltiSnipsJumpBackwardTrigger = '<C-k>'| " \
187 "let g:UltiSnipsListSnippets = '<C-`>'| " YouCompleteMe includes those, so this isn't necessary
188 "let g:UltiSnipsExpandTrigger = '<leader><tab>'| " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
189 "let g:UltiSnipsJumpForwardTrigger = '<PageDown>'| " \
190 "let g:UltiSnipsJumpBackwardTrigger = '<PageUp>'| " \
191 "let g:UltiSnipsListSnippets = '<leader><leader>'| " YouCompleteMe includes those, so this isn't necessary
192
191 " JEDI: ============================================================================================================== 193 " JEDI: ==============================================================================================================
192 Plug 'davidhalter/jedi-vim' " jedi gets used to display python function signatures 194 Plug 'davidhalter/jedi-vim' " jedi gets used to display python function signatures
193 let g:jedi#completions_enabled = 0 " we do not need completions, because we have YouCompleteMe 195 let g:jedi#completions_enabled = 0 " we do not need completions, because we have YouCompleteMe
@@ -198,7 +200,6 @@ if has("python")
198 " autocmd FileType python jedi.preload_module('os', 'sys', 'math') 200 " autocmd FileType python jedi.preload_module('os', 'sys', 'math')
199 " let g:pymode_options_max_line_length = 120 201 " let g:pymode_options_max_line_length = 120
200 " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301' 202 " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301'
201
202endif 203endif
203 204
204 205
@@ -236,7 +237,10 @@ endfunction
236autocmd ColorScheme * call ExtendColorTheme() 237autocmd ColorScheme * call ExtendColorTheme()
237 238
238 239
239let g:base16_shell_path="~/.config/base16-shell/scripts" 240if filereadable(expand("~/.config/base16-shell/colortest"))
241 let g:base16_shell_path="~/.config/base16-shell/scripts"
242endif
243
240let base16colorspace=256 244let base16colorspace=256
241if filereadable(expand("~/.vimrc_background")) 245if filereadable(expand("~/.vimrc_background"))
242 source ~/.vimrc_background 246 source ~/.vimrc_background
@@ -251,15 +255,19 @@ endif
251" GENERAL: 255" GENERAL:
252"======================================================================================================================= 256"=======================================================================================================================
253 257
258if filereadable("/bin/bash")
259 set shell=/bin/bash | " many scripts rely on bash, but its path varies why it is commented out here
260endif
261
254 262
255"======================================================================================================================= 263"=======================================================================================================================
256" SPELL_CHECKING: 264" SPELL_CHECKING:
257"======================================================================================================================= 265"=======================================================================================================================
266let g:spellfile_URL='http://ftp.vim.org/vim/runtime/spell'
258set spell | " enable spell checker 267set spell | " enable spell checker
259set spelllang=en,de | " languages for the spell checker 268set spelllang=en,de | " languages for the spell checker
260set spellsuggest=10 | " how many words will z= suggest? 269set spellsuggest=10 | " how many words will z= suggest?
261set thesaurus+=/home/max/.vim/thesaurus/php.txt 270set thesaurus+=/home/max/.vim/thesaurus/php.txt
262let g:spellfile_URL='http://ftp.vim.org/vim/runtime/spell'
263 271
264set dictionary=/usr/share/dict/cracklib-small 272set dictionary=/usr/share/dict/cracklib-small
265set complete+=k " make default completer <C-N> respect the dictionary 273set complete+=k " make default completer <C-N> respect the dictionary
@@ -268,7 +276,6 @@ set complete+=k " make default completer <C-N> respect the dictionary
268" SETTINGS: 276" SETTINGS:
269"======================================================================================================================= 277"=======================================================================================================================
270set noautochdir | " When on, Vim will change the current working directory 278set noautochdir | " When on, Vim will change the current working directory
271set shell=/bin/bash | " many scripts rely on bash, but its path varies why it is commented out here
272set breakindent | " Every wrapped line will continue visually indented 279set breakindent | " Every wrapped line will continue visually indented
273set clipboard=unnamedplus | " makes copy and paste work (autoselectplus might work as well) 280set clipboard=unnamedplus | " makes copy and paste work (autoselectplus might work as well)
274set cmdheight=2 | " sets the command line's height 281set cmdheight=2 | " sets the command line's height
@@ -278,7 +285,6 @@ set concealcursor=nc | " limits the display of concealed text to normal
278set conceallevel=2 | " replace escaped chars by their utf-8 representation (useful for LaTeX) 285set conceallevel=2 | " replace escaped chars by their utf-8 representation (useful for LaTeX)
279set confirm | " asks 'do you want to save?' 286set confirm | " asks 'do you want to save?'
280set cpoptions+=P | " makes :w filename set the current buffer to filename 287set cpoptions+=P | " makes :w filename set the current buffer to filename
281set encoding=utf-8 | " set up vim's cosole encoding (not file encoding, for which there is fileencoding=)
282set hidden | " allows switiching buffers even if the current buffer contains changes (displays +) 288set hidden | " allows switiching buffers even if the current buffer contains changes (displays +)
283set hlsearch | " highlights all search matches (not as performant!) 289set hlsearch | " highlights all search matches (not as performant!)
284set ignorecase smartcase | " search with ignorecase by default, but use case sensitive search when one captical char is contained 290set ignorecase smartcase | " search with ignorecase by default, but use case sensitive search when one captical char is contained
..