work others fixes

This commit is contained in:
Quentin Godefroid 2018-06-15 12:06:05 +02:00
parent bb68ddcc34
commit 3b2ae162b8
3 changed files with 19 additions and 12 deletions

View file

@ -1,14 +1,16 @@
[user] [user]
{{if eq .Env.USER "qgodefro"}} {{if eq .Env.USER "qgodefro"}}
name = "Quentin Godefroid" name = "Quentin Godefroid"
email = "quentin.godefroid@corp.ovh.com" email = "quentin.godefroid@corp.ovh.com"
{{else if eq .Env.USER "quentin"}} {{else if eq .Env.USER "quentin"}}
name = "Quentin Godefroid" name = "Quentin Godefroid"
email = "quentin.git@godefroid.eu" email = "quentin.git@godefroid.eu"
{{else}} {{else}}
name = "Hactarus" name = "Hactarus"
email = "hactarus.git@cresi.be" email = "hactarus.git@cresi.be"
{{end}} {{end}}
[alias] [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/\\* //'`" 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

View file

@ -12,7 +12,7 @@ set constantshow
# set fill -4 # set fill -4
# set historylog # set historylog
# set justifytrim # set justifytrim
set linenumbers # set linenumbers
# set locking # set locking
set matchbrackets "(<[{)>]}" set matchbrackets "(<[{)>]}"
# set morespace # set morespace
@ -49,14 +49,14 @@ set tabsize 4
# set wordchars "<_>." # set wordchars "<_>."
set titlecolor brightwhite,blue set titlecolor brightwhite,blue
set statuscolor brightwhite,green set statuscolor brightwhite,green
set selectedcolor brightwhite,magenta #set selectedcolor brightwhite,magenta
set numbercolor cyan #set numbercolor cyan
set keycolor cyan set keycolor cyan
set functioncolor green set functioncolor green
set titlecolor brightwhite,red set titlecolor brightwhite,red
set statuscolor brightwhite,red set statuscolor brightwhite,red
set selectedcolor brightwhite,cyan #set selectedcolor brightwhite,cyan
set numbercolor magenta #set numbercolor magenta
# set keycolor brightmagenta # set keycolor brightmagenta
# set functioncolor magenta # set functioncolor magenta
include "/usr/share/nano/*.nanorc" include "/usr/share/nano/*.nanorc"
@ -64,3 +64,4 @@ include "/usr/share/nano/*.nanorc"
# bind M-B cutwordleft main # bind M-B cutwordleft main
# bind M-N cutwordright main # bind M-N cutwordright main
# bind Del backspace all # bind Del backspace all
set nonewlines

View file

@ -268,6 +268,10 @@ tmux
#zsh_reload #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 source $ZSH/oh-my-zsh.sh
# User configuration # User configuration