From 352ef4c8d401927cb6db6fe18622ea3fa5dd07c1 Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Sat, 10 Jun 2023 11:16:45 +0100
Subject: [PATCH] Remove CAD apps because of Autodesk

Autodesk change distribution of Fusion360 to require a login breaking
the Chocolatey package, easier to manage this manually anyway since they
won't be installed on all Windows systems.
---
 playbooks/Windows.yaml                   |  9 +--------
 roles/autodesk-fusion360/tasks/main.yaml |  8 --------
 roles/prusaslicer/tasks/main.yaml        | 14 --------------
 roles/wsl/tasks/main.yaml                |  7 +++++--
 4 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 roles/autodesk-fusion360/tasks/main.yaml
 delete mode 100644 roles/prusaslicer/tasks/main.yaml

diff --git a/playbooks/Windows.yaml b/playbooks/Windows.yaml
index 540a391..626e861 100644
--- a/playbooks/Windows.yaml
+++ b/playbooks/Windows.yaml
@@ -1,9 +1,6 @@
 ---
 - hosts: windows
 
-  vars:
-    install_cad_apps: false
-
   roles:
     - role: python
     - role: git
@@ -16,6 +13,7 @@
     - role: curl
     - role: fzf
     - role: gh
+    - role: glab
     - role: jq
     - role: tree
     - role: yq
@@ -29,8 +27,3 @@
     - role: obsidian
     - role: powertoys
     - role: windows-terminal
-
-    - role: autodesk-fusion360
-      when: install_cad_apps
-    - role: prusaslicer
-      when: install_cad_apps
diff --git a/roles/autodesk-fusion360/tasks/main.yaml b/roles/autodesk-fusion360/tasks/main.yaml
deleted file mode 100644
index 2ea5c8c..0000000
--- a/roles/autodesk-fusion360/tasks/main.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- assert:
-    that: ansible_os_family == "Windows"
-
-- name: install chocolatey package
-  win_chocolatey:
-    name: autodesk-fusion360
-    state: latest
diff --git a/roles/prusaslicer/tasks/main.yaml b/roles/prusaslicer/tasks/main.yaml
deleted file mode 100644
index b83f89a..0000000
--- a/roles/prusaslicer/tasks/main.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- assert:
-    that: ansible_os_family == "Windows"
-
-- name: install chocolatey package
-  win_chocolatey:
-    name: prusaslicer
-    state: latest
-
-- name: create start menu shortcut
-  win_shortcut:
-    src: '{{ansible_env.ProgramData}}/chocolatey/bin/prusa-slicer.exe'
-    dest: '{{ansible_env.ProgramData}}/Microsoft/Windows/Start Menu/Programs/PrusaSlicer.lnk'
-    icon: '{{ansible_env.ProgramData}}/chocolatey/bin/prusa-slicer.exe,0'
diff --git a/roles/wsl/tasks/main.yaml b/roles/wsl/tasks/main.yaml
index ba41cbb..e08b7d5 100644
--- a/roles/wsl/tasks/main.yaml
+++ b/roles/wsl/tasks/main.yaml
@@ -40,15 +40,18 @@
     dest: external/ansible-win_git
     version: master
 
+- set_fact:
+    modules_dir: ~/.config/local/modules
+
 - name: create ansible modules directory
   file:
-    dest: ~/.ansible/plugins/modules
+    dest: '{{modules_dir}}'
     state: directory
 
 - name: copy win_git files to ansible modules directory
   copy:
     src: '~/.config/local/external/ansible-win_git/{{item}}'
-    dest: '~/.config/local/modules/{{item}}'
+    dest: '{{modules_dir}}/{{item}}'
   with_items:
     - win_git.ps1
     - win_git.py