From d372cd9f098a79f7fefff1e5c8d74fa3341f5bc0 Mon Sep 17 00:00:00 2001
From: Jakob Lechner <mail@jalr.de>
Date: Thu, 14 Sep 2023 20:19:04 +0000
Subject: [PATCH] Move prusa-slicer to own role

---
 packer/ansible/playbook.yml                   | 91 ++++++++++---------
 packer/ansible/roles/fablab/tasks/main.yml    |  3 -
 .../tasks/configure.yml}                      |  7 +-
 .../roles/prusa-slicer/tasks/install.yml      |  5 +
 .../ansible/roles/prusa-slicer/tasks/main.yml | 12 +++
 5 files changed, 64 insertions(+), 54 deletions(-)
 rename packer/ansible/roles/{fablab/tasks/prusa.yml => prusa-slicer/tasks/configure.yml} (78%)
 create mode 100644 packer/ansible/roles/prusa-slicer/tasks/install.yml
 create mode 100644 packer/ansible/roles/prusa-slicer/tasks/main.yml

diff --git a/packer/ansible/playbook.yml b/packer/ansible/playbook.yml
index 22db53b..b994b60 100644
--- a/packer/ansible/playbook.yml
+++ b/packer/ansible/playbook.yml
@@ -12,6 +12,7 @@
     - role: windowmanager
     - role: inkscape
     - role: lightburn
+    - role: prusa-slicer
     - role: fablab
     - role: hardware
     - role: docker
@@ -45,51 +46,6 @@
         version: 3.3.1
       lightburn:
         dockerimage: r.jalr.de/fablab/lightburn
-      prusa_slicer:
-        settings: |
-          no_controller = 1
-          no_defaults = 1
-          preset_update = 0
-          show_splash_screen = 0
-          use_inches = 0
-          version_check = 0
-          view_mode = expert
-          
-          [filaments]
-          AmazonBasics TPU @MINI = 1
-          Das Filament PLA = 1
-          Generic PETG = 1
-          Generic PETG @MINI = 1
-          Generic PETG @MMU2 = 1
-          Generic PLA = 1
-          Generic PLA @MMU2 = 1
-          Prusament ASA = 1
-          Prusament ASA @MINI = 1
-          Prusament ASA @MMU2 = 1
-          Prusament PC Blend = 1
-          Prusament PC Blend @MINI = 1
-          Prusament PC Blend @MMU2 = 1
-          Prusament PETG = 1
-          Prusament PETG @MINI = 1
-          Prusament PETG @MMU2 = 1
-          Prusament PLA = 1
-          Prusament PLA @MMU2 = 1
-          Prusament PVB = 1
-          Prusament PVB @MMU2 = 1
-          Verbatim BVOH = 1
-          Verbatim BVOH @MMU2 = 1
-          
-          [presets]
-          filament = Prusament PLA
-          physical_printer =
-          print = 0.15mm QUALITY @MK3
-          printer = Original Prusa i3 MK3
-          sla_material =
-          sla_print =
-          
-          [vendor:PrusaResearch]
-          model:MK3 = 0.4
-          model:MK3SMMU2S = 0.4
     firefox:
       language_packs:
         - de
@@ -113,3 +69,48 @@
     lightburn:
       devices:
         - https://raw.githubusercontent.com/fablab-nea/LaserKutter/main/lightburn/LaserKutter.lbdev
+    prusa_slicer:
+      settings: |
+        no_controller = 1
+        no_defaults = 1
+        preset_update = 0
+        show_splash_screen = 0
+        use_inches = 0
+        version_check = 0
+        view_mode = expert
+        
+        [filaments]
+        AmazonBasics TPU @MINI = 1
+        Das Filament PLA = 1
+        Generic PETG = 1
+        Generic PETG @MINI = 1
+        Generic PETG @MMU2 = 1
+        Generic PLA = 1
+        Generic PLA @MMU2 = 1
+        Prusament ASA = 1
+        Prusament ASA @MINI = 1
+        Prusament ASA @MMU2 = 1
+        Prusament PC Blend = 1
+        Prusament PC Blend @MINI = 1
+        Prusament PC Blend @MMU2 = 1
+        Prusament PETG = 1
+        Prusament PETG @MINI = 1
+        Prusament PETG @MMU2 = 1
+        Prusament PLA = 1
+        Prusament PLA @MMU2 = 1
+        Prusament PVB = 1
+        Prusament PVB @MMU2 = 1
+        Verbatim BVOH = 1
+        Verbatim BVOH @MMU2 = 1
+        
+        [presets]
+        filament = Prusament PLA
+        physical_printer =
+        print = 0.15mm QUALITY @MK3
+        printer = Original Prusa i3 MK3
+        sla_material =
+        sla_print =
+        
+        [vendor:PrusaResearch]
+        model:MK3 = 0.4
+        model:MK3SMMU2S = 0.4
diff --git a/packer/ansible/roles/fablab/tasks/main.yml b/packer/ansible/roles/fablab/tasks/main.yml
index 02faee9..1bb8ab5 100644
--- a/packer/ansible/roles/fablab/tasks/main.yml
+++ b/packer/ansible/roles/fablab/tasks/main.yml
@@ -18,9 +18,6 @@
   - import_tasks: visicut.yml
     tags:
       - fablab:visicut
-  - import_tasks: prusa.yml
-    tags:
-      - fablab:prusa
 #  - import_tasks: platformio.yml
 #    tags:
 #      - fablab:platformio
diff --git a/packer/ansible/roles/fablab/tasks/prusa.yml b/packer/ansible/roles/prusa-slicer/tasks/configure.yml
similarity index 78%
rename from packer/ansible/roles/fablab/tasks/prusa.yml
rename to packer/ansible/roles/prusa-slicer/tasks/configure.yml
index 8211e1c..817ae54 100644
--- a/packer/ansible/roles/fablab/tasks/prusa.yml
+++ b/packer/ansible/roles/prusa-slicer/tasks/configure.yml
@@ -1,9 +1,4 @@
 ---
-- name: install slic3r-prusa
-  apt:
-    name: slic3r-prusa
-    state: present
-
 - name: create skel directories
   file:
     path: "/etc/skel/{{ item }}"
@@ -21,5 +16,5 @@
 
 - name: Copy Prusa slicer settings
   copy:
-    content: "{{ fablab.prusa_slicer.settings }}"
+    content: "{{ prusa_slicer.settings }}"
     dest: /etc/skel/.config/PrusaSlicer/PrusaSlicer.ini
diff --git a/packer/ansible/roles/prusa-slicer/tasks/install.yml b/packer/ansible/roles/prusa-slicer/tasks/install.yml
new file mode 100644
index 0000000..31a992c
--- /dev/null
+++ b/packer/ansible/roles/prusa-slicer/tasks/install.yml
@@ -0,0 +1,5 @@
+---
+- name: install slic3r-prusa
+  apt:
+    name: slic3r-prusa
+    state: present
diff --git a/packer/ansible/roles/prusa-slicer/tasks/main.yml b/packer/ansible/roles/prusa-slicer/tasks/main.yml
new file mode 100644
index 0000000..6f1600a
--- /dev/null
+++ b/packer/ansible/roles/prusa-slicer/tasks/main.yml
@@ -0,0 +1,12 @@
+---
+- block:
+  - import_tasks: install.yml
+    tags:
+      - prusa-slicer:install
+
+  - import_tasks: configure.yml
+    tags:
+      - prusa-slicer:configure
+
+  tags:
+    - prusa-slicer