5 files changed, 22 insertions, 11 deletions
diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml
index 96c1479..ce851f2 100644
--- a/roles/dotfiles/tasks/main.yml
+++ b/roles/dotfiles/tasks/main.yml
@@ -47,10 +47,13 @@
       failed_when: false
       register: has_screen
 
-    - name: Template screenrc to home directory
-      ansible.builtin.template:
-        src: misc/dotfiles/screenrc.j2
-        dest: '{{ homedir }}/.screenrc'
+    - ansible.builtin.include_role:
+        name: screenrc
+      vars:
+        screenrc_user: '{{ user }}'
+        screenrc_group: '{{ group }}'
+        screenrc_homedir: '{{ homedir }}'
+        screenrc_jumphost: '{{ jumphost }}'
       when: has_screen.rc == 0
 
 - name: Configure ssh if installed
diff --git a/roles/screen/defaults/main.yml b/roles/screen/defaults/main.yml
deleted file mode 100644
index 7ea2a66..0000000
--- a/roles/screen/defaults/main.yml
+++ /dev/null
@@ -1 +0,0 @@
-jumphost: false
diff --git a/roles/screen/tasks/main.yml b/roles/screen/tasks/main.yml
index 9affbea..c4f0cc7 100644
--- a/roles/screen/tasks/main.yml
+++ b/roles/screen/tasks/main.yml
@@ -5,11 +5,7 @@
     state: present
 
 - name: Configure screen for Dmitry Ilvokhin
-  ansible.builtin.template:
-    src: misc/dotfiles/screenrc.j2
-    dest: /home/d/.screenrc
-    owner: d
-    group: d
-    mode: u+rw,g+r,o+r
+  ansible.builtin.include_role:
+    name: screenrc
   tags:
     - dotfiles
diff --git a/roles/screenrc/defaults/main.yml b/roles/screenrc/defaults/main.yml
new file mode 100644
index 0000000..fe62928
--- /dev/null
+++ b/roles/screenrc/defaults/main.yml
@@ -0,0 +1,4 @@
+screenrc_user: d
+screenrc_group: d
+screenrc_homedir: /home/{{ screenrc_user }}
+screenrc_jumphost: '{{ jumphost }}'
diff --git a/roles/screenrc/tasks/main.yml b/roles/screenrc/tasks/main.yml
new file mode 100644
index 0000000..fc67feb
--- /dev/null
+++ b/roles/screenrc/tasks/main.yml
@@ -0,0 +1,9 @@
+- name: Template screenrc to home directory
+  ansible.builtin.template:
+    src: misc/dotfiles/screenrc.j2
+    dest: '{{ screenrc_homedir }}/.screenrc'
+    owner: '{{ screenrc_user }}'
+    group: '{{ screenrc_group }}'
+    mode: u+rw,g+r,o+r
+  tags:
+    - dotfiles