X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=ansible%2Fconfig.yml;h=7cdc351fd881fd45a7969552c4eaf8c736929354;hb=7cb5e5a579b3f4ef477f1a1df7787a5bc09d5931;hp=d157a2aa0071733cab6245eeb8b02ef76e715fe7;hpb=7c06f62d6342a1e7933625183fc5264315f52d57;p=config

diff --git a/ansible/config.yml b/ansible/config.yml
index d157a2a..7cdc351 100644
--- a/ansible/config.yml
+++ b/ansible/config.yml
@@ -4,76 +4,149 @@
   become: yes
   tasks:
 
-  # Set hostname.
-  - name: symlink hostname file 
-    file: state=link force=yes src=/root/config/ansible/files/_etc_hostname dest=/etc/hostname   
-  - name: symlink hosts file 
-    file: state=link force=yes src=/root/config/ansible/files/_etc_hosts dest=/etc/hosts
+  - 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.
-  - name: symlink APT sources file
-    file: state=link force=yes src=/root/config/ansible/files/_etc_apt_sources.list dest=/etc/apt/sources.list
   - name: update package lists
     apt: update_cache=yes
-  - name: symlink APT config file
-    file: state=link force=yes src=/root/config/ansible/files/_etc_apt_apt.conf.d_99mindeps dest=/etc/apt/apt.conf.d/99mindeps
-  - 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: 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
 
+  ## Upgrade kernel.
+  #- name: ensure newest kernel and grub are installed
+  #  apt: name={{item}} state=present
+  #  with_lines: cat ~/config/ansible/files/apt-mark/newest_kernel | sed -e 's/ *#.*$//'
+  #  #with_items:
+  #  #- linux-image-amd64
+  #  #- grub2
+  #- name: update grub
+  #  shell: update-grub
+
+  # 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/ *#.*$//'
+    #with_items:
+    #- tlp
+    #- acpi-call-dkms
+  - name: start TLP
+    shell: tlp start
+
   # Configure console.
-  - name: symlink terminal config file
-    file: state=link force=yes src=/root/config/ansible/files/_etc_default_console-setup dest=/etc/default/console-setup
-  - name: symlink keyboard config file
-    file: state=link force=yes src=/root/config/ansible/files/_etc_default_keyboard dest=/etc/default/keyboard
-  - name: ensure locales is installed
-    apt: name=locales state=present
-  - name: ensure setupcon is installed
-    apt: name=console-setup state=present
+  - 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: symlink /etc/profile (with locale export) 
-    file: state=link force=yes src=/root/config/ansible/files/_etc_profile dest=/etc/profile
   - name: run setupcon to apply console settings from /etc/default/
     command: setupcon
-  - 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'
 
-  # Configure timezone.
-  - name: symlink timezone file
-    file: state=link force=yes src=/root/config/ansible/files/_etc_timezone dest=/etc/timezone
+  # Miscellaneous.
+  - name: Ensure dotfile symlinks
+    file: state=link force=yes src={{item}} dest=~/.{{item|basename}}
+    with_fileglob:
+    - ~/config/dotfiles/minimal/*
+    - ~/config/dotfiles/root/*
+  - name: ensure ~/.vimbackups directory
+    file: state=directory dest=~/.vimbackups
+  - name: ensure man-db, manpages is installed
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark/man | sed -e 's/ *#.*$//'
+    #with_items:
+    #- man-db
+    #- 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, openssh are installed
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark/sudo_git_vim_less_openssh | sed -e 's/ *#.*$//'
+    #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='TTYVTDisallocate=no'
 
-  # Set up editor
-  - name: set ~/.vimrc
-    file: state=link force=yes src=/root/config/ansible/dotfiles/vimrc dest=~/.vimrc
-  - name: set ~/.vimrc_add
-    file: state=link force=yes src=/root/config/ansible/dotfiles/vimrc_add dest=~/.vimrc_add
-  - name: ensure ~/.vimbackups directory
-    file: path=~/.vimbackups state=directory
-  - name: ensure vim is installed
-    apt: name=vim state=present
+  # 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
+
+  # Ensure X window environment.
+  - name: ensure minimal X window environment
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark/minimal_x | sed -e 's/ *#.*$//'
+    #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
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark/3d_acceleration | sed -e 's/ *#.*$//'
+    #with_items:
+    #- linux-headers-amd64  # necessary to build proper nvidia-driver module
+    #- libgl1-mesa-dri  # necessary for OpenGL 3D acceleration to work
+    #- libglu1-mesa  # necessary for OpenGL 3D acceleration to work
+    #- bumblebee-nvidia
+    #- primus
+  - name: ensure basic X tools
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark/basic_x_tools | sed -e 's/ *#.*$//'
+    #with_items:
+    #- xterm
+    #- x11-xserver-utils  # includes xrdb which applies .Xresources files
+    #- redshift 
+    #- i3
+    #- i3status
+    #- suckless-tools 
 
-  # Configure shell.
-  - name: set ~/.bashrc
-    file: state=link force=yes src=/root/config/ansible/dotfiles/bashrc dest=~/.bashrc
-  - name: set ~/.profile
-    file: state=link force=yes src=/root/config/ansible/dotfiles/profile dest=~/.profile
-  - name: set ~/.shinit
-    file: state=link force=yes src=/root/config/ansible/dotfiles/shinit dest=~/.shinit
-  - name: set ~/.shinit_color
-    file: state=link force=yes src=/root/config/ansible/dotfiles/shinit_color dest=~/.shinit_color
+  # Set up pentadactyl.
+  - name: ensure browser environment
+    apt: name={{item}} state=present
+    with_lines: cat ~/config/ansible/files/apt-mark/browser_environment | sed -e 's/ *#.*$//'
+    #with_items:
+    #- iceweasel
+    #- xul-ext-noscript
+    #- xul-ext-pentadactyl
+    #- vim-gtk  # used by pentadactyl for text editing
 
-  # Set up git.
-  - name: set ~/.gitconfig
-    file: state=link force=yes src=/root/config/ansible/dotfiles/gitconfig dest=~/.gitconfig
-  - name: ensure git is installed
-    apt: name=git state=present
+  # Remove undesired packages
+#  - name: register number of installed packages
+#    shell: dpkg-query -Wf 'x' | wc -c
+#    register: package_count
+#  
+#
+  - 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