From 892b221e73cfff4929530f808e04cf0882314b77 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Sun, 10 Sep 2017 17:38:51 +0200 Subject: [PATCH] Fix networking in new ansible tree. --- ansible/config_new.yml | 6 +++--- ansible/files/apt-mark_new/X200s/wifi | 3 --- ansible/files/apt-mark_new/{W530 => minimal}/wifi | 0 .../system_new/X200s/___etc___wicd___manager-settings.conf | 2 +- dotfiles/user/thinkpad/X200s/i3status.conf | 4 ++-- 5 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 ansible/files/apt-mark_new/X200s/wifi rename ansible/files/apt-mark_new/{W530 => minimal}/wifi (100%) diff --git a/ansible/config_new.yml b/ansible/config_new.yml index 55ecd90..05e77b3 100644 --- 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/X200s/wifi b/ansible/files/apt-mark_new/X200s/wifi deleted file mode 100644 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/W530/wifi b/ansible/files/apt-mark_new/minimal/wifi similarity index 100% rename from ansible/files/apt-mark_new/W530/wifi rename to ansible/files/apt-mark_new/minimal/wifi 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 fce05db..24ace86 100644 --- 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 508fe80..dcc1ad0 100644 --- 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" } -- 2.30.2