From 689455679e83e8cf5094d424b9994a15b8ddb96d Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 10 Sep 2017 20:54:41 +0200
Subject: [PATCH] Remove wicd dependency from minimal config and X200s.

---
 ansible/config_new.yml                        |  3 +++
 ansible/files/apt-mark_new/W530/wicd          |  3 +++
 ansible/files/apt-mark_new/minimal/wifi       |  3 ---
 .../___etc___wicd___manager-settings.conf     | 24 -------------------
 4 files changed, 6 insertions(+), 27 deletions(-)
 create mode 100644 ansible/files/apt-mark_new/W530/wicd
 delete mode 100644 ansible/files/system_new/X200s/___etc___wicd___manager-settings.conf

diff --git a/ansible/config_new.yml b/ansible/config_new.yml
index 05e77b3..3053ddb 100644
--- a/ansible/config_new.yml
+++ b/ansible/config_new.yml
@@ -90,6 +90,9 @@
   - name: ensure wifi configuration
     apt: name={{item}} state=present
     with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/wifi | sed -e 's/ *#.*$//'
+  #- name: ensure wicd
+  #  apt: name={{item}} state=present
+  #  with_lines: cat ~/config/ansible/files/apt-mark_new/W530/wicd | sed -e 's/ *#.*$//'
 
   # Ensure audio/video consumption necessities.
   #- name: ensure multimedia tools
diff --git a/ansible/files/apt-mark_new/W530/wicd b/ansible/files/apt-mark_new/W530/wicd
new file mode 100644
index 0000000..55d86fe
--- /dev/null
+++ b/ansible/files/apt-mark_new/W530/wicd
@@ -0,0 +1,3 @@
+wicd-cli  # thanks to my own wicd_wrapper.sh should be enough for most stuff
+wicd-curses  # although this currently is very buggy
+wicd-gtk  # workaround for when wicd-curses fails
diff --git a/ansible/files/apt-mark_new/minimal/wifi b/ansible/files/apt-mark_new/minimal/wifi
index 0d9d93c..4b8432d 100644
--- a/ansible/files/apt-mark_new/minimal/wifi
+++ b/ansible/files/apt-mark_new/minimal/wifi
@@ -1,4 +1 @@
 firmware-iwlwifi  # wifi driver
-wicd-cli  # thanks to my own wicd_wrapper.sh should be enough for most stuff
-wicd-curses  # although this currently is very buggy
-wicd-gtk  # workaround for when wicd-curses fails
diff --git a/ansible/files/system_new/X200s/___etc___wicd___manager-settings.conf b/ansible/files/system_new/X200s/___etc___wicd___manager-settings.conf
deleted file mode 100644
index 24ace86..0000000
--- a/ansible/files/system_new/X200s/___etc___wicd___manager-settings.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-[Settings]
-backend = external
-wireless_interface = wls1
-wired_interface = enp0s25
-wpa_driver = wext
-always_show_wired_interface = False
-use_global_dns = False
-global_dns_1 = None
-global_dns_2 = None
-global_dns_3 = None
-global_dns_dom = None
-global_search_dom = None
-auto_reconnect = True
-debug_mode = False
-wired_connect_mode = 1
-signal_display_type = 0
-should_verify_ap = 1
-dhcp_client = 0
-link_detect_tool = 0
-flush_tool = 0
-sudo_app = 0
-prefer_wired = False
-show_never_connect = True
-
-- 
2.30.2