X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=ansible%2Fconfig_new.yml;h=1921cbe77871f67197b659969bb3acef9a173cbf;hb=495ed5cad744a020f050b48502c3ed4288a1dd67;hp=2f86ac3a550c68b7eeba92d98c30adfd83942fcd;hpb=a8b7d1a46c9234473931171b20e3ac805f43d2c1;p=config

diff --git a/ansible/config_new.yml b/ansible/config_new.yml
index 2f86ac3..1921cbe 100644
--- a/ansible/config_new.yml
+++ b/ansible/config_new.yml
@@ -38,6 +38,8 @@
     with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/console | sed -e 's/ *#.*$//'
   - name: generate en_US.UTF-8 locale
     locale_gen: name=en_US.UTF-8 state=present
+  - name: Touch keyboard config file so setupcon does not ignore it.
+    command: touch /etc/default/keyboard
   - name: run setupcon to apply console settings from /etc/default/
     command: setupcon
 
@@ -71,10 +73,13 @@
   # Ensure X window environment.
   - name: ensure minimal X window environment
     apt: name={{item}} state=present
-    with_lines: cat ~/config/ansible/files/apt-mark_new/{{ system_name }}/minimal_x | sed -e 's/ *#.*$//'
-  #- name: ensure 3d acceleration and optimus switch
+    with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/minimal_x | sed -e 's/ *#.*$//'
+  - name: ensure 3d acceleration core
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/3d_acceleration | sed -e 's/ *#.*$//'
+  #- name: ensure further 3d acceleration and optimus switch
   #  apt: name={{item}} state=present
-  #  with_lines: cat ~/config/ansible/files/apt-mark/3d_acceleration | sed -e 's/ *#.*$//'
+  #  with_lines: cat ~/config/ansible/files/apt-mark_new/W530/3d_acceleration | sed -e 's/ *#.*$//'
   #- name: ensure user plom is in bumblebee group
   #  user: name=plom groups=bumblebee append=yes
   - name: ensure basic X tools
@@ -87,14 +92,20 @@
     with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/browser_environment | sed -e 's/ *#.*$//'
 
   # Ensure wifi.
-  #- name: ensure wifi configuration
+  - 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/wifi | sed -e 's/ *#.*$//'
+  #  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.
   #
@@ -105,7 +116,7 @@
 
   # Remove undesired packages
   - name: collect desired packages
-    shell: cat files/apt-mark/minimal/* files/apt-mark_new/{{ system_name }}/*  | sed -e 's/ *#.*$//' > /tmp/white_list_unsorted && sort /tmp/white_list_unsorted > /tmp/white_list_sorted
+    shell: cat files/apt-mark_new/minimal/* files/apt-mark_new/{{ system_name }}/*  | sed -e 's/ *#.*$//' > /tmp/white_list_unsorted && sort /tmp/white_list_unsorted > /tmp/white_list_sorted
   - name: collect currently installed packages
     shell: dpkg-query -Wf '${Package}\n' > /tmp/all_unsorted && sort /tmp/all_unsorted > /tmp/all_sorted
   - name: create black list of packages to mark as automatically installed from the difference between the required packages and the packages currently installed