diff --git a/group_vars/all.yml b/group_vars/all.yml index 64fce98..1894933 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -1,5 +1,8 @@ --- font: jetbrains mono +font_size: 10 +gtk_theme: Adwaita-dark +icon_theme: Papirus-Dark git_name: eoli3n git_mail: jonathan.kirszling@runbox.com caldav: https://dav.runbox.com/ diff --git a/install.yml b/install.yml index a67d85b..cc5eec9 100644 --- a/install.yml +++ b/install.yml @@ -24,6 +24,8 @@ roles: - role: gtk tags: gtk + vars: + theme: "Adwaita-dark" when: ansible_user_id != 'root' - role: gpg tags: gpg diff --git a/roles/gtk/templates/gtkrc-2.0.j2 b/roles/gtk/templates/gtkrc-2.0.j2 index 22ed30f..481c536 100644 --- a/roles/gtk/templates/gtkrc-2.0.j2 +++ b/roles/gtk/templates/gtkrc-2.0.j2 @@ -2,17 +2,18 @@ # Any customization should be done in ~/.gtkrc-2.0.mine instead. include "{{ ansible_user_dir }}/.gtkrc-2.0.mine" -gtk-theme-name="Equilux-compact" -gtk-icon-theme-name="Papirus-Dark" -gtk-font-name="{{ font }} 10" +gtk-theme-name="{{ gtk_theme }}" +gtk-icon-theme-name="{{ icon_theme }}" +gtk-font-name="{{ font }} {{ font_size}}" gtk-cursor-theme-name="Adwaita" -gtk-cursor-theme-size=0 +gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_BOTH gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=1 gtk-menu-images=1 gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 +gtk-enable-input-feedback-sounds=0 gtk-xft-antialias=1 gtk-xft-hinting=1 -gtk-xft-hintstyle="hintfull" +gtk-xft-hintstyle="hintslight" +gtk-xft-rgba="none" diff --git a/roles/gtk/templates/settings.ini.j2 b/roles/gtk/templates/settings.ini.j2 index bcb9f82..3a957d7 100644 --- a/roles/gtk/templates/settings.ini.j2 +++ b/roles/gtk/templates/settings.ini.j2 @@ -1,15 +1,16 @@ [Settings] -gtk-theme-name=Equilux-compact -gtk-icon-theme-name=Papirus-Dark -gtk-font-name={{ font }} 10 +gtk-theme-name={{ gtk_theme }} +gtk-icon-theme-name={{ icon_theme }} +gtk-font-name={{ font }} {{ font_size }} gtk-cursor-theme-name=Adwaita -gtk-cursor-theme-size=0 +gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_BOTH gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=1 gtk-menu-images=1 gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 +gtk-enable-input-feedback-sounds=0 gtk-xft-antialias=1 gtk-xft-hinting=1 -gtk-xft-hintstyle=hintfull +gtk-xft-hintstyle=hintslight +gtk-xft-rgba=none