From c8de512a98462327b909311d2f89c90c32fb9246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Gon=C3=A7alves?= <me@rgoncalves.se>
Date: Sat, 1 Oct 2022 22:28:22 +0200
Subject: chore: migrate package install in distinct roles

---
 roles/workstation/tasks/os_archlinux.yml | 48 ++++++++++----------------------
 1 file changed, 15 insertions(+), 33 deletions(-)

(limited to 'roles/workstation/tasks/os_archlinux.yml')

diff --git a/roles/workstation/tasks/os_archlinux.yml b/roles/workstation/tasks/os_archlinux.yml
index 70d7abd..76d78c5 100644
--- a/roles/workstation/tasks/os_archlinux.yml
+++ b/roles/workstation/tasks/os_archlinux.yml
@@ -1,35 +1,4 @@
-- name: append current user to system groups
-  user:
-    name: "{{ workstation_user }}"
-    groups: "{{ item }}"
-    append: true
-  loop:
-    - docker
-    - wheel
-    - video
-    - audio
-
-- name: enable and start pipewire
-  systemd:
-    name: "{{ item }}"
-    scope: user
-    enabled: true
-    state: started
-  become: true
-  become_method: su
-  become_user: "{{ workstation_user }}"
-  loop:
-    - pipewire
-    - pipewire-pulse
-  when: ansible_service_mgr == "systemd"
-
-- name: ensure that dhcpcd is started
-  service:
-    name: dhcpcd
-    state: started
-    enabled: true
-
-- name: enable battery optimization
+- name: include battery optimization
   include_tasks: tlp.yml
   when: ansible_form_factor in ["Laptop", "Notebook"]
 
@@ -39,12 +8,25 @@
 - name: include dockerd setup
   include_tasks: dockerd.yml
 
+- name: include pipewire
+  include_tasks: pipewire.yml
+
 - name: retrieve installed packages
   package_facts:
   register: package_facts
 
-- name: install yay
+- name: include yay
   include_tasks: yay.yml
   when:
     - "'yay' not in package_facts.ansible_facts.packages"
     - "'yay-bin' not in package_facts.ansible_facts.packages"
+
+- name: append current user to system groups
+  user:
+    name: "{{ workstation_user }}"
+    groups: "{{ item }}"
+    append: true
+  loop:
+    - wheel
+    - video
+    - audio
-- 
cgit v1.2.3