diff --git a/group_vars/all.yml b/group_vars/all.yml new file mode 100644 index 0000000..dc4c865 --- /dev/null +++ b/group_vars/all.yml @@ -0,0 +1,2 @@ +--- +font: jetbrains mono diff --git a/roles/alacritty/tasks/main.yml b/roles/alacritty/tasks/main.yml index 24d2dd4..97c2319 100644 --- a/roles/alacritty/tasks/main.yml +++ b/roles/alacritty/tasks/main.yml @@ -5,8 +5,8 @@ state: directory - name: copy alacritty conf file - copy: - src: alacritty.yml + template: + src: alacritty.j2 dest: ~/.config/alacritty/alacritty.yml - name: alias clear to clear -x to keep history scrolling diff --git a/roles/alacritty/files/alacritty.yml b/roles/alacritty/templates/alacritty.j2 similarity index 99% rename from roles/alacritty/files/alacritty.yml rename to roles/alacritty/templates/alacritty.j2 index 0a7c977..d50f03a 100644 --- a/roles/alacritty/files/alacritty.yml +++ b/roles/alacritty/templates/alacritty.j2 @@ -97,7 +97,7 @@ font: # - (macOS) Menlo # - (Linux/BSD) monospace # - (Windows) Consolas - family: hack + family: {{ font }} # The `style` can be specified to pick a specific face. style: Regular @@ -108,7 +108,7 @@ font: # # If the bold family is not specified, it will fall back to the # value specified for the normal font. - family: hack + family: {{ font }} # The `style` can be specified to pick a specific face. style: Bold @@ -119,7 +119,7 @@ font: # # If the italic family is not specified, it will fall back to the # value specified for the normal font. - family: hack + family: {{ font }} # The `style` can be specified to pick a specific face. style: Italic @@ -130,7 +130,7 @@ font: # # If the bold italic family is not specified, it will fall back to the # value specified for the normal font. - family: hack + family: {{ font }} # The `style` can be specified to pick a specific face. style: Bold Italic diff --git a/roles/kitty/tasks/main.yml b/roles/kitty/tasks/main.yml index ccf3914..08749be 100644 --- a/roles/kitty/tasks/main.yml +++ b/roles/kitty/tasks/main.yml @@ -5,6 +5,6 @@ state: directory - name: copy kitty conf file - copy: - src: kitty.conf - dest: ~/.config/kitty/ + template: + src: kitty.j2 + dest: ~/.config/kitty/kitty.conf diff --git a/roles/kitty/files/kitty.conf b/roles/kitty/templates/kitty.j2 similarity index 96% rename from roles/kitty/files/kitty.conf rename to roles/kitty/templates/kitty.j2 index 638f0c2..2fa4564 100644 --- a/roles/kitty/files/kitty.conf +++ b/roles/kitty/templates/kitty.j2 @@ -1,5 +1,5 @@ # Font -font_family hack +font_family {{ font }} bold_font auto italic_font auto bold_italic_font auto diff --git a/roles/sway/templates/config.j2 b/roles/sway/templates/config.j2 index b0b5b0d..9a6fdad 100644 --- a/roles/sway/templates/config.j2 +++ b/roles/sway/templates/config.j2 @@ -10,7 +10,7 @@ input "MANUFACTURER1 Keyboard" xkb_model "pc101" set $mod Mod4 # fonts -font pango: hack, FontAwesome5Free, FontAwesome5Brands 10 +font pango: {{ font }}, FontAwesome5Free, FontAwesome5Brands 10 # gaps default_border none diff --git a/roles/waybar/tasks/main.yml b/roles/waybar/tasks/main.yml index 50bff85..aea8ead 100644 --- a/roles/waybar/tasks/main.yml +++ b/roles/waybar/tasks/main.yml @@ -4,3 +4,8 @@ synchronize: src: waybar dest: ~/.config/ + +- name: template styles.css + template: + src: styles.j2 + dest: ~/.config/waybar/styles.css diff --git a/roles/waybar/files/waybar/style.css b/roles/waybar/templates/styles.j2 similarity index 95% rename from roles/waybar/files/waybar/style.css rename to roles/waybar/templates/styles.j2 index 90adb32..6b7c371 100644 --- a/roles/waybar/files/waybar/style.css +++ b/roles/waybar/templates/styles.j2 @@ -17,7 +17,7 @@ * { border: none; border-radius: 0; - font-family: Hack, "Font Awesome 5 Free Regular", "Font Awesome 5 Free Solid", "Font Awesome 5 Brands"; + font-family: "{{ font }}", "Font Awesome 5 Free Regular", "Font Awesome 5 Free Solid", "Font Awesome 5 Brands"; font-size: 12px; box-shadow: none; text-shadow: none;