From c071b3f2d0056483e70c1a253612a09dc3f0c79b Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foo.dogsquared@gmail.com>
Date: Fri, 27 May 2022 15:34:15 +0800
Subject: [PATCH] playbooks: update Fedora playbooks

---
 playbooks/fedora-workstation-silverblue.yml | 26 ++++++++++++--
 playbooks/fedora-workstation.yml            | 39 ++++++++++++++++++---
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/playbooks/fedora-workstation-silverblue.yml b/playbooks/fedora-workstation-silverblue.yml
index 19cd570..077a843 100644
--- a/playbooks/fedora-workstation-silverblue.yml
+++ b/playbooks/fedora-workstation-silverblue.yml
@@ -12,19 +12,32 @@
         - desktop
         - system
 
+    - role: system/i18n
+      tags:
+        - desktop
+
     - role: system/external_backup
       tags:
-        - base
-        - desktop
         - system
 
     - role: system/flatpak
       tags:
-        - desktop
         - system
+        - desktop
         - flatpak
 
   tasks:
+    - name: Install various third-party repos
+      ansible.builtin.get_url:
+        url: "{{ item }}"
+        dest: /etc/yum.repos.d
+      loop:
+        - "https://copr.fedorainfracloud.org/coprs/cappyishihara/opentabletdriver/repo/fedora-36/cappyishihara-opentabletdriver-fedora-36.repo"
+        - "https://copr.fedorainfracloud.org/coprs/atim/lazygit/repo/fedora-36/atim-lazygit-fedora-36.repo"
+      tags:
+        - base
+        - system
+
     - name: Install layered packages
       community.general.rpm_ostree_pkg:
         name:
@@ -34,4 +47,11 @@
           - gnome-boxes
           - kitty
           - openssl
+
+          # This is not a part of the base repos.
+          - opentabletdriver
+          - lazygit
         state: present
+      tags:
+        - base
+        - system
diff --git a/playbooks/fedora-workstation.yml b/playbooks/fedora-workstation.yml
index 14152eb..e5781ee 100644
--- a/playbooks/fedora-workstation.yml
+++ b/playbooks/fedora-workstation.yml
@@ -14,27 +14,40 @@
         - base
         - dev
         - system
+
     - role: system/i18n
       tags:
-        - base
         - extra
+        - i18n
+
     - role: system/fonts
       tags:
         - base
         - system
+        - i18n
+
+    - role: system/gnome
+      tags:
+        - base
+        - system
+        - desktop
+
     - role: system/flatpak
       tags:
         - desktop
         - system
         - flatpak
+
     - role: system/external_backup
       tags:
         - system
         - setup
         - backup
+
     - role: apps/emacs
       tags:
         - apps
+        - emacs
 
   tasks:
     - name: Enable copr repositories
@@ -44,8 +57,10 @@
       loop:
         - cappyishihara/opentabletdriver
         - atim/lazygit
-        - fale/gopass
         - peterwu/iosevka
+      tags:
+        - base
+        - system
 
     # Package installations.
     - name: Install packages from enabled copr repositories
@@ -54,12 +69,14 @@
         name:
           - lazygit
           - opentabletdriver
-          - golang-github-gopasspw-gopass
           - iosevka-fonts
           - iosevka-curly-fonts
           - iosevka-curly-slab-fonts
           - iosevka-slab-fonts
           - iosevka-etoile-fonts
+      tags:
+        - base
+        - system
 
     - name: Install RPM development tools
       dnf:
@@ -75,6 +92,8 @@
           - thunderbird
           - chromium
           - firefox
+      tags:
+        - desktop
 
     - name: Install Fedora COPR dev't tools
       dnf:
@@ -83,11 +102,23 @@
           - copr-cli
           - dnf-plugins-core
 
+    - name: Install the extensions
+      dnf:
+        state: present
+        name:
+          - nautilus-gsconnect
+          - gnome-shell-extension-gsconnect
+          - gnome-shell-extension-appindicator
+          - gnome-shell-extension-caffeine
+          - gnome-shell-extension-just-perfection
+          - gnome-shell-extension-windowsNavigator
+      tags:
+        - desktop
+
     - name: Install Ansible
       dnf:
         state: present
         name:
           - ansible
-          - ansible-doc
           - ansible-collection-community-general
           - python3-psutil