diff --git a/group_vars/all.yml b/group_vars/all.yml
index 951714d..04fd67c 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -67,4 +67,4 @@ aur_packages:
   - pgformatter-git
   # - jetbrains-toolbox
 
-config_dir: "{{ ansible_facts.env.HOME }}/.config"
+config_dir: "/home/johannes/.config"
diff --git a/playbook.yml b/playbook.yml
index 3a00628..6077d35 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -8,13 +8,13 @@
   # roles:
   #   - zsh
 
-  pre_tasks:
-    - name: Create btrfs snapshot before changes
-      shell: |
-        sudo btrfs subvolume snapshot / /.snapshots/before-dotfiles-$(date +%Y%m%d-%H%M%S)
-      tags: [snapshot]
-      become: true
-      become_method: sudo
+  # pre_tasks:
+  #   - name: Create btrfs snapshot before changes
+  #     shell: |
+  #       btrfs subvolume snapshot / /.snapshots/before-dotfiles-$(date +%Y%m%d-%H%M%S)
+  #     tags: [snapshot]
+  #     become: true
+  #     become_method: sudo
 
   tasks: 
     - name: Install enabled roles
diff --git a/roles/hyprland/files/hypr/monitors.conf b/roles/hyprland/files/hypr/monitors_jk-pc.conf
similarity index 100%
rename from roles/hyprland/files/hypr/monitors.conf
rename to roles/hyprland/files/hypr/monitors_jk-pc.conf
diff --git a/roles/hyprland/tasks/main.yml b/roles/hyprland/tasks/main.yml
index f5245af..6ac9512 100644
--- a/roles/hyprland/tasks/main.yml
+++ b/roles/hyprland/tasks/main.yml
@@ -1,8 +1,40 @@
 ---
-- name: Symlink hyprland
+- name: Check if hypr path is a symlink
+  stat:
+    path: "{{ config_dir }}/hypr"
+  register: hypr_stat
+
+- name: Remove existing hypr symlink if present
   file:
-    src: "{{ role_path }}/files/hypr"
-    dest: "{{ config_dir }}/hypr"
+    path: "{{ config_dir }}/hypr"
+    state: absent
+  when: hypr_stat.stat.exists and hypr_stat.stat.islnk
+
+- name: Create hypr config directory
+  file:
+    path: "{{ config_dir }}/hypr"
+    state: directory
+    mode: '0755'
+    owner: johannes
+    group: johannes
+
+- name: Symlink hyprland config files
+  file:
+    src: "{{ role_path }}/files/hypr/{{ item }}"
+    dest: "{{ config_dir }}/hypr/{{ item }}"
+    state: link
+    force: true
+  loop:
+    - hyprland.conf
+    - hyprlock.conf
+    - hyprpaper.conf
+    - workspaces.conf
+    - scripts
+
+- name: Symlink host-specific monitors.conf
+  file:
+    src: "{{ role_path }}/files/hypr/monitors_{{ ansible_hostname }}.conf"
+    dest: "{{ config_dir }}/hypr/monitors.conf"
     state: link
     force: true