From 6d7b76dfecfb5cb37851db3bc89360dbb4d91e1f Mon Sep 17 00:00:00 2001
From: Damien Dart <damiendart@pobox.com>
Date: Tue, 3 Sep 2024 23:00:04 +0100
Subject: [PATCH] Update Iosevka-installing bits-and-pieces.

---
 roles/development/defaults/main.yml |  6 +++---
 roles/development/tasks/gui.yml     | 22 ++++++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/roles/development/defaults/main.yml b/roles/development/defaults/main.yml
index a64c44a..8aede0a 100644
--- a/roles/development/defaults/main.yml
+++ b/roles/development/defaults/main.yml
@@ -52,10 +52,10 @@ development__debian_packages:
 development__entr_source_archive_checksum: 'sha256:0222b8df928d3b5a3b5194d63e7de098533e04190d9d9a154b926c6c1f9dd14e'
 development__entr_version: '5.6'
 
-# The following checksum is for "super-ttc-iosevka-22.0.2.zip" from
+# The following checksum is for "PkgTTC-Iosevka-31.5.0.zip" from
 # <https://github.com/be5invis/Iosevka/releases>.
-development__iosevka_archive_checksum: 'sha256:f9fd7654cf33ec06edf791459c72a02c10ec23e9cb60df01169a0a65e826025c'
-development__iosevka_version: '22.0.2'
+development__iosevka_archive_checksum: 'sha256:f42fc70db3c77e6be46d3055be808d03c2b66daf1fdb5bca4a09120db82ce2b9'
+development__iosevka_version: '31.5.0'
 
 # Obsidian releases are available at <https://obsidian.md/download> and
 # <https://github.com/obsidianmd/obsidian-releases/releases/>. The
diff --git a/roles/development/tasks/gui.yml b/roles/development/tasks/gui.yml
index 2e91f75..c88f124 100644
--- a/roles/development/tasks/gui.yml
+++ b/roles/development/tasks/gui.yml
@@ -48,26 +48,28 @@
     path: '/home/{{ development__user_username }}/.fonts'
     state: 'directory'
 
-- name: 'Ensure any old Iosevka TTF files are removed'
-  ansible.builtin.file:
-    path: '/home/{{ development__user_username }}/.fonts/iosevka'
-    state: 'absent'
-
-- name: 'Ensure the Iosevka Super TTC archive is downloaded'
+- name: 'Ensure the Iosevka TTC archive is downloaded'
   ansible.builtin.get_url:
     checksum: '{{ development__iosevka_archive_checksum }}'
-    dest: '{{ development__download_cache_directory }}/super-ttc-iosevka-{{ development__iosevka_version }}.zip'
+    dest: '{{ development__download_cache_directory }}/PkgTTC-Iosevka-{{ development__iosevka_version }}.zip'
     group: 'root'
     mode: 0755
     owner: 'root'
-    url: 'https://github.com/be5invis/Iosevka/releases/download/v{{ development__iosevka_version }}/super-ttc-iosevka-{{ development__iosevka_version }}.zip'
+    url: 'https://github.com/be5invis/Iosevka/releases/download/v{{ development__iosevka_version }}/PkgTTC-Iosevka-{{ development__iosevka_version }}.zip'
 
-- name: 'Ensure the Iosevka Super TTC file is installed'
+- name: 'Ensure Iosevka TTC files are installed'
   ansible.builtin.unarchive:
     dest: '/home/{{ development__user_username }}/.fonts'
     group: '{{ development__user_username }}'
     owner: '{{ development__user_username }}'
-    src: '{{ development__download_cache_directory }}/super-ttc-iosevka-{{ development__iosevka_version }}.zip'
+    src: '{{ development__download_cache_directory }}/PkgTTC-Iosevka-{{ development__iosevka_version }}.zip'
+
+# I've found that Gnome Terminal does not get along with the Super TTC
+# version of Iosevka. Using individual TTC files is the easiest remedy.
+- name: 'Ensure any old Iosevka Super TTC files are removed'
+  ansible.builtin.file:
+    path: '/home/{{ development__user_username }}/.fonts/iosevka.ttc'
+    state: 'absent'
 
 - name: 'Ensure the Obsidian Debian package is downloaded'
   ansible.builtin.get_url: