From 2f575b3002e5e06386943d9b20782c83199edc47 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Thu, 16 Jan 2020 12:29:24 -0500
Subject: [PATCH] Use file.tidied state for windows desktop shortcuts

---
 bad_shortcuts.yaml  | 16 ----------------
 removeShortcuts.sls | 26 ++++++++++++++++++++------
 2 files changed, 20 insertions(+), 22 deletions(-)
 delete mode 100644 bad_shortcuts.yaml

diff --git a/bad_shortcuts.yaml b/bad_shortcuts.yaml
deleted file mode 100644
index 5fad833..0000000
--- a/bad_shortcuts.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-- Browse VCarve Pro - ShopBot Edition V9.0 Tutorials.lnk
-- Corel CAPTURE 2017 (64-Bit).lnk
-- Corel CONNECT 2017 (64-Bit).lnk
-- Corel Font Manager 2017 (64-Bit).lnk
-- Corel PHOTO-PAINT 2017 (64-Bit).lnk
-- Dell Backup and Recovery.lnk
-- Dell Precision Optimizer.lnk
-- Intel(R) HD Graphics Control Panel.lnk
-- Intel(R) WiDi.lnk
-- Protected Workspace.lnk
-- Shop for HP Supplies.lnk
-- Style Builder 2017.lnk
-- LayOut 2017.lnk
-- gVim 8.1.lnk
-- gVim Easy 8.1.lnk
-- gVim Read only 8.1.lnk
diff --git a/removeShortcuts.sls b/removeShortcuts.sls
index 9cca09b..46f8913 100644
--- a/removeShortcuts.sls
+++ b/removeShortcuts.sls
@@ -1,6 +1,20 @@
-{% import_yaml "bad_shortcuts.yaml" as bad_shortcuts %}
-{% for shortcut in bad_shortcuts %}
-Remove {{ shortcut }}:
-  file.absent:
-    - name: "C:\\Users\\Public\\Desktop\\{{ shortcut }}"
-{% endfor %}
+"C:\\Users\\Public\\Desktop":
+  file.tidied:
+    - matches:
+        - Browse VCarve Pro - ShopBot Edition V9.0 Tutorials\.lnk
+        - Corel CAPTURE 2017 (64-Bit)\.lnk
+        - Corel CONNECT 2017 (64-Bit)\.lnk
+        - Corel Font Manager 2017 (64-Bit)\.lnk
+        - Corel PHOTO-PAINT 2017 (64-Bit)\.lnk
+        - Dell Backup and Recovery\.lnk
+        - Dell Precision Optimizer\.lnk
+        - Intel(R) HD Graphics Control Panel\.lnk
+        - Intel(R) WiDi\.lnk
+        - Protected Workspace\.lnk
+        - Shop for HP Supplies\.lnk
+        - Style Builder 2017\.lnk
+        - LayOut 2017\.lnk
+        - gVim [0-9]\.[0-9]\.lnk
+        - gVim Easy [0-9]\.[0-9]\.lnk
+        - gVim Read only [0-9]\.[0-9]\.lnk
+