4 files changed, 20 insertions, 10 deletions

diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml
index ca6deeb..96c1479 100644
--- a/roles/dotfiles/tasks/main.yml
+++ b/roles/dotfiles/tasks/main.yml
@@ -30,10 +30,12 @@
       failed_when: false
       register: has_vim
 
-    - name: Copy vimrc to home directory
-      ansible.builtin.copy:
-        src: misc/dotfiles/vimrc
-        dest: '{{ homedir }}/.vimrc'
+    - ansible.builtin.include_role:
+        name: vimrc
+      vars:
+        vimrc_user: '{{ user }}'
+        vimrc_group: '{{ group }}'
+        vimrc_homedir: '{{ homedir }}'
       when: has_vim.rc == 0
 
 - name: Configure screen if installed
diff --git a/roles/vim/tasks/main.yml b/roles/vim/tasks/main.yml
index cd0fcc6..e174c58 100644
--- a/roles/vim/tasks/main.yml
+++ b/roles/vim/tasks/main.yml
@@ -5,11 +5,7 @@
     state: present
 
 - name: Configure vim for Dmitry Ilvokhin
-  ansible.builtin.copy:
-    src: misc/dotfiles/vimrc
-    dest: /home/d/.vimrc
-    owner: d
-    group: d
-    mode: u+rw,g+r,o+r
+  ansible.builtin.include_role:
+    name: vimrc
   tags:
     - dotfiles
diff --git a/roles/vimrc/defaults/main.yml b/roles/vimrc/defaults/main.yml
new file mode 100644
index 0000000..720d9a5
--- /dev/null
+++ b/roles/vimrc/defaults/main.yml
@@ -0,0 +1,3 @@
+vimrc_user: d
+vimrc_group: d
+vimrc_homedir: /home/{{ vimrc_user }}
diff --git a/roles/vimrc/tasks/main.yml b/roles/vimrc/tasks/main.yml
new file mode 100644
index 0000000..d5559e4
--- /dev/null
+++ b/roles/vimrc/tasks/main.yml
@@ -0,0 +1,9 @@
+- name: Copy vimrc to home directory
+  ansible.builtin.copy:
+    src: misc/dotfiles/vimrc
+    dest: '{{ vimrc_homedir }}/.vimrc'
+    owner: '{{ vimrc_user }}'
+    group: '{{ vimrc_group }}'
+    mode: u+rw,g+r,o+r
+  tags:
+    - dotfiles