From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 15 Apr 2017 11:00:11 +0000 (+0200)
Subject: Ansible script: Improve comments, add alsamixer.
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/static/day?a=commitdiff_plain;h=26b0b3f094c53238fa49aa8c892fa744901a127a;p=config

Ansible script: Improve comments, add alsamixer.
---

diff --git a/ansible/config.yml b/ansible/config.yml
index c49e7c9..2a7f1a3 100644
--- a/ansible/config.yml
+++ b/ansible/config.yml
@@ -20,22 +20,18 @@
   - 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/ *#.*$//'
-    #with_items:
-    #- tlp
-    #- acpi-call-dkms
   - 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_lines: cat ~/config/ansible/files/apt-mark/console | sed -e 's/ *#.*$//'
-    #with_items:
-    #- locales
-    #- console-setup
   - 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/
@@ -49,14 +45,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_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, alsamixer
     apt: name={{item}} state=present
-    with_lines: cat ~/config/ansible/files/apt-mark/sudo_git_vim_less_openssh | sed -e 's/ *#.*$//'
+    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'
 
diff --git a/ansible/files/apt-mark/.various_useful.swp b/ansible/files/apt-mark/.various_useful.swp
new file mode 100644
index 0000000..dfa73ad
Binary files /dev/null and b/ansible/files/apt-mark/.various_useful.swp differ
diff --git a/ansible/files/apt-mark/3d_acceleration b/ansible/files/apt-mark/3d_acceleration
index 6d1064f..7d0ba5b 100644
--- a/ansible/files/apt-mark/3d_acceleration
+++ b/ansible/files/apt-mark/3d_acceleration
@@ -1,5 +1,5 @@
 bumblebee-nvidia
-libgl1-mesa-dri  # necessary for OpenGL 3D acceleration to work
-libglu1-mesa  # necessary for OpenGL 3D acceleration to work
-linux-headers-amd64  # necessary to build proper nvidia-driver module
-primus
+libgl1-mesa-dri  # tested as necessary for OpenGL 3D acceleration to work
+libglu1-mesa  # tested as necessary for OpenGL 3D acceleration to work
+linux-headers-amd64  # tested as necessary to build proper nvidia-driver module
+primus  # bridge by which bumblebee will deliver Nvidia-renderend content to Intel card
diff --git a/ansible/files/apt-mark/basic_x_tools b/ansible/files/apt-mark/basic_x_tools
index 7798e3b..ce715a3 100644
--- a/ansible/files/apt-mark/basic_x_tools
+++ b/ansible/files/apt-mark/basic_x_tools
@@ -1,6 +1,6 @@
 i3
 i3status
 redshift
-suckless-tools
+suckless-tools  # contains dmenu; not using virtual packages as that won't be marked manually installed
 xterm
 x11-xserver-utils  # includes xrdb which applies .Xresources files
diff --git a/ansible/files/apt-mark/minimal_ansible_environment b/ansible/files/apt-mark/minimal_ansible_environment
index c4e6c7f..f9f4097 100644
--- a/ansible/files/apt-mark/minimal_ansible_environment
+++ b/ansible/files/apt-mark/minimal_ansible_environment
@@ -1,3 +1,3 @@
 ansible
-ifupdown
-isc-dhcp-client
+ifupdown  # needed for internet connectivity
+isc-dhcp-client  # needed for internet connectivity
diff --git a/ansible/files/apt-mark/power_management b/ansible/files/apt-mark/power_management
index ada304e..3dba602 100644
--- a/ansible/files/apt-mark/power_management
+++ b/ansible/files/apt-mark/power_management
@@ -1,2 +1,2 @@
-acpi-call-dkms
+acpi-call-dkms  # needed for tlp to access Thinkpad-specific features
 tlp
diff --git a/ansible/files/apt-mark/sudo_git_vim_less_openssh b/ansible/files/apt-mark/sudo_git_vim_less_openssh
deleted file mode 100644
index e37a898..0000000
--- a/ansible/files/apt-mark/sudo_git_vim_less_openssh
+++ /dev/null
@@ -1,5 +0,0 @@
-git
-less
-openssh-client
-sudo
-vim
diff --git a/ansible/files/apt-mark/various_useful b/ansible/files/apt-mark/various_useful
new file mode 100644
index 0000000..546f4c8
--- /dev/null
+++ b/ansible/files/apt-mark/various_useful
@@ -0,0 +1,6 @@
+alsamixer
+git
+less
+openssh-client
+sudo
+vim