diff --git a/gitconfig b/gitconfig index 5dd9a3b..8a8c72a 100644 --- a/gitconfig +++ b/gitconfig @@ -25,9 +25,10 @@ tg = "!f() { git tag -a $1 -m \"${2-$1}\" }; f" pu = "f() { git push && git push --tags }; f" sm = "!f() { git pull && git merge ${2-$(git config --get custom.serverbranch.remote)}/${1} && git push; }; f" + submodule-del = "!f() { git submodule deinit -d -- ${1}; rm -rf .git/modules/${1}; git rm -f ${1}; }; f" [core] editor = vim - autocrlf = false + autocrlf = input [push] default = current [filter "lfs"] diff --git a/vim/config/parametrage.vim b/vim/config/parametrage.vim index 0862e49..c412676 100644 --- a/vim/config/parametrage.vim +++ b/vim/config/parametrage.vim @@ -17,6 +17,8 @@ autocmd BufEnter *.yml " Yml \ set shiftwidth=4| \ set expandtab +autocmd BufEnter gitconfig set syntax=gitconfig " Git + autocmd BufEnter *.vim set foldmethod=marker " Vim autocmd BufNewFile *.rb so ~/.vim/headers/ruby.vim " Ruby : entête auto diff --git a/zsh/zshrc b/zsh/zshrc index d40ac09..5bb6078 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -93,7 +93,7 @@ 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" +alias maj="aptlu" 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')" }