X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=ansible%2Fconfig_new.yml;h=f3bd3f565a1d093e007374864b02e9be2bf2dafd;hb=27942fc7dfadcc26b4fff15974af2b0faa675730;hp=3d3a06df0161b3abb4620974835810a19d617dc9;hpb=8b5cf3f3a0d58227c220d93a588359fa8ff2b7d1;p=config

diff --git a/ansible/config_new.yml b/ansible/config_new.yml
index 3d3a06d..f3bd3f5 100644
--- a/ansible/config_new.yml
+++ b/ansible/config_new.yml
@@ -6,24 +6,37 @@
 
   - name: ensure directories for symlinks exist
     file: state=directory dest={{item}}
-    with_lines: cat ~/config/ansible/files/dirs | sed -e 's/ *#.*$//'
+    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
 
@@ -35,9 +48,11 @@
     with_fileglob: ~/config/ansible/files/console/*
   - name: ensure locales and console-setup are installed
     apt: name={{item}} state=present
-    with_lines: cat ~/config/ansible/files/apt-mark/minimal/console | sed -e 's/ *#.*$//'
+    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
 
@@ -51,50 +66,63 @@
     file: state=directory dest=~/.vimbackups
   - name: ensure man-db, manpages are installed
     apt: name={{item}} state=present
-    with_lines: cat ~/config/ansible/files/apt-mark/minimal/man | sed -e 's/ *#.*$//'
+    with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/man | sed -e 's/ *#.*$//'
   - name: set /etc/localtime
     file: state=link force=yes src=/usr/share/zoneinfo/Europe/Berlin dest=/etc/localtime
   - name: ensure various useful tools are installed – sudo, git, vim, less, openssh
     apt: name={{item}} state=present
-    with_lines: cat ~/config/ansible/files/apt-mark/minimal/various_useful | sed -e 's/ *#.*$//'
+    with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/various_useful | sed -e 's/ *#.*$//'
   - name: ensure boot messages are not cleared on start up
     replace: dest=/etc/systemd/system/getty.target.wants/getty@tty1.service regexp='^TTYVTDisallocate=yes.*$' replace='TTYVTDisallocate=no'
 
   # 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/{{ 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
+    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/ *#.*$//'
-  - name: ensure user plom is in bumblebee group
-    user: name=plom groups=bumblebee append=yes
+  #  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/minimal/basic_x_tools | sed -e 's/ *#.*$//'
+    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/minimal/browser_environment | sed -e 's/ *#.*$//'
+    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.
   #
@@ -105,7 +133,7 @@
 
   # Remove undesired packages
   - name: collect desired packages
-    shell: cat files/apt-mark/minimal/* files/apt-mark/{{ 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