kevin/darkcloud-nvimconfig
1
0
Fork 0
mirror of https://github.com/prurigro/darkcloud-nvimconfig.git synced 2024-09-19 20:04:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

Syntastic doesn't check on :wq when disabled, and toggling

Browse source 
active/passive also toggles check on open/wq. A new variable was added
to prevent autochecking tags, and the README and update script were
updated to reflect this. Disabling the linebreaks is now defaulted to
off (flip it back on if you like it). The update script is a bit more
careful about how it runs when executed from other directories. A bug
preventing the g:disablelinebreaks variable from being possible to
disable has been squashed, and no default is set when it's not enabled.
Added Emmet javascript (rather than just json), and tried to sync up the
webformat list between plugins that enable themselves for those.
This commit is contained in:
Kevin MacMartin 2014-07-14 10:30:02 -04:00
parent 4d3fc87fca
commit 1c7b9453de
6 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
README.md
View file

@ -44,11 +44,12 @@ A theme, config and collection of plugins for Vim.
## Configuration ## ## Configuration ##
* **Configure Variables**: The following variables can be added to _vim/vimrc.user_ and have their values set to the values you require: * **Configure Variables**: The following variables can be added to _vim/vimrc.user_ and have their values set to the values you require:
* `g:disablelinebreaks`: **1** = Override filetype plugins so linebreaks never occur | 0 = Linebreaks are disabled by default, but filetype plugins can override this setting (_default_: 1) * `g:autostartfiler`: **1** = Start the filer file manager when vim is run and the buffer is empty | **0** = Do nothing when vim is run and the buffer is empty (_default_: **1**)
* `g:autostartfiler`: **1** = Start the filer file manager when vim is run and the buffer is empty | 0 = Do nothing when vim is run and the buffer is empty (_default_: 1) * `g:autostartchecker`: **1** = Check syntax once an appropriate file is loaded | **0** = Check syntax only after syntax checking is toggled on (_default_: **0**)
* `g:autostartchecker`: **1** = Check syntax once an appropriate file is loaded | 0 = Check syntax only after syntax checking is toggled on (_default_: 0) * `g:autostarttagbar`: **1** = Have the tagbar load automatically when a compatible format is run | **0** = The tagbar will stay hidden until triggered on demand with its toggle (_default_: **0**)
* `g:autostarttagbar`: **1** = Have the tagbar load automatically when a compatible format is run | 0 = The tagbar will stay hidden until triggered on demand with its toggle (_default_: 0) * `g:disableautotags`: **1** = Prevent tags from being automatically generated and highlighted | **0** = Automatically generate and highlight tags (_default_: **0**)
* `g:powerlinefonts`: **1** = Render the statusline using characters available with powerline-patched fonts | 0 = Render the statusbar with less attractive but more compatible characters available in all fonts (_default_: 0) * `g:disablelinebreaks`: **1** = Override filetype plugins so linebreaks never occur | **0** = Linebreaks are disabled by default, but filetype plugins can override this setting (_default_: **0**)
* `g:powerlinefonts`: **1** = Render the statusline using characters available with powerline-patched fonts | **0** = Render the statusbar with less attractive but more compatible characters available in all fonts (_default_: **0**)
* **Custom Settings**: Settings with priority over those set by darkcloud-vimconfig can be added to a file named _vimrc.user_, located in _darkcloud-vimconfig/vim/_ or any of the folders in the runtimepath. * **Custom Settings**: Settings with priority over those set by darkcloud-vimconfig can be added to a file named _vimrc.user_, located in _darkcloud-vimconfig/vim/_ or any of the folders in the runtimepath.
* **Custom Plugins**: Pathogen compatible plugins can be cloned or extracted to "darkcloud-vimconfig/vim/bundle.user/", or a folder named "bundle" or "bundle.user" in any of the folders in the runtimepath. * **Custom Plugins**: Pathogen compatible plugins can be cloned or extracted to "darkcloud-vimconfig/vim/bundle.user/", or a folder named "bundle" or "bundle.user" in any of the folders in the runtimepath.
* **Custom Snippets**: To add or override Emmet snippets, create _~/.vim/snippets.json_ and add your own definitions using json like shown in the [Emmet Documentation](http://docs.emmet.io/customization/snippets/). * **Custom Snippets**: To add or override Emmet snippets, create _~/.vim/snippets.json_ and add your own definitions using json like shown in the [Emmet Documentation](http://docs.emmet.io/customization/snippets/).

23
update
View file

@ -11,6 +11,8 @@
# # # #
############################################################## ##############################################################
cd $(dirname "$0")
### BEGIN: VARIABLES ### ### BEGIN: VARIABLES ###
# user variables (these can be edited) # user variables (these can be edited)
ERRORLOG="update-errors.log" # set the error log filename ERRORLOG="update-errors.log" # set the error log filename
@ -18,10 +20,9 @@ ERRORLOG="update-errors.log" # set the error log filename
# script variables (these should not be touched) # script variables (these should not be touched)
VERSION=$(printf "%s.r%s" "$(git show -s --format=%ci master | sed 's/\ .*//g;s/-//g')" "$(git rev-list --count HEAD)") VERSION=$(printf "%s.r%s" "$(git show -s --format=%ci master | sed 's/\ .*//g;s/-//g')" "$(git rev-list --count HEAD)")
SCRIPT_NAME=$(grep -o -e "[^\/]*$" <<< "$0") SCRIPT_NAME=$(grep -o -e "[^\/]*$" <<< "$0")
SCRIPT_HOME="${0%/*}" SCRIPT_HOME=$(pwd)
### END: VARIABLES ### ### END: VARIABLES ###
### BEGIN: FUNCTIONS ### ### BEGIN: FUNCTIONS ###
# command_parse "$@": configures environment using arguments # command_parse "$@": configures environment using arguments
function command_parse { function command_parse {
@ -72,7 +73,6 @@ function show_help() {
} }
### END: FUNCTIONS ### ### END: FUNCTIONS ###
### BEGIN: SETUP ### ### BEGIN: SETUP ###
# change to the base darkcloud-vimconfig folder # change to the base darkcloud-vimconfig folder
cd "$SCRIPT_HOME" cd "$SCRIPT_HOME"
@ -123,12 +123,13 @@ if [ ! -e vim/vimrc.user ]; then
echo -n -e "\n${HEADINGCOLOUR} >> Creating User Config File:${RESETCOLOUR}" echo -n -e "\n${HEADINGCOLOUR} >> Creating User Config File:${RESETCOLOUR}"
PROCESS_STATUS=$(touch vim/vimrc.user 2>&1) PROCESS_STATUS=$(touch vim/vimrc.user 2>&1)
if [ $? = 0 ]; then if [ $? = 0 ]; then
echo -e '"Disable Linebreaks: (*1:force disabled globally | 0: disabled by default)\n"let g:disablelinebreaks=0\n' >> vim/vimrc.user echo -e '"Autostart Filer in empty buffers: (*1:filer loads in new empty buffers | 0:filer must be triggered)\n"let g:autostartfiler=0\n' >> vim/vimrc.user
echo -e '"Autostart Filer: (*1:filer loads in new empty buffers | 0: filer must be triggered)\n"let g:autostartfiler=0\n' >> vim/vimrc.user echo -e '"Autocheck syntax checking: (1:start toggled on | *0:start toggled off)\n"let g:autostartchecker=1\n' >> vim/vimrc.user
echo -e '"Syntax Autostart: (1:start toggled on | *0: start toggled off)\n"let g:autostartchecker=1\n' >> vim/vimrc.user echo -e '"Autoload Tagbar: (1:start open | *0:start closed)\n"let g:autostarttagbar=1\n' >> vim/vimrc.user
echo -e '"Tagbar Autostart: (1:start open | *0:start closed)\n"let g:autostarttagbar=1\n' >> vim/vimrc.user echo -e '"Disable automatic tag generation and highlighting: (1:force disabled tag generation and highlighting | *0:enable automatic tag generation and highlighting)\n"let g:disableautotags=1\n' >> vim/vimrc.user
echo -e '"Powerline Fonts: (1:enabled | *0:disabled)\n"let g:powerlinefonts=1 "(set powerline font for gvim and terminal when enabled)\n' >> vim/vimrc.user echo -e '"Disable automatic linebreaking: (1:force disabled globally | *0:let the filetype decide)\n"let g:disablelinebreaks=1\n' >> vim/vimrc.user
echo -e '"GVim Font Selection: (Escaping spaces and use powerline if appropriate)\nset guifont=Monospace\ 12' >> vim/vimrc.user echo -e '"Enable Powerline fonts: (1:expect powerline font | *0:expect regular font)\n"let g:powerlinefonts=1 "(set powerline font for gvim and terminal when enabled)\n' >> vim/vimrc.user
echo -e '"GVim font selection: (Escaping spaces and use powerline if appropriate)\nset guifont=Monospace\ 12' >> vim/vimrc.user
echo -e "${SUCCESSCOLOUR} SUCCESS! ${RESETCOLOUR}" echo -e "${SUCCESSCOLOUR} SUCCESS! ${RESETCOLOUR}"
else else
echo -e "${FAILCOLOUR} FAIL! ${RESETCOLOUR}" echo -e "${FAILCOLOUR} FAIL! ${RESETCOLOUR}"
@ -137,7 +138,6 @@ if [ ! -e vim/vimrc.user ]; then
fi fi
### END: SETUP ### ### END: SETUP ###
### BEGIN: REPO UPDATE ### ### BEGIN: REPO UPDATE ###
echo -n -e "\n${HEADINGCOLOUR} >> Updating Repository:${RESETCOLOUR}" echo -n -e "\n${HEADINGCOLOUR} >> Updating Repository:${RESETCOLOUR}"
PROCESS_STATUS=$(git pull origin master 2>&1) PROCESS_STATUS=$(git pull origin master 2>&1)
@ -150,7 +150,6 @@ else
fi fi
### END: REPO UPDATE ### ### END: REPO UPDATE ###
### BEGIN: SUBMODULE UPDATE ### ### BEGIN: SUBMODULE UPDATE ###
# synchronize the repo urls for each submodule using the ones in .gitmodules # synchronize the repo urls for each submodule using the ones in .gitmodules
echo -e "\n${HEADINGCOLOUR} >> Updating Plugin Submodules >> ${RESETCOLOUR}" echo -e "\n${HEADINGCOLOUR} >> Updating Plugin Submodules >> ${RESETCOLOUR}"
@ -212,7 +211,6 @@ git submodule foreach git clean -dxf > /dev/null 2>&1 && echo -e "${SUCCESSCOLOU
done && echo done && echo
### END: SUBMODULE UPDATE ### ### END: SUBMODULE UPDATE ###
### BEGIN: USER PLUGIN UPDATE ### ### BEGIN: USER PLUGIN UPDATE ###
if [ -d vim/bundle.user ]; then if [ -d vim/bundle.user ]; then
if [ ! $(find vim/bundle.user | grep ".git/config" | wc -l) = 0 ]; then if [ ! $(find vim/bundle.user | grep ".git/config" | wc -l) = 0 ]; then
@ -243,7 +241,6 @@ if [ -d vim/bundle.user ]; then
fi fi
### END: USER PLUGIN UPDATE ### ### END: USER PLUGIN UPDATE ###
### BEGIN: GENERATE PLUGIN HELPTAGS ### ### BEGIN: GENERATE PLUGIN HELPTAGS ###
if [ $(type -P vim) ]; then if [ $(type -P vim) ]; then
echo -n -e "${HEADINGCOLOUR} >> Generating Plugin Help:${RESETCOLOUR}" echo -n -e "${HEADINGCOLOUR} >> Generating Plugin Help:${RESETCOLOUR}"

6
vim/config/after.vim
View file

@ -15,11 +15,11 @@ if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
endif endif
"disable linebreaks by default or override all of them (default: 1) "disable linebreaks by default or override all of them (default: 1)
if !exists("g:disablelinebreaks")|let g:disablelinebreaks=1|endif if !exists("g:disablelinebreaks")
let g:disablelinebreaks=1
endif
if (g:disablelinebreaks == 1) if (g:disablelinebreaks == 1)
autocmd VimEnter * set tw=0 nolinebreak autocmd VimEnter * set tw=0 nolinebreak
else
set tw=0 nolinebreak
endif endif
"enable omnicompletion for any filetype without that has syntax highlighting "enable omnicompletion for any filetype without that has syntax highlighting

12
vim/config/keyboard.vim
View file

@ -418,12 +418,12 @@
inoremap <silent><expr> <A-F2> '<C-O>:set spell!<CR>' inoremap <silent><expr> <A-F2> '<C-O>:set spell!<CR>'
"toggle syntax checking "toggle syntax checking
nnoremap <silent><expr> <C-F3> ':SyntasticToggleMode<CR>' nnoremap <silent><expr> <C-F3> ':if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar>:SyntasticToggleMode<CR>'
xnoremap <silent><expr> <C-F3> '<Esc>:SyntasticToggleMode<CR>gv' xnoremap <silent><expr> <C-F3> '<Esc>:if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar>:SyntasticToggleMode<CR>gv'
inoremap <silent><expr> <C-F3> '<C-O>:SyntasticToggleMode<CR>' inoremap <silent><expr> <C-F3> '<C-O>:if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar>:SyntasticToggleMode<CR>'
nnoremap <silent><expr> <A-F3> ':SyntasticToggleMode<CR>' nnoremap <silent><expr> <A-F3> ':if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar>:SyntasticToggleMode<CR>'
xnoremap <silent><expr> <A-F3> '<Esc>:SyntasticToggleMode<CR>gv' xnoremap <silent><expr> <A-F3> '<Esc>:if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar><Esc>:SyntasticToggleMode<CR>gv'
inoremap <silent><expr> <A-F3> '<C-O>:SyntasticToggleMode<CR>' inoremap <silent><expr> <A-F3> '<C-O>:if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar><C-O>:SyntasticToggleMode<CR>'
"toggle external-paste mode "toggle external-paste mode
set pastetoggle=<C-F4> set pastetoggle=<C-F4>

20
vim/config/plugins.vim
View file

@ -20,6 +20,18 @@
"EASYTAGS: {{{ "EASYTAGS: {{{
let g:easytags_file = '~/.vim/tags' let g:easytags_file = '~/.vim/tags'
"prevent automatically generating the tagfile and syntax highlighting tags (default: 0)
if !exists("g:disableautotags")
let g:disableautotags=0
endif
if (g:disableautotags == 1)
let g:easytags_auto_update=0
let g:easytags_auto_highlight=0
else
let g:easytags_auto_update=1
let g:easytags_auto_highlight=1
endif
"}}} "}}}
"EMMET: {{{ "EMMET: {{{
@ -27,7 +39,7 @@
let g:use_emmet_complete_tag=1 let g:use_emmet_complete_tag=1
let g:user_emmet_mode='a' let g:user_emmet_mode='a'
autocmd FileType css,json,htm,html,php,aspx EmmetInstall autocmd FileType aspnet,html,xhtml,php,css,javascript,json EmmetInstall
if filereadable("~/.vim/snippets.json") if filereadable("~/.vim/snippets.json")
let g:user_emmet_settings = webapi#json#decode(join(readfile(expand('~/.vim/snippets.json')), "\n")) let g:user_emmet_settings = webapi#json#decode(join(readfile(expand('~/.vim/snippets.json')), "\n"))
@ -69,7 +81,7 @@
"}}} "}}}
"MATCHTAGALWAYS: {{{ "MATCHTAGALWAYS: {{{
let g:mta_filetypes = {'aspnet':1, 'html':1, 'xhtml':1, 'xml':1, 'php':1, 'jinja':1} let g:mta_filetypes = {'aspnet':1, 'html':1, 'xhtml':1, 'php':1, 'xml':1, 'jinja':1}
"}}} "}}}
"NEOCOMPLCACHE AUTOCOMPLETION PLUGIN: {{{ "NEOCOMPLCACHE AUTOCOMPLETION PLUGIN: {{{
@ -96,6 +108,7 @@
let g:neocomplcache_omni_patterns.css='^\s\+\w+\|\w+[):;]?\s\+\|[@!]' let g:neocomplcache_omni_patterns.css='^\s\+\w+\|\w+[):;]?\s\+\|[@!]'
let g:neocomplcache_omni_patterns.less='^\s\+\w+\|\w+[):;]?\s\+\|[@!]' let g:neocomplcache_omni_patterns.less='^\s\+\w+\|\w+[):;]?\s\+\|[@!]'
let g:neocomplcache_omni_patterns.javascript='[^. \t]\.\%(\h\w*\)\?' let g:neocomplcache_omni_patterns.javascript='[^. \t]\.\%(\h\w*\)\?'
let g:neocomplcache_omni_patterns.json='[^. \t]\.\%(\h\w*\)\?'
let g:neocomplcache_omni_patterns.python='[^. *\t]\.\h\w*\|\h\w*::' let g:neocomplcache_omni_patterns.python='[^. *\t]\.\h\w*\|\h\w*::'
let g:neocomplcache_omni_patterns.ruby='[^. *\t]\.\w*\|\h\w*::' let g:neocomplcache_omni_patterns.ruby='[^. *\t]\.\w*\|\h\w*::'
let g:neocomplcache_omni_patterns.php='[^. \t]->\%(\h\w*\)\?\|\h\w*::\%(\h\w*\)\?' let g:neocomplcache_omni_patterns.php='[^. \t]->\%(\h\w*\)\?\|\h\w*::\%(\h\w*\)\?'
@ -127,9 +140,11 @@
if (g:autostartchecker == 1) if (g:autostartchecker == 1)
let g:syntastic_mode_map = {'mode':'active','active_filetypes':[],'passive_filetypes':[]} let g:syntastic_mode_map = {'mode':'active','active_filetypes':[],'passive_filetypes':[]}
let g:syntastic_check_on_open=1 let g:syntastic_check_on_open=1
let g:syntastic_check_on_wq=1
else else
let g:syntastic_mode_map = {'mode':'passive','active_filetypes':[],'passive_filetypes':[]} let g:syntastic_mode_map = {'mode':'passive','active_filetypes':[],'passive_filetypes':[]}
let g:syntastic_check_on_open=0 let g:syntastic_check_on_open=0
let g:syntastic_check_on_wq=0
endif endif
let g:syntastic_always_populate_loc_list=1 let g:syntastic_always_populate_loc_list=1
@ -143,7 +158,6 @@
if !exists("g:autostarttagbar") if !exists("g:autostarttagbar")
let g:autostarttagbar=0 let g:autostarttagbar=0
endif endif
if !&diff if !&diff
if (g:autostarttagbar == 1) if (g:autostarttagbar == 1)
autocmd VimEnter * nested :call tagbar#autoopen(1) autocmd VimEnter * nested :call tagbar#autoopen(1)

6
vimrc
View file

@ -37,12 +37,12 @@
"Load Keymappings: "Load Keymappings:
runtime config/keyboard.vim runtime config/keyboard.vim
"Load After Config:
runtime config/after.vim
"Load User Config: "Load User Config:
runtime vimrc.user runtime vimrc.user
"Load After Config:
runtime config/after.vim
"Load Plugin Configuration: "Load Plugin Configuration:
runtime config/plugins.vim runtime config/plugins.vim