diff --git a/home/user/.config/zsh/aliases b/home/user/.config/zsh/aliases index 0d690dc..e60cb83 100644 --- a/home/user/.config/zsh/aliases +++ b/home/user/.config/zsh/aliases @@ -1,8 +1,6 @@ # vim: ft=zsh -alias zshrc='source "${ZDOTDIR}/.zshrc"' - _d() { true ; } _f() { true ; } @@ -54,9 +52,10 @@ alias pd='popd' # shorts alias c='clear' -alias h='history 0' +alias h='history -d -D 0' alias j='jobs -l' +alias zshrc='source "${ZDOTDIR}/.zshrc" >/dev/null' if command -v colordiff &>/dev/null; then alias diff='colordiff' @@ -75,6 +74,13 @@ alias beeptime='beep -D 400 -l 400 -r "$(date +%I)" -f 440 -n -D 1000 -l 0 -n -D alias vi='nvim' alias svi="sudo --preserve-env nvim" +# git +alias gs="git status" +alias gd="git diff" +alias gds="git diff --staged" +alias ga="git a" +alias gcim="git cim" + # net alias ports='ss -tlnp' alias wget='wget -c' diff --git a/home/user/.config/zsh/mappings b/home/user/.config/zsh/mappings index a5d6192..c4e200e 100644 --- a/home/user/.config/zsh/mappings +++ b/home/user/.config/zsh/mappings @@ -87,9 +87,9 @@ bindkey -M vicmd "^O" cddotdot fzfhistory() { - BUFFER="$(history -n 0 | fzf --tac --no-multi --height="$(($LINES/4))" --query="$BUFFER")" + LBUFFER="$(history -n 0 | fzf --tac --no-multi --height="$(($LINES/4))" --query="$BUFFER")" zle reset-prompt } zle -N fzfhistory bindkey "^R" fzfhistory -bindkey -M vicmd "^R" fzfhistory +bindkey -M vicmd "^R" fzfhistory \ No newline at end of file