X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=ansible%2Fconfig.yml;h=3386c91a46f6e3c25be3fc79d4e8c07c172d1c28;hb=1e8e425dc22b77823519753a4df977964ae472ec;hp=ac9198d457268e76c37288406e590f90586051ce;hpb=1a025cf676cf98f81228543fc468e9b58fb34f0f;p=config

diff --git a/ansible/config.yml b/ansible/config.yml
index ac9198d..3386c91 100644
--- a/ansible/config.yml
+++ b/ansible/config.yml
@@ -4,33 +4,37 @@
   become: yes
   tasks:
 
+  - name: ensure directories for symlinks exist
+    file: state=directory dest={{item}}
+    with_lines: cat ~/config/ansible/files/dirs | 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/*
   - name: set hostname for current session
     shell: hostname w530
 
-  # Configure package management.
+  # Init package management.
   - name: update package lists
     apt: update_cache=yes
-  - name: check for initial_purge_happened flag
-    stat: path=flags/initial_purge_happened
-    register: initial_purge
-  - name: perform initial purge
-    include: tasks/initial_purge.yml
-    when: initial_purge.stat.exists == False
   - name: APT - dist-upgrade
     apt: upgrade=dist
 
+  # Ensure power management.
+  - name: ensure power management tools are installed
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark/power_management | sed -e 's/ *#.*$//'
+  - name: start TLP
+    shell: tlp start
+
   # Configure console.
+  #
+  # For some reason, some settings are only applied two reboots after this.
   - name: symlink console config files
     file: state=link force=yes src={{item}} dest={{item|basename|regex_replace('___','/')}}
     with_fileglob: ~/config/ansible/files/console/*
   - name: ensure locales and console-setup are installed
     apt: name={{item}} state=present
-    with_items:
-    - locales
-    - console-setup
+    with_lines: cat ~/config/ansible/files/apt-mark/console | sed -e 's/ *#.*$//'
   - name: generate en_US.UTF-8 locale
     locale_gen: name=en_US.UTF-8 state=present
   - name: run setupcon to apply console settings from /etc/default/
@@ -44,21 +48,14 @@
     - ~/config/dotfiles/root/*
   - name: ensure ~/.vimbackups directory
     file: state=directory dest=~/.vimbackups
-  - name: ensure man-db, manpages is installed
+  - name: ensure man-db, manpages are installed
     apt: name={{item}} state=present
-    with_items:
-    - man-db
-    - manpages
+    with_lines: cat ~/config/ansible/files/apt-mark/man | sed -e 's/ *#.*$//'
   - name: set /etc/localtime
     file: state=link force=yes src=/usr/share/zoneinfo/Europe/Berlin dest=/etc/localtime
-  - name: ensure sudo, git, vim, less, openssh are installed
+  - name: ensure various useful tools are installed – sudo, git, vim, less, openssh
     apt: name={{item}} state=present
-    with_items:
-    - git
-    - vim
-    - less
-    - sudo
-    - openssh-client
+    with_lines: cat ~/config/ansible/files/apt-mark/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'
 
@@ -73,24 +70,48 @@
   # Ensure X window environment.
   - name: ensure minimal X window environment
     apt: name={{item}} state=present
-    with_items:
-    - xserver-xorg
-    - xinit  # contains startx
-    - libpam-systemd  # needed to start X as non-root
+    with_lines: cat ~/config/ansible/files/apt-mark/minimal_x | sed -e 's/ *#.*$//'
+  - name: ensure 3d acceleration and 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
   - name: ensure basic X tools
     apt: name={{item}} state=present
-    with_items:
-    - x11-xserver-utils  # includes xrdb which applies .Xresources files
-    - xterm
-    - redshift 
-    - i3
-    - i3status
-    - dmenu
+    with_lines: cat ~/config/ansible/files/apt-mark/basic_x_tools | sed -e 's/ *#.*$//'
 
   # Set up pentadactyl.
   - name: ensure browser environment
     apt: name={{item}} state=present
-    - iceweasel
-    - xul-ext-noscript
-    - xul-ext-pentadactyl
-    - vim-gtk  # used by pentadactyl for text editing
+    with_lines: cat ~/config/ansible/files/apt-mark/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/ *#.*$//'
+
+  # Ensure audio/video consumption necessities.
+  - name: ensure multimedia tools
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark/multimedia | sed -e 's/ *#.*$//'
+
+  # Ensure hotkeys.
+  #
+  # For some reason, the brightness hotkeys still won't be available unless acpid is restarted (yes, after reboot).
+  - name: ensure hotkeys 
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark/hotkeys | sed -e 's/ *#.*$//'
+
+  # Remove undesired packages
+  - name: collect desired packages
+    shell: cat files/apt-mark/*  | 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
+    shell: comm -3 /tmp/all_sorted /tmp/white_list_sorted > /tmp/list_black
+  - name: mark all packages from black list as automatically installed
+    shell: apt-mark auto $(cat /tmp/list_black)
+  - name: mark all packages from white list as manually installed
+    shell: apt-mark manual $(cat /tmp/white_list_unsorted)
+  - name: purge all packages automatically installed that are not depended on
+    shell: DEBIAN_FRONTEND=noninteractive apt-get -y --purge autoremove