fix: alias, arch-updates (polybar)

add: vim mergetool
This commit is contained in:
Tobias Reisinger 2020-06-26 18:21:39 +02:00
parent f37f66248f
commit 544bb9ed2c
7 changed files with 35 additions and 16 deletions
.config/zsh

View file

@ -1,8 +1,17 @@
[ -f "$HOME/.config/user-dirs.dirs" ] && source $HOME/.config/user-dirs.dirs
source $HOME/.config/enviroment
# Enable colors and change prompt:
autoload -U colors && colors
PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}
autoload -Uz vcs_info
precmd()
{
vcs_info
}
zstyle ':vcs_info:git*' formats " (%b)" # hash & branch
setopt prompt_subst
PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$fg[green]%}\$vcs_info_msg_0_%{$reset_color%}
$%b "
# History in cache directory:
@ -40,11 +49,6 @@ echo -ne '\e[1 q' # Use beam shape cursor on startup.
autoload edit-command-line; zle -N edit-command-line
bindkey '^e' edit-command-line
export PATH=/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin
# set PATH so it includes user's private bin if it exists
[ -d "$HOME/.local/bin" ] && PATH="$HOME/.local/bin:$PATH"
[ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc
# Load zsh-syntax-highlighting; should be last.