From 814451fa44237bf5eaef2c6bcf3f1bd2c4d6ee55 Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Tue, 4 Aug 2026 14:09:03 -0700
Subject: [PATCH] Change i3 to be a shared playbook. Group more playbooks in
 blocks.

---
 local.yml                                     | 81 ++++++++-----------
 .../{linux => shared}/software/i3.yml         |  0
 2 files changed, 34 insertions(+), 47 deletions(-)
 rename tasks/workstation/{linux => shared}/software/i3.yml (100%)

diff --git a/local.yml b/local.yml
index 8decb4d..005766f 100644
--- a/local.yml
+++ b/local.yml
@@ -131,8 +131,7 @@
 
       # Window Managers without true Desktop Environments #
       - include_tasks: tasks/workstation/shared/software/dwm.yml
-
-      - include_tasks: tasks/workstation/linux/software/i3.yml
+      - include_tasks: tasks/workstation/shared/software/i3.yml
 
       # Polished Desktop Environments #
       - include_tasks: tasks/workstation/freebsd/software/gnome.yml
@@ -142,7 +141,6 @@
         block:
         - include_tasks: tasks/workstation/linux/software/gnome.yml
           when: ansible_service_mgr == "systemd"
-
         - include_tasks: tasks/workstation/linux/software/cinnamon.yml
         - include_tasks: tasks/workstation/linux/software/lxqt.yml
         when: ansible_system == "Linux"
@@ -150,21 +148,15 @@
 
       ## Software Tasks ##
 
-      - include_tasks: tasks/workstation/linux/software/packages.yml
-        when: ansible_system == "Linux"
-
-      - include_tasks: tasks/workstation/linux/software/tlp.yml
-
-      - include_tasks: tasks/workstation/linux/software/lutris.yml
-        when: ansible_system == "Linux"
-
-      - include_tasks: tasks/workstation/linux/software/vscodium.yml
-        when: ansible_system == "Linux"
-
-      - include_tasks: tasks/workstation/linux/software/brave.yml
-        when: ansible_pkg_mgr in ("apt", "dnf", "zypper") and not mobile
-
-      - include_tasks: tasks/workstation/linux/software/vpn.yml
+      - block:
+        - include_tasks: tasks/workstation/linux/software/packages.yml
+        - include_tasks: tasks/workstation/linux/software/tlp.yml
+        - include_tasks: tasks/workstation/linux/software/lutris.yml
+        - include_tasks: tasks/workstation/linux/software/vscodium.yml
+        - include_tasks: tasks/workstation/linux/software/vpn.yml
+        - include_tasks: tasks/workstation/linux/software/nodejs.yml
+        - include_tasks: tasks/workstation/linux/software/brave.yml
+          when: ansible_pkg_mgr in ("apt", "dnf", "zypper") and not mobile
         when: ansible_system == "Linux"
 
       - include_tasks: tasks/workstation/freebsd/software/packages.yml
@@ -173,17 +165,16 @@
       - include_tasks: tasks/workstation/mac-os/software/brew.yml
         when: ansible_system == "Darwin"
 
-      - include_tasks: tasks/workstation/linux/software/nodejs.yml
 
       ## Configuration Tasks ##
 
-      - include_tasks: tasks/workstation/shared/settings/gnome.yml
-        when: not mobile
-      - include_tasks: tasks/workstation/shared/settings/cinnamon.yml
-        when: not mobile
+      - block:
+        - include_tasks: tasks/workstation/shared/settings/gnome.yml
+        - include_tasks: tasks/workstation/shared/settings/cinnamon.yml
 
-      - include_tasks: tasks/workstation/linux/cron/ansible.yml
-        when: ansible_system == "Linux" and not mobile
+        - include_tasks: tasks/workstation/linux/cron/ansible.yml
+          when: ansible_system == "Linux"
+        when: not mobile
 
       - include_tasks: tasks/workstation/shared/settings/nfs.yml
 
@@ -194,20 +185,17 @@
         when: vnc == true
 
       - include_tasks: tasks/workstation/shared/settings/services.yml
-
       - include_tasks: tasks/workstation/shared/settings/templates.yml
 
       ## Final Tasks (SLOW) ##
 
-      - include_tasks: tasks/workstation/linux/software/flutter.yml
+      - block:
+        - include_tasks: tasks/workstation/linux/software/flutter.yml
+        - include_tasks: tasks/workstation/linux/software/android.yml
+        - include_tasks: tasks/workstation/linux/software/flatpaks.yml
+          when: flatpak_distro
         when: ansible_system == "Linux"
 
-      - include_tasks: tasks/workstation/linux/software/android.yml
-        when: ansible_system == "Linux"
-
-      - include_tasks: tasks/workstation/linux/software/flatpaks.yml
-        when: ansible_system == "Linux" and flatpak_distro
-
       when: workstation == true
 
 
@@ -260,22 +248,21 @@
 
       - include_tasks: tasks/server/software/services.yml
 
-      - include_tasks: tasks/server/software/certbot.yml
-        when: certbot == true
-      - include_tasks: tasks/server/cron/certbot.yml
+      - block:
+        - include_tasks: tasks/server/software/certbot.yml
+        - include_tasks: tasks/server/cron/certbot.yml
         when: certbot == true
 
-      - include_tasks: tasks/server/software/onlyoffice.yml
-        when: onlyoffice == true and ansible_pkg_mgr == "apt"
-
-      - include_tasks: tasks/server/software/influxdb1.yml
-        when: influxdb1 == true and ansible_pkg_mgr == "apt"
-
-      - include_tasks: tasks/server/software/influxdb2.yml
-        when: influxdb2 == true and ansible_pkg_mgr == "apt"
-
-      - include_tasks: tasks/server/software/grafana.yml
-        when: grafana == true and ansible_pkg_mgr == "apt"
+      - block:
+        - include_tasks: tasks/server/software/onlyoffice.yml
+          when: onlyoffice == true
+        - include_tasks: tasks/server/software/influxdb1.yml
+          when: influxdb1 == true
+        - include_tasks: tasks/server/software/influxdb2.yml
+          when: influxdb2 == true
+        - include_tasks: tasks/server/software/grafana.yml
+          when: grafana == true
+        when: ansible_pkg_mgr == "apt"
 
       - include_tasks: tasks/server/software/hugo.yml
         when: hugo == true
diff --git a/tasks/workstation/linux/software/i3.yml b/tasks/workstation/shared/software/i3.yml
similarity index 100%
rename from tasks/workstation/linux/software/i3.yml
rename to tasks/workstation/shared/software/i3.yml