diff --git a/TODO b/TODO index 85bad95..74fd208 100644 --- a/TODO +++ b/TODO @@ -27,7 +27,6 @@ # IMPROVMENTS * try a GTK theme with some transparency -* dynamic username: sed 's/user/{{ user }}/g' and use templating - how to configure a user and root for desktop in one run ? - readd terminfo role diff --git a/group_vars/all.yml b/group_vars/all.yml index 1349cf9..f13949e 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -1,5 +1,4 @@ --- font: jetbrains mono -user: user git_name: eoli3n git_mail: jkirsz@gmail.com diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index 4981e95..ab63afd 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -1,5 +1,5 @@ --- - name: git config file template: - templates: gitconfig.j2 + src: gitconfig.j2 dest: ~/.gitconfig diff --git a/roles/gtk/tasks/main.yml b/roles/gtk/tasks/main.yml index e85a75c..5d4ea75 100644 --- a/roles/gtk/tasks/main.yml +++ b/roles/gtk/tasks/main.yml @@ -10,9 +10,9 @@ dest: ~/.config/gtk-3.0/ - name: Configure GTK2 - copy: - src: gtkrc-2.0 - dest: ~/.config/.gtkrc-2.0 + template: + src: gtkrc-2.0.j2 + dest: ~/.gtkrc-2.0 - name: Configure Qt as GTK theme copy: diff --git a/roles/gtk/files/gtkrc-2.0 b/roles/gtk/templates/gtkrc-2.0.j2 similarity index 91% rename from roles/gtk/files/gtkrc-2.0 rename to roles/gtk/templates/gtkrc-2.0.j2 index 641df75..c5e8cd7 100644 --- a/roles/gtk/files/gtkrc-2.0 +++ b/roles/gtk/templates/gtkrc-2.0.j2 @@ -1,7 +1,7 @@ # DO NOT EDIT! This file will be overwritten by LXAppearance. # Any customization should be done in ~/.gtkrc-2.0.mine instead. -include "/home/user/.gtkrc-2.0.mine" +include "{{ ansible_user_dir }}/.gtkrc-2.0.mine" gtk-theme-name="Equilux-compact" gtk-icon-theme-name="Papirus-Dark" gtk-font-name="Sans 10"