diff --git a/git/gitconfig b/git/gitconfig
index ce61e8c..5d41aa3 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -66,7 +66,7 @@
     detachedHead = false
 [commit]
     gpgSign = true
-    cleanup = default
+    ; cleanup = default
     status = true
 [status]
     relativePaths = false
diff --git a/i3/config b/i3/config
index 82de0a0..fdcb007 100644
--- a/i3/config
+++ b/i3/config
@@ -20,6 +20,7 @@
 
     # The default terminal
     set $terminal "urxvt -title terminal"
+    set $calc "urxvt256c -title term -e $SHELL -i -c calc"
 
     set $scriptdir ~/.i3/scripts
 
@@ -192,6 +193,7 @@ assign [class="^Keepassx$"] $workspace8
 
     bindsym $mod+d exec --no-startup-id ~/.i3/scripts/appmenu
     bindsym $mod+Return exec $terminal
+    bindsym $mod+Shift+Return exec $calc
 
     bindsym F1 exec --no-startup-id ~/.i3/scripts/shutdown-menu
     bindsym $mod+F1 exec --no-startup-id ~/.i3/scripts/i3exit lock
diff --git a/i3/i3status.conf b/i3/i3status.conf
index 0140cb2..a20caf5 100644
--- a/i3/i3status.conf
+++ b/i3/i3status.conf
@@ -31,7 +31,7 @@ battery_level 0 {
     charging_character = ""
     blocks = ""
     notification = true
-    hide_when_full = true
+    hide_when_full = false
     notify_low_level = true
     threshold_full = 95
 }
@@ -53,6 +53,8 @@ spotify {
     format_down = "      off "
     cache_timeout = 1
     color_offline = '#FFFFFF'
+    on_click 1 = "exec $HOME/.i3/scripts/spotify-control toggle"
+    on_click 2 = "exec $HOME/.i3/scripts/spotify-control next"
 }
 
 online_status {
@@ -65,4 +67,5 @@ volume_status {
     format_muted = "      mute "
     thresholds = []
     command = "pactl"
+    color_muted = '#FFFFFF'
 }
diff --git a/packages.yml b/packages.yml
index 2d26017..08086a6 100644
--- a/packages.yml
+++ b/packages.yml
@@ -12,6 +12,9 @@ packages:
         - elfutils-libelf-devel
         - maven
       ubuntu: ["build-essential"]
+    golang:
+      fedora: ["golang", "glibc-static"]
+      ubuntu: ["golang-go"]
     eclipse:
       fedora: ["eclipse"]
     make:
diff --git a/playbook.yml b/playbook.yml
index f8577db..ca2006f 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -74,6 +74,17 @@
         - NetworkManager
       become: true
 
+    - name: set groups
+      user:
+        name: "{{ user }}"
+        groups:
+          - libvirt
+          - wheel
+          - vboxusers
+          - wireshark
+          - docker
+      become: true
+
     - name: get systemd boot target
       command: systemctl get-default
       register: systemd_target
diff --git a/vim/vimrc b/vim/vimrc
index eb3fa02..f9208f0 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -50,6 +50,8 @@ Plug 'vim-syntastic/syntastic'
 Plug 'ElmCast/elm-vim'
 Plug 'avh4/elm-format'
 
+Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+
 call plug#end()
 filetype plugin indent on
 
diff --git a/x/xinitrc b/x/xinitrc
old mode 100755
new mode 100644
diff --git a/zsh/zprofile b/zsh/zprofile
index 346d97c..fac6bbc 100644
--- a/zsh/zprofile
+++ b/zsh/zprofile
@@ -37,6 +37,9 @@ export LC_COLLATE=C
 
 export DOTFILES=~/dotfiles
 
+export GOPATH=~/dev/go
+
+export PATH=$PATH:$(go env GOPATH)/bin
 
 # Start the gpg-agent if not already running
 if ! pgrep -x --uid "${USER}" gpg-agent >/dev/null 2>&1; then
diff --git a/zsh/zshrc.d/20_aliases.sh b/zsh/zshrc.d/20_aliases.sh
index 86511ce..9aac967 100644
--- a/zsh/zshrc.d/20_aliases.sh
+++ b/zsh/zshrc.d/20_aliases.sh
@@ -9,6 +9,7 @@ alias tma="tmux ls 2>/dev/null && tmux attach-session || tmux"
 alias tmn="tmux new-session -A -s"
 
 alias clip="xclip -selection clipboard"
+alias clipc="xclip -selection primary"
 alias clipo="xclip -out -selection clipboard"
 
 alias rgrep="grep -r"
@@ -68,3 +69,7 @@ alias yaml2js="python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin)
 
 alias currentbranch='git rev-parse --abbrev-ref HEAD'
 alias gpush='git push origin $(currentbranch)'
+
+alias pass=mypass
+
+alias issh="ssh -o StrictHostKeyChecking=false -o UserKnownHostsFile=/dev/null"
diff --git a/zsh/zshrc.d/40_functions.sh b/zsh/zshrc.d/40_functions.sh
index 1879951..b5bab14 100644
--- a/zsh/zshrc.d/40_functions.sh
+++ b/zsh/zshrc.d/40_functions.sh
@@ -181,3 +181,24 @@ b() {
 sb() {
     echo $(( $1 * $(cat /sys/class/backlight/intel_backlight/max_brightness) / 100)) | sudo tee /sys/class/backlight/intel_backlight/brightness
 }
+
+journal() {
+    journaldir=~/journal/
+    file=~/journal/$(date +%Y-%m-%d).md
+    if [[ ! -e $file ]] ; then
+        cp $journaldir/template.md $file || return
+    fi
+    vim +Goyo +PencilSoft $file
+}
+
+syncfolder() {
+    folder=$1
+    mv $folder ~/sync
+    ln -s ~/sync/$folder ~/$folder
+}
+
+prefix() {
+    prefix=$2
+    file=$1
+    mv $file ${prefix}${file}
+}