diff --git a/.config/aliasrc b/.config/aliasrc
index 3fc4967..3f22170 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -7,7 +7,7 @@ alias df='df -h'
 alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
 alias dotfiles-mail='/usr/bin/git --git-dir=$HOME/.dotfiles-mail/ --work-tree=$HOME'
 
-alias du='du -hL'
+alias du='du -h'
 
 alias git-update-submodules='
     git submodule update --init --recursive;
diff --git a/.config/git/config b/.config/git/config
index caaf4a1..c6e3b70 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -8,7 +8,7 @@
 	pager = less
 	autocrlf = input
 [help]
-	autocorrect = 20
+	autocorrect = 10
 [diff]
 	tool = vimdiff
 [difftool]
@@ -18,12 +18,16 @@
     d = diff
     b = branch -vv
     logg = log --graph
+    logo = log --graph --decorate --oneline --all
     diffc = diff --cached
+
 [merge]
-	tool = vimdiff
-	conflictstyle = diff3
-[mergetool]
-    prompt = false
+    tool = vim_mergetool
+    conflictstyle = diff3
+[mergetool "vim_mergetool"]
+    cmd = vim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
+    trustExitCode = true
+
 [credential]
 	helper = /usr/bin/pass-git-helper
 [format]
@@ -33,3 +37,7 @@
 	smtpuser = tobias@msrg.cc
 	smtpencryption = tls
 	smtpserverport = 587
+[advice]
+	addIgnoredFile = false
+[pull]
+	ff = only
diff --git a/.config/pass-git-helper/git-pass-mapping.ini b/.config/pass-git-helper/git-pass-mapping.ini
index 6ebc9b6..42bf2a1 100644
--- a/.config/pass-git-helper/git-pass-mapping.ini
+++ b/.config/pass-git-helper/git-pass-mapping.ini
@@ -1,2 +1,7 @@
 [mail.serguzim.me:587]
 target=mail/${username}
+
+[github.com]
+username_extractor=regex_search
+regex_username=^login: (.*)$
+target=github.com
diff --git a/.config/polybar/custom.ini b/.config/polybar/custom.ini
index 86214e2..1b56e6b 100644
--- a/.config/polybar/custom.ini
+++ b/.config/polybar/custom.ini
@@ -13,13 +13,13 @@
 [module/arch-updates]
     type = custom/script
     exec = $HOME/.config/polybar/scripts/arch-updates.sh
-    interval = 60
+    interval = 300
 
     format-prefix = " "
     format-prefix-foreground = ${colors.foreground-alt}
     format-underline = #1794D1
     format = <label>
 
-    click-left = alacritty -e sh -c "sudo pacman -Su; read" &
+    click-left = alacritty -e sh -c "yay -Syu && echo DONE || echo ERROR; read" &
 
     label = %output%
diff --git a/.config/polybar/scripts/arch-updates.sh b/.config/polybar/scripts/arch-updates.sh
index 0181395..01109c4 100755
--- a/.config/polybar/scripts/arch-updates.sh
+++ b/.config/polybar/scripts/arch-updates.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-pkg_updates_count=$(pacman -Qu | wc -l)
+pkg_updates_count=$(checkupdates 2> /dev/null | wc -l)
 if [ $((pkg_updates_count)) -gt 0 ]
 then
     echo $pkg_updates_count
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index f7cb1d8..6680677 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -38,12 +38,12 @@ endif
 call plug#begin('~/.config/vim/plugged')
     Plug 'editorconfig/editorconfig-vim'
     Plug 'airblade/vim-gitgutter'
+    Plug 'samoshkin/vim-mergetool'
     Plug 'fidian/hexmode'
     Plug 'scrooloose/nerdtree'
     Plug 'itchyny/lightline.vim'
     Plug 'nanotech/jellybeans.vim'
     Plug 'scrooloose/syntastic'
-    Plug 'tpope/vim-fugitive'
     Plug 'sersorrel/vim-lilypond'
     Plug 'vim-scripts/DoxygenToolkit.vim'
     Plug 'drmikehenry/vim-headerguard'
@@ -101,3 +101,5 @@ let g:syntastic_always_populate_loc_list = 0
 let g:syntastic_auto_loc_list = 0
 let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 0
+let g:syntastic_oclint_config_file = '.syntastic_oclint_config'
+let g:syntastic_c_config_file = '.syntastic_cc_config'
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index c33caf4..fbd7dfa 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -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.