From 3b2ae162b8853f1c6d5feaa8bf4e880972a07ac9 Mon Sep 17 00:00:00 2001 From: Quentin Godefroid Date: Fri, 15 Jun 2018 12:06:05 +0200 Subject: [PATCH] work others fixes --- config/gitconfig | 16 +++++++++------- config/nanorc | 11 ++++++----- config/zshrc | 4 ++++ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/config/gitconfig b/config/gitconfig index 76cd7a5..0135c2d 100644 --- a/config/gitconfig +++ b/config/gitconfig @@ -1,14 +1,16 @@ [user] {{if eq .Env.USER "qgodefro"}} - name = "Quentin Godefroid" - email = "quentin.godefroid@corp.ovh.com" + name = "Quentin Godefroid" + email = "quentin.godefroid@corp.ovh.com" {{else if eq .Env.USER "quentin"}} - name = "Quentin Godefroid" - email = "quentin.git@godefroid.eu" + name = "Quentin Godefroid" + email = "quentin.git@godefroid.eu" {{else}} - name = "Hactarus" - email = "hactarus.git@cresi.be" + name = "Hactarus" + email = "hactarus.git@cresi.be" {{end}} [alias] - pushdev = !git push --set-upstream origin "`git branch --no-color 2>/dev/null | grep '*' | sed -e 's/\\* //'`:dev/{{ .Env.USER }}/`git branch --no-color 2>/dev/null | grep '*' | sed -e 's/\\* //'`" \ No newline at end of file + pushdev = !git push --set-upstream origin "`git branch --no-color 2>/dev/null | grep '*' | sed -e 's/\\* //'`:dev/{{ .Env.USER }}/`git branch --no-color 2>/dev/null | grep '*' | sed -e 's/\\* //'`" +[push] + default = simple \ No newline at end of file diff --git a/config/nanorc b/config/nanorc index 0fbac4a..b93226a 100644 --- a/config/nanorc +++ b/config/nanorc @@ -12,7 +12,7 @@ set constantshow # set fill -4 # set historylog # set justifytrim -set linenumbers +# set linenumbers # set locking set matchbrackets "(<[{)>]}" # set morespace @@ -49,14 +49,14 @@ set tabsize 4 # set wordchars "<_>." set titlecolor brightwhite,blue set statuscolor brightwhite,green -set selectedcolor brightwhite,magenta -set numbercolor cyan +#set selectedcolor brightwhite,magenta +#set numbercolor cyan set keycolor cyan set functioncolor green set titlecolor brightwhite,red set statuscolor brightwhite,red -set selectedcolor brightwhite,cyan -set numbercolor magenta +#set selectedcolor brightwhite,cyan +#set numbercolor magenta # set keycolor brightmagenta # set functioncolor magenta include "/usr/share/nano/*.nanorc" @@ -64,3 +64,4 @@ include "/usr/share/nano/*.nanorc" # bind M-B cutwordleft main # bind M-N cutwordright main # bind Del backspace all +set nonewlines diff --git a/config/zshrc b/config/zshrc index f919cc2..06bdfe3 100644 --- a/config/zshrc +++ b/config/zshrc @@ -268,6 +268,10 @@ tmux #zsh_reload ) +zstyle :omz:plugins:ssh-agent agent-forwarding on +zstyle :omz:plugins:ssh-agent identities id_ed25519 work_201806 auberge +zstyle :omz:plugins:ssh-agent lifetime 4h + source $ZSH/oh-my-zsh.sh # User configuration