diff --git a/files/xinitrc b/files/xinitrc
new file mode 100644
index 0000000..d9b2476
--- /dev/null
+++ b/files/xinitrc
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+xrandr --setprovideroutputsource modesetting NVIDIA-0
+xrandr --auto
+setxkbmap de
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+
+    xrdb -merge $sysresources
+
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+
+    xrdb -merge "$userresources"
+
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
+
+dbus-update-activation-environment --systemd DISPLAY
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+export SSH_AUTH_SOCK
+
+exec i3
+
diff --git a/roles/copy_files/tasks/main.yml b/roles/copy_files/tasks/main.yml
index e9d50c1..17bb439 100644
--- a/roles/copy_files/tasks/main.yml
+++ b/roles/copy_files/tasks/main.yml
@@ -1,19 +1,11 @@
 ---
 
-- name: copy bg
-  copy:
-    src: files/background.png
-    dest: /home/{{ user }}/.config/background.png
-    owner: "{{ user }}"
-    group: "{{ user }}"
-    mode: 0644
-
-- name: copy bg
-  copy:
-    src: files/lockscreen.png
-    dest: /home/{{ user }}/.config/lockscreen.png
-    owner: "{{ user }}"
-    group: "{{ user }}"
-    mode: 0644
-
+- name: copy files
+  copy: 
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  with_items:
+    - { src: 'files/background.png', dest: "/home/{{ user }}/.config/background.png" }
+    - { src: 'files/lockscreen.png', dest: '/home/{{ user }}/.config/lockscreen.png' }
+    - { src: 'files/xinitrc', dest: '/home/{{ user }}/.xinitrc' }
 
diff --git a/roles/nextcloud b/roles/nextcloud
index 51d814e..57475b7 160000
--- a/roles/nextcloud
+++ b/roles/nextcloud
@@ -1 +1 @@
-Subproject commit 51d814e237d9869f1a537c2319bcd4d91d04414b
+Subproject commit 57475b7eadf661e5047f853c3f1d9176f8a53e0b
diff --git a/setup.yml b/setup.yml
index aee5873..4d85244 100644
--- a/setup.yml
+++ b/setup.yml
@@ -56,4 +56,13 @@
     - copy_files
     - i3wm
 
+- name: install nextcloud-client
+  hosts: thinkpad
+  tags:
+  - setup
+  - nextcloud
+  roles:
+    - nextcloud
+
+