Merge branch 'master' of https://github.com/plomlompom/config

[config] / ansible / config.yml

diff --git a/ansible/config.yml b/ansible/config.yml
index 5ae4a3a7bde56a9beb238dc1839bf98d8847f52a..16b56518bf13921fcb3c97f72cd5aea1e379f8b2 100644 (file)
--- a/ansible/config.yml
+++ b/ansible/config.yml
@@ -5,7 +5,7 @@
   tasks:
 
   - name: symlink system files
-    file: state=link force=yes src={{item}} dest={{item|basename|regex_replace('___','/')}}
+    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
@@ -22,6 +22,15 @@
   - name: APT - dist-upgrade
     apt: upgrade=dist
 
+  # Upgrade kernel.
+  - name: ensure newest kernel and grub are installed
+    apt: name={{item}} state=present
+    with_items:
+    - linux-image-amd64
+    - grub2
+  - name: update grub
+    shell: update-grub
+
   # Configure console.
   - name: symlink console config files
     file: state=link force=yes src={{item}} dest={{item|basename|regex_replace('___','/')}}
@@ -37,12 +46,11 @@
     command: setupcon
 
   # Miscellaneous.
-  - name: Ensure minimal dotfile symlinks
+  - name: Ensure dotfile symlinks
     file: state=link force=yes src={{item}} dest=~/.{{item|basename}}
-    with_fileglob: ~/config/ansible/files/dotfiles/minimal/*
-  - name: Ensure root user dotfile symlinks
-    file: state=link force=yes src={{item}} dest=~/.{{item|basename}}
-    with_fileglob: ~/config/ansible/files/dotfiles/root/*
+    with_fileglob:
+    - ~/config/dotfiles/minimal/*
+    - ~/config/dotfiles/root/*
   - name: ensure ~/.vimbackups directory
     file: state=directory dest=~/.vimbackups
   - name: ensure man-db, manpages is installed
@@ -52,22 +60,52 @@
     - manpages
   - name: set /etc/localtime
     file: state=link force=yes src=/usr/share/zoneinfo/Europe/Berlin dest=/etc/localtime
-  - name: ensure sudo, git, vim, less are installed
+  - name: ensure sudo, git, vim, less, openssh are installed
     apt: name={{item}} state=present
     with_items:
     - git
     - vim
     - less
     - sudo
+    - openssh-client
   - 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='TTYVDisallocate=no'
+    replace: dest=/etc/systemd/system/getty.target.wants/getty@tty1.service regexp='^TTYVTDisallocate=yes.*$' replace='TTYVTDisallocate=no'
 
   # Config user.
-  - name: create user plom
-    user: name=plom
+  - 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=git://github.com/plomlompom/config dest=/home/plom/config
+    git: repo=https://github.com/plomlompom/config dest=/home/plom/config
     become_user: plom
     become_method: su
-  - name: ensure user has sudo privileges
-    command: adduser plom sudo
+
+  # Ensure X window environment.
+  - name: ensure minimal X window environment
+    apt: name={{item}} state=present
+    with_items:
+    - xserver-xorg-core
+    - xserver-xorg-input-evdev  # supports all input devices the kernel knows about
+    - xinit  # contains startx
+    - libpam-systemd  # needed to start X as non-root
+  - name: ensure 3d acceleration and optimus switch
+    - libgl1-mesa-dri  # necessary for OpenGL 3D acceleration to work
+    - bumblebee-nvidia
+    - primus
+  - name: ensure basic X tools
+    apt: name={{item}} state=present
+    with_items:
+    - xterm
+    - x11-xserver-utils  # includes xrdb which applies .Xresources files
+    - redshift 
+    - i3
+    - i3status
+    - dmenu
+
+  # Set up pentadactyl.
+  - name: ensure browser environment
+    apt: name={{item}} state=present
+    with_items:
+    - iceweasel
+    - xul-ext-noscript
+    - xul-ext-pentadactyl
+    - vim-gtk  # used by pentadactyl for text editing