mirror of
https://github.com/JanJastrow/.dotfiles.git
synced 2024-11-23 10:59:57 +01:00
Compare commits
No commits in common. "65122c9d2eba2f81ce70d7726c4f8a446f189d21" and "37dc883e1ea91bb99d5f5d1ebd171e02e37262c7" have entirely different histories.
65122c9d2e
...
37dc883e1e
@ -11,7 +11,7 @@
|
|||||||
[alias]
|
[alias]
|
||||||
a = add
|
a = add
|
||||||
br = branch
|
br = branch
|
||||||
c = commit -m
|
c = commit
|
||||||
ca = c -a
|
ca = c -a
|
||||||
co = checkout
|
co = checkout
|
||||||
conflict = diff --name-only --diff-filter=U
|
conflict = diff --name-only --diff-filter=U
|
||||||
@ -19,8 +19,7 @@
|
|||||||
hash = !git rev-parse HEAD | cut -c 1-8
|
hash = !git rev-parse HEAD | cut -c 1-8
|
||||||
l = log --all --color --graph --pretty=format:'%Cred%h%Creset %G?%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit # Colorful and easy to read log
|
l = log --all --color --graph --pretty=format:'%Cred%h%Creset %G?%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit # Colorful and easy to read log
|
||||||
last = log -1 HEAD --stat
|
last = log -1 HEAD --stat
|
||||||
pl = pull
|
p = pull
|
||||||
pu = push
|
|
||||||
rv = remote -v
|
rv = remote -v
|
||||||
se = !git rev-list --all | xargs git grep -F
|
se = !git rev-list --all | xargs git grep -F
|
||||||
st = status -sb
|
st = status -sb
|
||||||
|
45
zsh/env
45
zsh/env
@ -11,6 +11,28 @@ export LC_TYPE=en_US.UTF-8
|
|||||||
# set default editor
|
# set default editor
|
||||||
export EDITOR="nano"
|
export EDITOR="nano"
|
||||||
|
|
||||||
|
# set `ll` alias
|
||||||
|
# eza > lsd > bls
|
||||||
|
alias ll=bls
|
||||||
|
|
||||||
|
if [[ -x $(which lsd) ]]; then
|
||||||
|
alias ll=lsd
|
||||||
|
alias lsd='pwd; lsd -laF --group-dirs=first --icon=never'
|
||||||
|
fi
|
||||||
|
if [[ -x $(which eza) ]]; then
|
||||||
|
alias ll=eza
|
||||||
|
alias eza='pwd; eza --long --all --all --group-directories-first --git --group'
|
||||||
|
fi
|
||||||
|
|
||||||
|
## Better LS
|
||||||
|
if [[ $platform == 'Linux' ]]; then
|
||||||
|
alias bls='pwd; ls -lahp --color=auto --group-directories-first'
|
||||||
|
elif [[ $platform == 'macOS' && -x $(which gls) ]]; then
|
||||||
|
alias bls='pwd; gls -lahpG --group-directories-first'
|
||||||
|
elif [[ $platform == 'macOS' ]]; then
|
||||||
|
alias bls='pwd; /bin/ls -lahGp'
|
||||||
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
# Path additions
|
# Path additions
|
||||||
#
|
#
|
||||||
@ -85,27 +107,4 @@ if command -v thefuck >/dev/null 2>&1; then
|
|||||||
fuck() {
|
fuck() {
|
||||||
eval "$(thefuck --alias)" && fuck
|
eval "$(thefuck --alias)" && fuck
|
||||||
}
|
}
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# `ll` Setup
|
|
||||||
# eza > lsd > bls
|
|
||||||
alias ll=bls
|
|
||||||
|
|
||||||
if [[ -x $(which lsd) ]]; then
|
|
||||||
alias ll=lsd
|
|
||||||
alias lsd='pwd; lsd -laF --group-dirs=first --icon=never'
|
|
||||||
fi
|
|
||||||
if [[ -x $(which eza) ]]; then
|
|
||||||
alias ll=eza
|
|
||||||
alias eza='pwd; eza --long --all --all --group-directories-first --git --group'
|
|
||||||
fi
|
|
||||||
|
|
||||||
## Better LS
|
|
||||||
if [[ $platform == 'Linux' ]]; then
|
|
||||||
alias bls='pwd; ls -lahp --color=auto --group-directories-first'
|
|
||||||
elif [[ $platform == 'macOS' && -x $(which gls) ]]; then
|
|
||||||
alias bls='pwd; gls -lahpG --group-directories-first --color-scale --time-style=long-iso'
|
|
||||||
elif [[ $platform == 'macOS' ]]; then
|
|
||||||
alias bls='pwd; /bin/ls -lahGp'
|
|
||||||
fi
|
fi
|
Loading…
Reference in New Issue
Block a user