diff --git a/roles/dotfiles/files/fish/config.fish b/roles/dotfiles/files/fish/config.fish
index e7e546d..4509fbc 100644
--- a/roles/dotfiles/files/fish/config.fish
+++ b/roles/dotfiles/files/fish/config.fish
@@ -8,6 +8,7 @@ if status --is-login
 end
 
 fundle plugin 'edc/bass'
+fundle plugin 'danhper/fish-ssh-agent'
 fundle init
 # run `fundle install` in the terminal
 
@@ -23,6 +24,8 @@ if test -e /home/rothe/catkin_ws/install/setup.bash
 	bass source ~/.profile
 end
 
-set -Ua fish_user_paths ~/go/bin/
+fish_add_path ~/go/bin/
+fish_add_path ~/bin/
 
-eval (keychain --eval --agents ssh)
+# set work specific stuff in there like GIT_AUTHOR_EMAIL and JIRA_API_TOKEN
+bass source ~/.profile
diff --git a/roles/dotfiles/files/i3_config b/roles/dotfiles/files/i3_config
index 79a3629..34d6252 100644
--- a/roles/dotfiles/files/i3_config
+++ b/roles/dotfiles/files/i3_config
@@ -1,15 +1,17 @@
-set $mod Mod4
+	set $mod Mod4
 
-font pango:Roboto Medium 8
+	font pango:Roboto Medium 8
 
 
-# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
-# screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+	# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
+	# screen before suspend. Use loginctl lock-session to lock your screen.
+	exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 
-# NetworkManager is the most popular way to manage wireless networks on Linux,
-# and nm-applet is a desktop environment-independent system tray GUI for it.
-exec --no-startup-id nm-applet
+	# NetworkManager is the most popular way to manage wireless networks on Linux,
+	# and nm-applet is a desktop environment-independent system tray GUI for it.
+	exec --no-startup-id nm-applet
+
+	exec --no-startup-id "setxkbmap de"
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
@@ -28,7 +30,7 @@ new_window 1pixel
 bindsym $mod+Return exec gnome-terminal
 
 # set background
-exec --no-startup-id "hsetroot -center ~/pictures/wallpaper/malle.png"
+exec --no-startup-id "hsetroot -center ~/pictures/wallpaper/voxel-city-by-huntingfluff.jpg"
 
 # lock
 bindsym Mod1+l exec i3lock-fancy
diff --git a/roles/dotfiles/files/tmux.conf b/roles/dotfiles/files/tmux.conf
index a23cb77..daec6ff 100644
--- a/roles/dotfiles/files/tmux.conf
+++ b/roles/dotfiles/files/tmux.conf
@@ -38,3 +38,5 @@ set-window-option -g window-status-bell-style fg=colour232,bg=colour253
 # Correct colors
 set -g default-terminal "tmux-256color"
 set -ga terminal-overrides ",*256col*:Tc"
+
+set -g history-limit 150000
diff --git a/roles/dotfiles/files/wallpaper/voxel-city-by-huntingfluff.jpg b/roles/dotfiles/files/wallpaper/voxel-city-by-huntingfluff.jpg
new file mode 100644
index 0000000..0ea6c9f
Binary files /dev/null and b/roles/dotfiles/files/wallpaper/voxel-city-by-huntingfluff.jpg differ
diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml
index f102ba2..1bf099c 100644
--- a/roles/dotfiles/tasks/main.yml
+++ b/roles/dotfiles/tasks/main.yml
@@ -2,11 +2,12 @@
 # Install base packages
 - name: Install necessary packages
   become: yes
-  become_method: su
+  become_method: sudo
   become_user: root
   apt:
     name:
       - ack
+      - arandr
       - bat
       - black  # code formatting
       - bsdmainutils  # ncal calendar
@@ -27,8 +28,10 @@
       - ripgrep
       - rofi  # dmenu replacement
       - scrot  # screenshot
+      - shellcheck
       - tmux
       - vim
+      - vim-nox
     state: present
     cache_valid_time: 3600
 
@@ -72,6 +75,7 @@
     - '{{ home }}/.config/i3/'
     - '{{ home }}/.config/i3status/'
     - '{{ home }}/.config/rofi/'
+    - '{{ home }}/.config/tmux/'
     - '{{ home }}/.ssh/'
     - '{{ home }}/pictures/shots/'
     - '{{ home }}/.gnupg/'
@@ -92,7 +96,7 @@
     - src: '{{ files_dir }}/rofi_config'
       dest: '{{ home }}/.config/rofi/config.rasi'
     - src: '{{ files_dir }}/tmux.conf'
-      dest: '{{ home }}/.tmux.conf'
+      dest: '{{ home }}/.config/tmux/tmux.conf'
     - src: '{{ files_dir }}/ssh_config'
       dest: '{{ home }}/.ssh/config'
     - src: '{{ files_dir }}/fish'