Fix laptop role

roles/laptop/tasks/asusctl.yml

@@ -26,8 +26,8 @@
     target: install
 
 - name: "Enable service"
-  ansible.builtin.systemd:
   become: yes
+  ansible.builtin.systemd:
     name: asusctl
     state: started
     enabled: yes

roles/laptop/tasks/battery.yml

@@ -1,17 +1,10 @@
-- name: Check if laptop has option to limit battery
+- name: Copy service to limit battery charge
-  stat:
-    path: /sys/class/power_supply/BAT0/charge_control_end_threshold
-  register: battery_limiter_available
-
-- when: battery_limiter_available.stat.exists
-  block:
-    - name: Copy service to limit battery charge
   become: yes
   copy:
     src: lib/systemd/system/battery-charge-threshold.service
     dest: /lib/systemd/system/battery-charge-threshold.service
 
-    - name: Enable battery limit service
+- name: Enable battery limit service
   become: yes
   systemd:
     name: battery-charge-threshold

roles/laptop/tasks/main.yml

@@ -1,5 +1,10 @@
-- import_tasks: battery.yml
+- name: Check if it's laptop
+  stat:
+    path: /sys/class/power_supply/BAT0/charge_control_end_threshold
+  register: battery_limiter_available
 
-- import_tasks: asusctl.yml
+- when: battery_limiter_available.stat.exists
-
+  block:
-- import_tasks: supergfxctl.yml
+    - import_tasks: battery.yml
+    - import_tasks: asusctl.yml
+    - import_tasks: supergfxctl.yml

roles/laptop/tasks/supergfxctl.yml

@@ -26,8 +26,8 @@
     target: install
 
 - name: "Enable service"
-  ansible.builtin.systemd:
   become: yes
+  ansible.builtin.systemd:
     name: asusctl
     state: started
     enabled: yes