Fix networking in new ansible tree.

diff --git a/ansible/config_new.yml b/ansible/config_new.yml
index 55ecd907720d276dcd891e622b1d3b4b26f366e3..05e77b3c14d630af185fa99302caddcc7c480d8a 100644 (file)
--- a/ansible/config_new.yml
+++ b/ansible/config_new.yml
@@ -87,9 +87,9 @@
     with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/browser_environment | sed -e 's/ *#.*$//'
 
   # Ensure wifi.
-  #- name: ensure wifi configuration
-  #  apt: name={{item}} state=present
-  #  with_lines: cat ~/config/ansible/files/apt-mark/wifi | sed -e 's/ *#.*$//'
+  - name: ensure wifi configuration
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/wifi | sed -e 's/ *#.*$//'
 
   # Ensure audio/video consumption necessities.
   #- name: ensure multimedia tools

diff --git a/ansible/files/apt-mark_new/W530/wifi b/ansible/files/apt-mark_new/W530/wifi
deleted file mode 100644 (file)
index 0d9d93c..0000000
--- a/ansible/files/apt-mark_new/W530/wifi
+++ /dev/null
@@ -1,4 +0,0 @@
-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/apt-mark_new/X200s/wifi b/ansible/files/apt-mark_new/X200s/wifi
deleted file mode 100644 (file)
index 55d86fe..0000000
--- a/ansible/files/apt-mark_new/X200s/wifi
+++ /dev/null
@@ -1,3 +0,0 @@
-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
new file mode 100644 (file)
index 0000000..0d9d93c
--- /dev/null
+++ b/ansible/files/apt-mark_new/minimal/wifi
@@ -0,0 +1,4 @@
+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
index fce05db61a4786f28147d11cb48aed8dd7477426..24ace866d6616eb38cac88df54950dfb932ed6d7 100644 (file)
--- a/ansible/files/system_new/X200s/___etc___wicd___manager-settings.conf
+++ b/ansible/files/system_new/X200s/___etc___wicd___manager-settings.conf
@@ -1,6 +1,6 @@
 [Settings]
 backend = external
-wireless_interface = wwp0s29f7u4i7
+wireless_interface = wls1
 wired_interface = enp0s25
 wpa_driver = wext
 always_show_wired_interface = False

diff --git a/dotfiles/user/thinkpad/X200s/i3status.conf b/dotfiles/user/thinkpad/X200s/i3status.conf
index 508fe8099f50d41861a73df8bf5a58d16db7b3bc..dcc1ad03f4acd693f4b321c8faff6c2b5c952eb7 100644 (file)
--- a/dotfiles/user/thinkpad/X200s/i3status.conf
+++ b/dotfiles/user/thinkpad/X200s/i3status.conf
@@ -9,7 +9,7 @@ general {
 # Selection / order of status elements.
 order += "disk /"
 order += "disk /home"
-order += "wireless wwp0s29f7u4i7"
+order += "wireless wls1"
 order += "ethernet enp0s25"
 order += "battery 0"
 order += "cpu_temperature 0"
@@ -28,7 +28,7 @@ disk "/home" {
 
 
 # WLAN status: show IP and connection quality or "down".
-wireless wwp0s29f7u4i7 {
+wireless wls1 {
         format_up = "W: (%quality at %essid) %ip"
         format_down = "W: down"
 }