X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=ansible%2Fconfig_new.yml;h=f3bd3f565a1d093e007374864b02e9be2bf2dafd;hb=0504405d378ed9f92ab63e2d339b52273ec8530d;hp=8153fc9199e206f4e870386070a1b6329e88529d;hpb=f1cbf7c7611fba5792113f9e89d821998f7e06e2;p=config

diff --git a/ansible/config_new.yml b/ansible/config_new.yml
index 8153fc9..f3bd3f5 100644
--- a/ansible/config_new.yml
+++ b/ansible/config_new.yml
@@ -16,15 +16,27 @@
     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
 
@@ -75,10 +87,10 @@
   - 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 core
+  - 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 further 3d acceleration and optimus switch
+  #- name: ensure optimus switch
   #  apt: name={{item}} state=present
   #  with_lines: cat ~/config/ansible/files/apt-mark_new/W530/3d_acceleration | sed -e 's/ *#.*$//'
   #- name: ensure user plom is in bumblebee group
@@ -87,9 +99,9 @@
     apt: name={{item}} state=present
     with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/basic_x_tools | sed -e 's/ *#.*$//'
 
-  # Set up qutebrowser.
-  - name: ensure qutebrowser
-    include: tasks/qutebrowser.yml
+  ## 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/ *#.*$//'
@@ -97,7 +109,9 @@
   # Ensure wifi.
   - name: ensure wifi configuration
     apt: name={{item}} state=present
-    with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/wifi | sed -e 's/ *#.*$//'
+    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_new/W530/wicd | sed -e 's/ *#.*$//'