diff --git a/.gitmodules b/.gitmodules index fc2901c..bae8217 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,3 +35,6 @@ [submodule "vim/bundle/vim-yardoc"] path = vim/bundle/vim-yardoc url = https://github.com/noprompt/vim-yardoc.git +[submodule "vim/bundle/vim-gitgutter"] + path = vim/bundle/vim-gitgutter + url = git://github.com/airblade/vim-gitgutter.git diff --git a/vim/.gitignore b/vim/.gitignore index 0a4c213..3779764 100644 --- a/vim/.gitignore +++ b/vim/.gitignore @@ -1 +1,2 @@ +vim/.netrwhist saveview/ diff --git a/vim/bundle/html5.vim b/vim/bundle/html5.vim index d4161cd..53f6c95 160000 --- a/vim/bundle/html5.vim +++ b/vim/bundle/html5.vim @@ -1 +1 @@ -Subproject commit d4161cdc685c22d2f419ccf3814b2406ddeb4b0a +Subproject commit 53f6c95974f2f612e3ed677334af735d3727833f diff --git a/vim/bundle/php.vim/syntax/php.new.vim b/vim/bundle/php.vim/syntax/php.new.vim index fec6d30..6e5cf5d 100644 --- a/vim/bundle/php.vim/syntax/php.new.vim +++ b/vim/bundle/php.vim/syntax/php.new.vim @@ -1183,7 +1183,7 @@ syn case ignore " Magic Constants {{{2 syn cluster phpClConstants add=phpMagicConstant syn case match - syn keyword phpMagicConstant contained __LINE__ __FILE__ __FUNCTION__ __METHOD__ __CLASS__ __NAMESPACE__ + syn keyword phpMagicConstant contained __LINE__ __FILE__ __DIR__ __FUNCTION__ __METHOD__ __CLASS__ __NAMESPACE__ __TRAIT__ syn case ignore " }}}2 @@ -1333,7 +1333,7 @@ syn case ignore " Classes / Objects " NOTE: call_user_method_array() and call_user_method() are both deprecated ... - syn keyword phpFunctions contained class_exists get_class_methods get_class_vars get_class get_declared_classes get_declared_interfaces get_object_vars get_parent_class interface_exists is_a is_subclass_of method_exists property_exists + syn keyword phpFunctions contained class_exists get_class_methods get_class_vars get_class get_called_class get_declared_classes get_declared_interfaces get_object_vars get_parent_class interface_exists is_a is_subclass_of method_exists property_exists " COM syn keyword phpCoreConstant contained CLSCTX_INPROC_SERVER CLSCTX_INPROC_HANDLER CLSCTX_LOCAL_SERVER CLSCTX_REMOTE_SERVER CLSCTX_SERVER CLSCTX_ALL VT_NULL VT_EMPTY VT_UI1 VT_I2 VT_I4 VT_R4 VT_R8 VT_BOOL VT_ERROR VT_CY VT_DATE VT_BSTR VT_DECIMAL VT_UNKNOWN VT_DISPATCH VT_VARIANT VT_I1 VT_UI2 VT_UI4 VT_INT VT_UINT VT_ARRAY VT_BYREF CP_ACP CP_MACCP CP_OEMCP CP_UTF7 CP_UTF8 CP_SYMBOL CP_THREAD_ACP VARCMP_LT VARCMP_EQ VARCMP_GT VARCMP_NULL NORM_IGNORECASE NORM_IGNORENONSPACE NORM_IGNORESYMBOLS NORM_IGNOREWIDTH NORM_IGNOREKANATYPE NORM_IGNOREKASHIDA DISP_E_DIVBYZERO DISP_E_OVERFLOW MK_E_UNAVAILABLE @@ -1701,7 +1701,7 @@ syn case ignore syn keyword phpFunctions bcadd bccomp bcdiv bcmod bcmul bcpow bcpowmod bcscale bcsqrt bcsub contained syn keyword phpFunctions bzclose bzcompress bzdecompress bzerrno bzerror bzerrstr bzflush bzopen bzread bzwrite contained syn keyword phpFunctions cal_days_in_month cal_from_jd cal_info cal_to_jd easter_date easter_days frenchtojd gregoriantojd jddayofweek jdmonthname jdtofrench jdtogregorian jdtojewish jdtojulian jdtounix jewishtojd juliantojd unixtojd contained - syn keyword phpFunctions call_user_method_array call_user_method class_exists get_class_methods get_class_vars get_class get_declared_classes get_object_vars get_parent_class is_a is_subclass_of method_exists property_exists contained + syn keyword phpFunctions call_user_method_array call_user_method class_exists get_class_methods get_class_vars get_class get_called_class get_declared_classes get_object_vars get_parent_class is_a is_subclass_of method_exists property_exists contained syn keyword phpFunctions com VARIANT com_addref com_get com_invoke com_isenum com_load_typelib com_load com_propget com_propput com_propset com_release com_set contained syn keyword phpFunctions cpdf_add_annotation cpdf_add_outline cpdf_arc cpdf_begin_text cpdf_circle cpdf_clip cpdf_close cpdf_closepath_fill_stroke cpdf_closepath_stroke cpdf_closepath cpdf_continue_text cpdf_curveto cpdf_end_text cpdf_fill_stroke cpdf_fill cpdf_finalize_page cpdf_finalize cpdf_global_set_document_limits cpdf_import_jpeg cpdf_lineto cpdf_moveto cpdf_newpath cpdf_open cpdf_output_buffer cpdf_page_init cpdf_place_inline_image cpdf_rect cpdf_restore cpdf_rlineto cpdf_rmoveto cpdf_rotate_text cpdf_rotate cpdf_save_to_file cpdf_save cpdf_scale cpdf_set_action_url cpdf_set_char_spacing cpdf_set_creator cpdf_set_current_page cpdf_set_font_directories cpdf_set_font_map_file cpdf_set_font cpdf_set_horiz_scaling cpdf_set_keywords cpdf_set_leading cpdf_set_page_animation cpdf_set_subject cpdf_set_text_matrix cpdf_set_text_pos cpdf_set_text_rendering cpdf_set_text_rise cpdf_set_title cpdf_set_viewer_preferences cpdf_set_word_spacing cpdf_setdash cpdf_setflat cpdf_setgray_fill cpdf_setgray_stroke cpdf_setgray cpdf_setlinecap cpdf_setlinejoin cpdf_setlinewidth cpdf_setmiterlimit cpdf_setrgbcolor_fill cpdf_setrgbcolor_stroke cpdf_setrgbcolor cpdf_show_xy cpdf_show cpdf_stringwidth cpdf_stroke cpdf_text cpdf_translate contained syn keyword phpFunctions crack_check crack_closedict crack_getlastmessage crack_opendict contained diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic index 2c1c0d0..1852b5d 160000 --- a/vim/bundle/syntastic +++ b/vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 2c1c0d0eeb7d36d8cbea22bd63144a104846047a +Subproject commit 1852b5d386cdee4ba8aa8447e032e0bd01aaeef3 diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar index b60d08c..dbc05b2 160000 --- a/vim/bundle/tagbar +++ b/vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit b60d08c468337f65bad2f1a041779b05e64d6bf8 +Subproject commit dbc05b24a3da1541a211a2f6513777145258577a diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline index 3c9f8bb..233e3c6 160000 --- a/vim/bundle/vim-airline +++ b/vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 3c9f8bb979a0bc451811c33a73c26df3ca3ea58e +Subproject commit 233e3c60ce3a357550f0878a91d94e79c3963728 diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter new file mode 160000 index 0000000..702d27a --- /dev/null +++ b/vim/bundle/vim-gitgutter @@ -0,0 +1 @@ +Subproject commit 702d27a84fb6a4e62d96b56b4141f9af9e506794 diff --git a/vim/vimrc b/vim/vimrc index ec8ed45..5beb99d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -73,7 +73,8 @@ let g:syntastic_mode_map = { 'mode': 'active', " vim-airline let g:airline_powerline_fonts = 1 -let g:airline_section_c = '%f ▶◀ %F' +"let g:airline_section_c = '%f ▶◀ %F' +let g:airline_section_c = '%f' let g:airline_section_z = '%3p%%%4l:%L%3c' let g:airline#extensions#whitespace#enabled = 0 " pas de détections des espaces (lignes vides ?) diff --git a/zsh/zsh-syntax-highlighting b/zsh/zsh-syntax-highlighting index dbd27cb..f289a9f 160000 --- a/zsh/zsh-syntax-highlighting +++ b/zsh/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit dbd27cb30a710809dd070669c331574fdc15b397 +Subproject commit f289a9f8e7a8a1752cd88f2366e6dacf8a0036e7 diff --git a/zsh/zshrc b/zsh/zshrc index b9b1fe7..5354f56 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -57,9 +57,14 @@ alias ls='ls --color=auto --group-directories-first -Fh' alias ll='ls -l' alias la='ll -a' +alias tree='tree -C --dirsfirst' + alias vim='vim -p' # Ouvre les paramètres comme des onglets au lieu de buffers alias cclive='cclive -c' # Continue automatiquement les DL alias cclive-best='cclive -f best' # DL avec la qualité max alias 7z_max="7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on" + +alias df='df -hT' +alias du='du -sh'