From b9b7e8719438e0699b07275d836990973ee40edf Mon Sep 17 00:00:00 2001 From: darkelfe14728 Date: Sat, 30 Mar 2019 15:21:01 +0100 Subject: [PATCH 1/7] add sudo alias --- zsh/zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/zsh/zshrc b/zsh/zshrc index 8748245..9fe6642 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -87,6 +87,7 @@ find_php() { #alias cclive='cclive -c' # Continue automatiquement les DL #alias cclive-best='cclive --stream best' # DL avec la qualité max +alias sudo='sudo ' # Permet de conserver l"environnement (alias etc.) avec la commande sudo alias 7z_max="7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on" alias maj="apti update && apti full-upgrade" From 22eb499fbbe5c6f2ced011e838812f7329353586 Mon Sep 17 00:00:00 2001 From: darkelfe14728 Date: Sat, 18 May 2019 10:45:49 +0200 Subject: [PATCH 2/7] zsh - add an autoloaded user config dir --- zsh/config/.gitignore | 1 + zsh/zshrc | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 zsh/config/.gitignore diff --git a/zsh/config/.gitignore b/zsh/config/.gitignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/zsh/config/.gitignore @@ -0,0 +1 @@ +* diff --git a/zsh/zshrc b/zsh/zshrc index 8748245..26e507d 100644 --- a/zsh/zshrc +++ b/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" From bb96e849b2d3dd1f9e3633df531a9951c0f1f045 Mon Sep 17 00:00:00 2001 From: darkelfe14728 Date: Sat, 18 May 2019 10:46:48 +0200 Subject: [PATCH 3/7] vim - php : fix comment highlight after semicolons --- vim/config/plugin/php.vim.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/vim/config/plugin/php.vim.vim b/vim/config/plugin/php.vim.vim index f999aa0..6609b61 100644 --- a/vim/config/plugin/php.vim.vim +++ b/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 From d7d9472bc85f311a39a631d4f0509eec879e17c3 Mon Sep 17 00:00:00 2001 From: darkelfe14728 Date: Sat, 18 May 2019 10:52:52 +0200 Subject: [PATCH 4/7] zsh - fix user config autoload --- zsh/zshrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh/zshrc b/zsh/zshrc index 26e507d..3100f17 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -50,9 +50,9 @@ source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh # Coloration 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/ ; +for conf_file in ~/.zsh/config/* ; do - source $conf_file; + source $conf_file ; done # USER part From 06c960addc9dc9f0cb5739b4019e7bb3f08f147a Mon Sep 17 00:00:00 2001 From: darkelfe14728 Date: Mon, 20 May 2019 10:30:26 +0200 Subject: [PATCH 5/7] =?UTF-8?q?Vim=20-=20Nouveaux=20plugins=20=20*=20vim-e?= =?UTF-8?q?asy-align=20:=20op=C3=A9rations=20d'alignement=20=20*=20vim-mul?= =?UTF-8?q?tiple-cursors=20:=20gestion=20avanc=C3=A9e=20de=20curseurs=20mu?= =?UTF-8?q?ltiples?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vim/config/parametrage-plugins.vim | 2 ++ vim/config/plugin/vim-easy-align.vim | 4 ++++ vim/config/plugin/vim-multiple-cursor.vim | 10 ++++++++++ vim/config/plugins.vim | 5 ++--- 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 vim/config/plugin/vim-easy-align.vim create mode 100644 vim/config/plugin/vim-multiple-cursor.vim diff --git a/vim/config/parametrage-plugins.vim b/vim/config/parametrage-plugins.vim index 0349a61..3b1e4f0 100644 --- a/vim/config/parametrage-plugins.vim +++ b/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 diff --git a/vim/config/plugin/vim-easy-align.vim b/vim/config/plugin/vim-easy-align.vim new file mode 100644 index 0000000..0615258 --- /dev/null +++ b/vim/config/plugin/vim-easy-align.vim @@ -0,0 +1,4 @@ +xmap ga (EasyAlign) +nmap ga (EasyAlign) + +vmap g, :EasyAlign *, {'rm': 1, 'lm': 0, 'stl': 0} diff --git a/vim/config/plugin/vim-multiple-cursor.vim b/vim/config/plugin/vim-multiple-cursor.vim new file mode 100644 index 0000000..49f3870 --- /dev/null +++ b/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 = '' +let g:multi_cursor_select_all_word_key = '' +let g:multi_cursor_start_key = 'g' +let g:multi_cursor_select_all_key = 'g' +let g:multi_cursor_next_key = '' +let g:multi_cursor_prev_key = '' +let g:multi_cursor_skip_key = '' +let g:multi_cursor_quit_key = '' diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim index 8da0e84..fb629d4 100644 --- a/vim/config/plugins.vim +++ b/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' From 294067f3da2c61e53f089ad72c2b2f67471778d4 Mon Sep 17 00:00:00 2001 From: darkelfe14728 Date: Sat, 25 May 2019 17:41:17 +0200 Subject: [PATCH 6/7] vim - EasyAlign : nouvelle regles pour ( et ) --- vim/config/plugin/vim-easy-align.vim | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vim/config/plugin/vim-easy-align.vim b/vim/config/plugin/vim-easy-align.vim index 0615258..87724a6 100644 --- a/vim/config/plugin/vim-easy-align.vim +++ b/vim/config/plugin/vim-easy-align.vim @@ -2,3 +2,8 @@ xmap ga (EasyAlign) nmap ga (EasyAlign) vmap g, :EasyAlign *, {'rm': 1, 'lm': 0, 'stl': 0} + +let g:easy_align_delimiters = { +\ '(': { 'pattern': '(', 'lm': 0, 'rm': 0, 'stl': 0}, +\ ')': { 'pattern': ')', 'lm': 0, 'rm': 0, 'stl': 0} +\ } From aaba3469e3c0ccf1c2126464522332c51475cbf1 Mon Sep 17 00:00:00 2001 From: darkelfe14728 Date: Tue, 28 May 2019 14:59:08 +0200 Subject: [PATCH 7/7] Git - Nouvel alias pour MAJ liste branches --- gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/gitconfig b/gitconfig index 461910a..3b43ad0 100644 --- a/gitconfig +++ b/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