Merge branch 'master' of github.com:darkelfe14728/consoleConfig

gitconfig

@@ -13,6 +13,7 @@
 	ck = checkout
 	st = status
 	br = branch
+	bru = remote update origin --prune
 	brsa = "!f() { git push ${2-$(git config --get custom.serverbranch.remote)} ${2-$(git config --get custom.serverbranch.remote)}/${3-$(git config --get custom.serverbranch.branch)}:refs/heads/${1}; }; f"
 	brsd = "!f() { git push ${2-$(git config --get custom.serverbranch.remote)} :heads/${1}; }; f"
 	link = branch --track

vim/config/parametrage-plugins.vim

@@ -7,3 +7,5 @@ runtime config/plugin/vim-highlight.vim
 runtime config/plugin/jscomplete-vim.vim
 runtime config/plugin/vim-javascript-syntax.vim
 runtime config/plugin/javascript-libraries-syntax.vim
+runtime config/plugin/vim-multiple-cursor.vim
+runtime config/plugin/vim-easy-align.vim

vim/config/plugin/php.vim.vim

@@ -15,3 +15,4 @@ let g:php_alt_arrays = 2
 let g:php_folding = 1
 let g:php_special_functions = 0
 let g:php_nested_functions = 1
+let g:php_show_semicolon_error = 0

vim/config/plugin/vim-easy-align.vim

@@ -0,0 +1,9 @@
+xmap ga <Plug>(EasyAlign)
+nmap ga <Plug>(EasyAlign)
+
+vmap g, :EasyAlign *, {'rm': 1, 'lm': 0, 'stl': 0}<CR>
+
+let g:easy_align_delimiters = {
+\ 	'(': { 'pattern': '(', 'lm': 0, 'rm': 0, 'stl': 0},
+\ 	')': { 'pattern': ')', 'lm': 0, 'rm': 0, 'stl': 0}
+\ }

vim/config/plugin/vim-multiple-cursor.vim

@@ -0,0 +1,10 @@
+let g:multi_cursor_use_default_mapping=0
+
+let g:multi_cursor_start_word_key      = '<C-m>'
+let g:multi_cursor_select_all_word_key = '<C-l>'
+let g:multi_cursor_start_key           = 'g<C-m>'
+let g:multi_cursor_select_all_key      = 'g<C-l>'
+let g:multi_cursor_next_key            = '<C-n>'
+let g:multi_cursor_prev_key            = '<C-p>'
+let g:multi_cursor_skip_key            = '<C-x>'
+let g:multi_cursor_quit_key            = '<Esc>'

vim/config/plugins.vim

@@ -13,6 +13,8 @@ Plugin 'scrooloose/nerdtree'
 Plugin 'bling/vim-airline'
 Plugin 'majutsushi/tagbar'
 Plugin 'jistr/vim-nerdtree-tabs'
+Plugin 'junegunn/vim-easy-align'
+Plugin 'terryma/vim-multiple-cursors'
 
 " Plugin de syntaxe
 Plugin 'othree/html5.vim'
@@ -26,9 +28,6 @@ Plugin 'mattn/jscomplete-vim.git'
 Plugin 'jelera/vim-javascript-syntax'
 Plugin 'othree/javascript-libraries-syntax.vim'
 
-"Plugin 'darkelfe/vim-highlight'
-"Plugin 'file:///home/darkelfe/Git/vim-highlight'
-
 " Thème
 Plugin 'tomasr/molokai'
 

zsh/config/.gitignore

@@ -0,0 +1 @@
+*

zsh/zshrc

@@ -44,8 +44,17 @@ zstyle ':completion:*' verbose true
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
 zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
 
+# Include other files
 source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 		# Coloration syntaxique à la volée
 
+source ~/.zsh/ssh_agent				# Pour que ssh-add marche sans se plaindre de ssh-agent
+
+#	Fichiers de config perso à la machine
+for conf_file in ~/.zsh/config/* ;
+do
+	source $conf_file ;
+done
+
 # USER part
 # 	Interface de demande
 autoload -U colors && colors
@@ -64,7 +73,9 @@ alias ll='ls -l'
 alias la='ll -a'
 
 alias vim='vim -p'			# Ouvre les paramètres comme des onglets au lieu de buffers
+alias 7z_max="7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on"
 
+alias maj="apti update && apti full-upgrade"
 maj_calibre() {
 	sudo -v && wget -nv -O- https://download.calibre-ebook.com/linux-installer.py | sudo python -c "import sys; main=lambda x:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main('/opt')"
 }
@@ -83,12 +94,3 @@ find_php() {
 	fi
 	find $arg_path -type f -iname "*.php" -print0 | xargs --null grep $arg_options $1
 }
-
-#alias cclive='cclive -c'			# Continue automatiquement les DL
-#alias cclive-best='cclive --stream best'	# DL avec la qualité max
-
-alias 7z_max="7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on"
-alias maj="apti update && apti full-upgrade"
-
-# Include other files
-source "$HOME/consoleConfig/zsh/ssh_agent"