mirror of
https://github.com/artizirk/dotfiles.git
synced 2024-12-04 12:50:59 +02:00
Compare commits
2 Commits
7d816c971b
...
08e0456290
Author | SHA1 | Date | |
---|---|---|---|
08e0456290 | |||
f5dc53aa6d |
@ -4,6 +4,7 @@
|
|||||||
[merge]
|
[merge]
|
||||||
tool = meld
|
tool = meld
|
||||||
conflictStyle = zdiff3
|
conflictStyle = zdiff3
|
||||||
|
keepbackup = false
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches
|
plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches
|
||||||
@ -27,6 +28,7 @@
|
|||||||
smtpServerPort = 587
|
smtpServerPort = 587
|
||||||
[diff]
|
[diff]
|
||||||
wsErrorHighlight = all
|
wsErrorHighlight = all
|
||||||
|
algorithm = histogram
|
||||||
[cola]
|
[cola]
|
||||||
spellcheck = false
|
spellcheck = false
|
||||||
[push]
|
[push]
|
||||||
@ -58,3 +60,9 @@
|
|||||||
allow = always
|
allow = always
|
||||||
[column]
|
[column]
|
||||||
ui = auto
|
ui = auto
|
||||||
|
[rebase]
|
||||||
|
autosquash = true
|
||||||
|
[branch]
|
||||||
|
sort = -committerdate
|
||||||
|
[fetch]
|
||||||
|
prune = true
|
||||||
|
14
.zshrc
14
.zshrc
@ -251,19 +251,27 @@ else
|
|||||||
ruby_gem_user_dir=''
|
ruby_gem_user_dir=''
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# kubectl plugin manager Krew
|
||||||
|
export KREW_ROOT="~/.config/krew"
|
||||||
|
if [[ -d "${KREW_ROOT}/bin" ]]; then
|
||||||
|
krew_bin_path="${KREW_ROOT}/bin"
|
||||||
|
else
|
||||||
|
krew_bin_path=''
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# ZSH allows $PATH to be used as an array
|
# ZSH allows $PATH to be used as an array
|
||||||
path=(
|
path=(
|
||||||
~/.bin
|
~/.bin
|
||||||
~/.local/bin
|
~/.local/bin
|
||||||
|
${ruby_gem_user_dir}
|
||||||
|
${krew_bin_path}
|
||||||
/usr/bin/site_perl
|
/usr/bin/site_perl
|
||||||
/usr/bin/vendor_perl
|
/usr/bin/vendor_perl
|
||||||
/usr/bin/core_perl
|
/usr/bin/core_perl
|
||||||
"${ruby_gem_user_dir}"
|
|
||||||
$path
|
$path
|
||||||
)
|
)
|
||||||
|
|
||||||
export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
|
|
||||||
|
|
||||||
HISTSIZE=100000
|
HISTSIZE=100000
|
||||||
SAVEHIST=100000
|
SAVEHIST=100000
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user