Small tasks refactoring

localhost.yml

@@ -4,13 +4,13 @@
     - prepare
     - systemd-boot
     - ubuntu
-    - prusa-slicer
+    - desktop
+    - dwm
     - dev-java
     - autofs
-    - dwm
+    - prusa-slicer
     - docker
     - laptop
-    - desktop
     - backup
     - gaming
 
@@ -18,6 +18,7 @@
 #    - dev-flutter
 #    - virtual
 #    - terraform
+    - postinstall
   vars:
     desktop_src_dir: "{{ ansible_user_dir }}/src/desktop"
     arch_src_dir: "{{ ansible_user_dir }}/src/arch"

roles/desktop/tasks/arch.yml

@@ -10,17 +10,9 @@
       - grub
       - xorg-xinit
       - polkit-gnome
-      - lightdm
-      - lightdm-gtk-greeter
+      - xdg-desktop-portal-gtk
       - helvum
 
-- name: "Enable service"
-  become: yes
-  ansible.builtin.systemd:
-    name: lightdm
-    state: started
-    enabled: yes
-
 - name: "Enable cron service"
   become: yes
   ansible.builtin.systemd:
@@ -49,7 +41,7 @@
       - traceroute
       - vim
 
-- name: install terminal packages [AUR]
+- name: "[Arch] install terminal packages"
   shell:
     cmd:
       yay -S --needed --noconfirm epson-inkjet-printer-escpr pm-utils
@@ -88,7 +80,6 @@
       - ttf-fira-code
       - ttf-font-awesome
       - ttf-liberation
-      - ttf-symbola
       - ttf-ubuntu-font-family
 
 - name: "Enable network manager"
@@ -104,16 +95,6 @@
     name:
       - flatpak
 
-- name: install the smile emoji picker
-  community.general.flatpak:
-    state: present
-    name: it.mijorus.smile
-
-- name: install bottles
-  community.general.flatpak:
-    state: present
-    name: com.usebottles.bottles
-
 - name: copy scripts
   become: yes
   copy:
@@ -122,6 +103,3 @@
     mode: '0755'
   loop:
     - update-grub
-
-- import_tasks: audio.yml
-- import_tasks: bluetooth.yml

roles/desktop/tasks/audio.yml

@@ -1,4 +1,5 @@
-- name: install audio [Arch]
+- name: "[Arch] install audio"
+  when: ansible_distribution == "Archlinux"
   become: yes
   community.general.pacman:
     name:

roles/desktop/tasks/bluetooth.yml

@@ -1,10 +1,11 @@
-- name: install bluetooth
+- name: "[Arch] install bluetooth"
+  when: ansible_distribution == "Archlinux"
   become: yes
   community.general.pacman:
     name:
       - blueman
 
-- name: "Enable service"
+- name: "[All] Enable service"
   become: yes
   ansible.builtin.systemd:
     name: bluetooth

roles/desktop/tasks/flatpaks.yml

@@ -0,0 +1,14 @@
+- name: "[All] install the smile emoji picker"
+  community.general.flatpak:
+    state: present
+    name: it.mijorus.smile
+
+- name: "[All] install bottles"
+  community.general.flatpak:
+    state: present
+    name: com.usebottles.bottles
+
+- name: "[All] install Element"
+  community.general.flatpak:
+    state: present
+    name: im.riot.Riot

roles/desktop/tasks/main.yml

@@ -5,7 +5,14 @@
 - import_tasks: arch.yml
   when: ansible_distribution == "Archlinux"
 
+- import_tasks: flatpaks.yml
+
+- import_tasks: audio.yml
+
+- import_tasks: bluetooth.yml
+
 - import_tasks: dotfiles.yml
+
 - import_tasks: signal.yml
 
 - import_tasks: timekpr.yml

roles/desktop/tasks/timekpr.yml

@@ -1,32 +1,33 @@
 - become: yes
+  when: ansible_distribution == "Ubuntu"
   block:
-    - name: add ppa [Ubuntu]
-      when: ansible_distribution == "Ubuntu"
+    - name: "[Ubuntu] add ppa"
       apt_repository:
         repo: ppa:mjasnik/ppa
 
-    - name: install timekpr [Ubuntu]
-      when: ansible_distribution == "Ubuntu"
+    - name: "[Ubuntu] install timekpr"
       apt:
         update_cache: yes
         state: latest
         pkg:
           - timekpr-next
 
-    - name: install timekpr [Arch]
-      shell:
-        cmd:
-          yay -S --needed --noconfirm timekpr-next
-      when: ansible_distribution == "Archlinux"
+- name: "[Arch] install timekpr"
+  shell:
+    cmd:
+      yay -S --needed --noconfirm timekpr-next
+  when: ansible_distribution == "Archlinux"
 
-    - name: configure
+- become: yes
+  block:
+    - name: "[All] configure"
       template:
         src: var/lib/timekpr/config/timekpr.USER.conf.j2
         dest: /var/lib/timekpr/config/timekpr.{{ansible_user_id}}.conf
       vars:
         user: "{{ ansible_user_id }}"
 
-    - name: "Enable service"
+    - name: "[All] Enable service"
       become: yes
       ansible.builtin.systemd:
         name: timekpr

roles/desktop/tasks/ubuntu.yml

@@ -1,5 +1,4 @@
----
-- name: install package managers
+- name: "[Ubuntu] install package managers"
   become: yes
   apt:
     update_cache: yes
@@ -7,7 +6,7 @@
       - aptitude
       - flatpak
 
-- name: install terminal packages
+- name: "[Ubuntu] install terminal packages"
   become: yes
   apt:
     pkg:
@@ -26,13 +25,13 @@
       - policykit-1-gnome
       - printer-driver-escpr
 
-- name: install libfuse2 for appimages
+- name: "[Ubuntu] install libfuse2 for appimages"
   become: yes
   apt:
     pkg:
       - libfuse2
 
-- name: install gui packages from apt
+- name: "[Ubuntu] install gui packages from apt"
   become: yes
   apt:
     pkg:
@@ -44,11 +43,6 @@
       - flameshot
       - gsimplecal
 
-- name: install the smile emoji picker
-  community.general.flatpak:
-    state: present
-    name: it.mijorus.smile
-
 - name: install gui apps
   become: yes
   apt:

roles/dev-java/tasks/arch.yml

@@ -1,15 +1,15 @@
-- name: install java
+- name: "[Arch] install java"
   become: yes
   community.general.pacman:
     name:
       - jdk17-openjdk
 
-- name: install IntelliJ [AUR]
+- name: "[Arch] install IntelliJ"
   shell:
     cmd:
       yay -S --needed --noconfirm intellij-idea-ultimate-edition
 
-- name: Create symbolic link
+- name: "[Arch] Create symbolic link"
   become: yes
   file:
     src: "/usr/bin/intellij-idea-ultimate-edition"

roles/dwm/tasks/dwm.yml

@@ -38,6 +38,11 @@
   make:
     chdir: "{{ desktop_src_dir }}/dwm"
 
+- name: ensure that xsessions directory exists
+  file:
+    path: /usr/share/xsessions
+    state: directory
+
 - name: copy xsession
   become: yes
   copy:
@@ -56,6 +61,7 @@
     dest: /usr/share/xsessions/dwm-gnome.desktop
 
 - name: Create gnome session dir
+  become: yes
   file:
     path: /usr/share/gnome-session/sessions
     state: directory

roles/lightdm/tasks/arch.yml

@@ -0,0 +1,6 @@
+- name: "[Arch] install lightdm"
+  become: yes
+  community.general.pacman:
+    name:
+      - lightdm
+      - lightdm-gtk-greeter

roles/lightdm/tasks/main.yml

@@ -0,0 +1,6 @@
+---
+- import_tasks: ubuntu.yml
+  when: ansible_distribution == "Ubuntu"
+
+- import_tasks: arch.yml
+  when: ansible_distribution == "Archlinux"

roles/postinstall/tasks/main.yml

@@ -0,0 +1,6 @@
+- name: "[All] Enable lightdm service"
+  become: yes
+  ansible.builtin.systemd:
+    name: lightdm
+    state: started
+    enabled: yes

roles/prepare/tasks/arch.yml

@@ -34,7 +34,7 @@
   command:
     chdir: "{{ arch_src_dir }}/yay"
     cmd:
-      makepkg -si --needed
+      makepkg -si --needed --noconfirm
 
 - name: update yay cache
   shell:

roles/prusa-slicer/tasks/main.yml

@@ -1,3 +1,4 @@
 - include_tasks: install-program.yml
 
 - include_tasks: config-repository.yml
+  when: ansible_distribution == "Ubuntu"