Fix.

[config] / ansible / config_new.yml

diff --git a/ansible/config_new.yml b/ansible/config_new.yml
index 55ecd907720d276dcd891e622b1d3b4b26f366e3..f3bd3f565a1d093e007374864b02e9be2bf2dafd 100644 (file)
--- a/ansible/config_new.yml
+++ b/ansible/config_new.yml
@@ -9,21 +9,34 @@
     with_lines: cat ~/config/ansible/files/dirs_new | sed -e 's/ *#.*$//'
   - name: symlink system files
     file: state=hard force=yes src={{item}} dest={{item|basename|regex_replace('___','/')}}
-    with_fileglob: ~/config/ansible/files/system_new/minimal/*
-    with_fileglob: ~/config/ansible/files/system_new/{{ system_name }}/*
+    with_fileglob:
+    - ~/config/ansible/files/system_new/minimal/*
+    - ~/config/ansible/files/system_new/{{ system_name }}/*
   - name: set hostname for current session
     shell: hostname {{ system_name }} 
 
   # Init package management.
+  - name: add palemoon repo signing key
+    apt_key:
+      url: https://download.opensuse.org/repositories/home:stevenpusser/Debian_9.0/Release.key
+      state: present
   - name: update package lists
     apt: update_cache=yes
   - name: APT - dist-upgrade
     apt: upgrade=dist
 
+  # Ensure packages needed for disk encryption on startup (how does this work?)
+  - name: ensure power management tools are installed
+    apt: name={{item}} state=present
+    with_lines:
+    - cat ~/config/ansible/files/apt-mark_new/minimal/disk_encryption | sed -e 's/ *#.*$//'
+
   # Ensure power management.
   - name: ensure power management tools are installed
     apt: name={{item}} state=present
-    with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/power_management | sed -e 's/ *#.*$//'
+    with_lines:
+    - cat ~/config/ansible/files/apt-mark_new/minimal/power_management | sed -e 's/ *#.*$//'
+    - cat ~/config/ansible/files/apt-mark_new/X200s/power_management | sed -e 's/ *#.*$//'
   - name: start TLP
     shell: tlp start
 
@@ -38,6 +51,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
 
@@ -63,38 +78,51 @@
   # Config user.
   - name: create user plom with sudo privileges and bash shell
     user: name=plom groups=sudo shell=/bin/bash
-  - name: have config repo in user directory
-    git: repo=https://github.com/plomlompom/config dest=/home/plom/config
-    become_user: plom
-    become_method: su
+  #- name: have config repo in user directory
+  #  git: repo=https://github.com/plomlompom/config dest=/home/plom/config
+  #  become_user: plom
+  #  become_method: su
 
   # Ensure X window environment.
   - name: ensure minimal X window environment
     apt: name={{item}} state=present
     with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/minimal_x | sed -e 's/ *#.*$//'
-  #- name: ensure 3d acceleration and optimus switch
+  - name: ensure 3d acceleration
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/3d_acceleration | sed -e 's/ *#.*$//'
+  #- name: ensure 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
     apt: name={{item}} state=present
     with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/basic_x_tools | sed -e 's/ *#.*$//'
 
-  # Set up pentadactyl.
+  ## Set up browser environment.
+  #- name: ensure qutebrowser
+  #  include: tasks/qutebrowser.yml
   - name: ensure browser environment
     apt: name={{item}} state=present
     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/ *#.*$//'
+    - cat ~/config/ansible/files/apt-mark_new/X200s/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.
   #