roles/calibre/tasks/main.yml

@@ -1,5 +1,3 @@
 ---
-- apt:
+# Calibre
-    name: calibre
+- apt: name=calibre state=present
-    state: present
-  when: hwpoints|int >= 2

roles/checkhw/tasks/main.yml

@@ -1,14 +1,11 @@
 ---
-- set_fact: 
+- set_fact: hwpoints=1
-    hwpoints: 1
+  when:  {{ ansible_memtotal_mb | int }} <= 2048 and {{ ansible_processor_vcpus | int }} <= 2
-  when:  ansible_memtotal_mb|int <= 2048 and ansible_processor_vcpus|int <= 2
 
-- set_fact:
+- set_fact: hwpoints=2
-    hwpoints: 2
+  when: {{ ansible_memtotal_mb | int }} <= 4096 and {{ ansible_processor_vcpus | int }}<= 2
-  when: ansible_memtotal_mb|int <= 4096 and ansible_processor_vcpus|int <= 2
 
-- set_fact: 
+- set_fact: hwpoints=3
-    hwpoints: 3
+  when: {{ ansible_memtotal_mb | int }} > 4096 and {{ ansible_processor_vcpus | int }} >= 4
-  when: ansible_memtotal_mb|int > 4096 and ansible_processor_vcpus|int >= 4
 
-- setup: filter=ansible_local
+- setup:

roles/chromium/tasks/main.yml

@@ -1,5 +1,2 @@
 ---
-- apt:
+- apt: name=chromium-browser state=present
-    name: chromium-browser
-    state: present
-  when: hwpoints|int >= 2

roles/geogebra/tasks/main.yml

@@ -4,4 +4,3 @@
       - geogebra
       - geogebra-gnome
     state: present
-  when: hwpoints|int >= 2

roles/gimp/tasks/main.yml

@@ -4,4 +4,3 @@
       - gimp
       - gimp-help-it
     state: present
-  when: hwpoints|int >= 2

roles/googlechrome/tasks/main.yml

@@ -1,10 +1,6 @@
 ---
-- block:
+- get_url:
-  
+    url: "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
-  - get_url:
+    dest: /tmp/google-chrome-stable_current_amd64.deb
-      url: "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
-      dest: /tmp/google-chrome-stable_current_amd64.deb
-  
-  - shell: dpkg -i /tmp/google-chrome-stable_current_amd64.deb
 
-  when: hwpoints|int >= 2
+- shell: dpkg -i /tmp/google-chrome-stable_current_amd64.deb

roles/inkscape/tasks/main.yml

@@ -1,5 +1,2 @@
 ---
-- apt:
+- apt: name=inkscape state=present
-    name: inkscape
-    state: present
-  when: hwpoints|int >= 2

roles/install/meta/main.yml

@@ -1,17 +1,17 @@
 dependencies:
   - checkhw
   - neofetch
-  - googlechrome
+  - { role: googlechrome, when: {{ hwpoints | int }} >= 2 }
-  - chromium
+  - { role: chromium, when: {{ hwpoints | int }} >= 2 }
   - firefox
   - libreoffice
-  - scribus
+  - { role: scribus, when: {{ hwpoints |int }} >= 2 }
-  - calibre
+  - { role: calibre, when: {{ hwpoints | int }} >= 2 }
-  - gimp
+  - { role: gimp, when: {{ hwpoints | int }} >= 2 }
-  - inkscape
+  - { role: inkscape, when: {{ hwpoints | int }} >= 2 }
-  - openshot
+  - { role: openshot, when: {{ hwpoints | int }} >= 3 }
   - vlc
-  - geogebra
+  - { role: geogebra, when: {{ hwpoints | int }} >= 2 }
-  - minetest
+  - { role: minetest, when: {{ hwpoints | int }} >= 2 }
-  - zoom
+  - { role: zoom, when: {{ hwpoints | int }} > 2 }
-  - msteams
+  - { role: msteams, when: {{ hwpoints | int }} > 2 }

roles/minetest/tasks/main.yml

@@ -1,3 +1,2 @@
 ---
 - apt: name=minetest state=present
-  when: hwpoints|int >= 2

roles/msteams/tasks/main.yml

@@ -1,11 +1,7 @@
 ---
 
-- block:
+- get_url: 
+    url: 'https://go.microsoft.com/fwlink/p/?linkid=2112886&clcid=0x410&culture=it-it&country=it'
+    dest: /tmp/teams_amd64.deb
 
-  - get_url: 
+- shell: 'dpkg -i /tmp/teams_amd64.deb'
-      url: 'https://go.microsoft.com/fwlink/p/?linkid=2112886&clcid=0x410&culture=it-it&country=it'
-      dest: /tmp/teams_amd64.deb
-  
-  - shell: 'dpkg -i /tmp/teams_amd64.deb'
-
-  when: hwpoints|int > 2

roles/openshot/tasks/main.yml

@@ -1,5 +1,2 @@
 ---
-- apt:
+- apt: name=openshot state=present
-    name: openshot
-    state: present
-  when: hwpoints|int >= 2

roles/scribus/tasks/main.yml

@@ -1,5 +1,2 @@
 ---
-- apt:
+- apt: name=scribus state=present
-    name: scribus
-    state: present
-  when: hwpoints|int >= 2

roles/zoom/tasks/main.yml

@@ -1,19 +1,11 @@
 ---
 
-- block:
+- apt: name=libxcb-xtest0 state=present
 
-  - apt:
+- get_url:
-      name: libxcb-xtest0
+    url: "https://zoom.us/client/latest/zoom_amd64.deb"
-      state: present
+    dest: /tmp/zoom_amd64.deb
-  
-  - get_url:
-      url: "https://zoom.us/client/latest/zoom_amd64.deb"
-      dest: /tmp/zoom_amd64.deb
-  
-  - apt_key:
-      keyserver: keyserver.ubuntu.com
-      id: 396060CADD8A75220BFCB369B903BF1861A7C71D
-  
-  - shell: dpkg -i /tmp/zoom_amd64.deb
 
-  when: hwpoints|int > 2
+- apt_key: keyserver=keyserver.ubuntu.com id=396060CADD8A75220BFCB369B903BF1861A7C71D
+
+- shell: dpkg -i /tmp/zoom_amd64.deb