From 495ed5cad744a020f050b48502c3ed4288a1dd67 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 11 Sep 2017 00:38:53 +0200
Subject: [PATCH] Add multimedia tools to X200s ansible setup.

---
 ansible/config_new.yml                        | 5 ++++-
 ansible/files/apt-mark_new/W530/multimedia    | 3 ---
 ansible/files/apt-mark_new/minimal/multimedia | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 ansible/files/apt-mark_new/minimal/multimedia

diff --git a/ansible/config_new.yml b/ansible/config_new.yml
index 02af315..1921cbe 100644
--- a/ansible/config_new.yml
+++ b/ansible/config_new.yml
@@ -100,9 +100,12 @@
   #  with_lines: cat ~/config/ansible/files/apt-mark_new/W530/wicd | sed -e 's/ *#.*$//'
 
   # Ensure audio/video consumption necessities.
+  - name: ensure multimedia tools
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/multimedia | sed -e 's/ *#.*$//'
   #- name: ensure multimedia tools
   #  apt: name={{item}} state=present
-  #  with_lines: cat ~/config/ansible/files/apt-mark/multimedia | sed -e 's/ *#.*$//'
+  #  with_lines: cat ~/config/ansible/files/apt-mark_new/W530/multimedia | sed -e 's/ *#.*$//'
 
   # Ensure hotkeys.
   #
diff --git a/ansible/files/apt-mark_new/W530/multimedia b/ansible/files/apt-mark_new/W530/multimedia
index 0b6d9ef..219097d 100644
--- a/ansible/files/apt-mark_new/W530/multimedia
+++ b/ansible/files/apt-mark_new/W530/multimedia
@@ -1,6 +1,3 @@
-alsa-utils
 eject
 ffmpeg  # somehow this is needed to make youtube-dl grab 1080p versions of videos
 libdvd-pkg  # decss stuff
-mpv
-youtube-dl  # needed by mpv to directly work YouTube URLs
diff --git a/ansible/files/apt-mark_new/minimal/multimedia b/ansible/files/apt-mark_new/minimal/multimedia
new file mode 100644
index 0000000..0bcc060
--- /dev/null
+++ b/ansible/files/apt-mark_new/minimal/multimedia
@@ -0,0 +1,3 @@
+alsa-utils
+mpv
+youtube-dl  # needed by mpv to directly work YouTube URLs
-- 
2.30.2