use user.name var and update yay

library/yaourt → library/yay

@@ -26,11 +26,11 @@ import os
 import platform
 
 
-def yaourt_in_path(module):
+def yay_in_path(module):
     """
-    Determine if yaourt is available.
+    Determine if yay is available.
     """
-    rc, stdout, stderr = module.run_command('which yaourt', check_rc=False)
+    rc, stdout, stderr = module.run_command('which yay', check_rc=False)
     return rc == 0
 
 
@@ -71,9 +71,9 @@ def download_packages(module, pkgs, dir, user):
     """
     Download the specified packages.
     """
-    # Use yaourt, if available.
-    if yaourt_in_path(module):
-        cmds = ['sudo -u %s yaourt -S --noconfirm %s', ]
+    # Use yay, if available.
+    if yay_in_path(module):
+        cmds = ['sudo -u %s yay -S --noconfirm %s', ]
     # Otherwise, fall back to cURL
     else:
         cmds = ['sudo -u %s curl -O https://aur.archlinux.org/cgit/aur.git/snapshot/%s.tar.gz',

roles/ansible/tasks/main.yml

@@ -1,9 +1,9 @@
 ---
 
 - name: Install ansible-lint
-  yaourt:
+  yay:
     name: ansible-lint
-    user: "{{ ansible_user }}"
+    user: "{{ user.name }}"
   tags: [ 'ansible' ]
 
 - name: Install sshpass

roles/browser/tasks/main.yml

@@ -9,11 +9,11 @@
     # - chromium
   tags: [ 'browser' ]
 
-#- name: install pepper-flash from aur
-#  yaourt:
-#    name: pepper-flash
-#    user: "{{ ansible_user }}"
-#  tags: [ 'browser' ]
+- name: install pepper-flash from aur
+  yay:
+    name: pepper-flash
+    user: "{{ user.name }}"
+  tags: [ 'browser' ]
 
 # Firefox
 - name: install firefox extras
@@ -27,9 +27,9 @@
   tags: [ 'browser' ]
 
 - name: install firefox extras from aur
-  yaourt:
+  yay:
     name: lastpass
-    user: "{{ ansible_user }}"
+    user: "{{ user.name }}"
   with_items:
     - lastpass
     - ttf-ms-fonts

roles/chef/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
 - name: Install chef-dk
-  yaourt:
+  yay:
     name: chef-dk
-    user: "{{ ansible_user }}"
+    user: "{{ user.name }}"
   tags: [ 'chef' ]
 
 - name: Install chef extras
@@ -24,18 +24,18 @@
 
 - name: Ensure ~/workspace dir exists
   file:
-    dest: "/home/{{ ansible_user }}/workspace"
+    dest: "/home/{{ user.name }}/workspace"
     state: directory
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     mode: 0755
   tags: [ 'chef' ]
 
 - name: Clone chef {{ chef.repo }}
   become: false
   git:
     repo: "{{ chef.repo_url }}"
-    dest: "/home/{{ ansible_user }}/workspace/{{ chef.repo }}"
+    dest: "/home/{{ user.name }}/workspace/{{ chef.repo }}"
     version: master
     accept_hostkey: true
   when: chef.repo is defined
@@ -46,27 +46,27 @@
   copy:
     src: "{{ chef.validation_key_file }}"
     dest: "{{ chef.validation_key_path }}"
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     mode: 0400
   when: chef.validation_key_file is defined
   tags: [ 'chef' ]
 
 - name: Ensure ~/.berkshelf dir exists
   file:
-    dest: "/home/{{ ansible_user }}/.berkshelf"
+    dest: "/home/{{ user.name }}/.berkshelf"
     state: directory
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     mode: 0755
   tags: [ 'chef' ]
 
 - name: Generate ~/.berkshelf/config.json
   template:
     src: config.json.j2
-    dest: "/home/{{ ansible_user }}/.berkshelf/config.json"
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    dest: "/home/{{ user.name }}/.berkshelf/config.json"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     mode: 0644
   when: chef.server_url is defined
   tags: [ 'chef' ]

roles/chef/templates/config.json.j2

@@ -2,31 +2,13 @@
   "chef":{
     "chef_server_url":"{{ chef.server_url }}",
     "validation_client_name":"{{ chef.validation_client_name }}",
-    "validation_key_path":"{{ chef.validation_key_path }}",
-    "client_key":"{{ chef.client_key }}",
-    "node_name":"{{ chef.node_name }}"
   },
   "cookbook":{
     "copyright":"{{ chef.copyright }}",
     "email":"{{ chef.email }}",
-    "license":"reserved"
-  },
-  "allowed_licenses":[],
-  "raise_license_exception":false,
-  "vagrant":{
-    "vm":{
-      "box":"ubuntu-14.04",
-      "box_url":"",
-      "forward_port":{},
-      "network":{
-        "bridged":false,
-        "hostonly":"192.168.33.11"
-      },
-      "provision":"chef_zero"
-    }
+    "license":"GPL-2.0"
   },
   "ssl":{
     "verify":false
   }
 }
-

roles/conky/tasks/main.yml

@@ -8,5 +8,5 @@
 - name: generate ~/.conkyrc
   template:
     src: conkyrc.j2
-    dest: "/home/{{ ansible_user }}/.conkyrc"
+    dest: "/home/{{ user.name }}/.conkyrc"
   tags: [ 'conky' ]

roles/docker/tasks/main.yml

@@ -18,7 +18,7 @@
 
 - name: Add user to docker group
   user:
-    name: "{{ ansible_user }}"
+    name: "{{ user.name }}"
     groups: docker
     append: yes
   tags: [ "docker" ]

roles/i3/tasks/main.yml

@@ -50,17 +50,17 @@
   tags: [ 'i3' ]
 
 - name: install xcalib from aur
-  yaourt:
+  yay:
     name: xcalib
-    user: "{{ ansible_user }}"
+    user: "{{ user.name }}"
   tags: [ 'i3' ]
 
 - name: Create ~/.i3 directories
   file:
-    path: "/home/{{ ansible_user }}/{{ item }}"
+    path: "/home/{{ user.name }}/{{ item }}"
     state: directory
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     mode: 0755
   with_items:
     - .i3
@@ -71,7 +71,7 @@
 - name: generate i3 config files
   template:
     src: "i3/{{ item }}.j2"
-    dest: "/home/{{ ansible_user }}/.i3/{{ item }}"
+    dest: "/home/{{ user.name }}/.i3/{{ item }}"
   with_items:
     - Xresources.dark
     - Xresources.light
@@ -90,7 +90,7 @@
 - name: generate i3 bin files
   template:
     src: "i3/{{ item }}.j2"
-    dest: "/home/{{ ansible_user }}/.i3/{{ item }}"
+    dest: "/home/{{ user.name }}/.i3/{{ item }}"
     mode: 0777
   with_items:
     - bin/apply-colors-runtime
@@ -99,52 +99,52 @@
 
 - name: symlink xinitrc
   file:
-    src: "/home/{{ ansible_user }}/.i3/xinitrc"
-    dest: "/home/{{ ansible_user }}/.xinitrc"
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    src: "/home/{{ user.name }}/.i3/xinitrc"
+    dest: "/home/{{ user.name }}/.xinitrc"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     state: link
   tags: [ 'i3' ]
 
 - name: create $HOME/.urxvt/ext/ dir
   file:
-    path: "/home/{{ ansible_user }}/.urxvt/ext/"
+    path: "/home/{{ user.name }}/.urxvt/ext/"
     state: directory
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     mode: 0755
   tags: [ 'i3' ]
 
 - name: download urxvt font-size plugin
   get_url:
     url: https://raw.githubusercontent.com/majutsushi/urxvt-font-size/master/font-size
-    dest: "/home/{{ ansible_user }}/.urxvt/ext/font-size"
+    dest: "/home/{{ user.name }}/.urxvt/ext/font-size"
     mode: 0755
   tags: [ 'i3' ]
 
 - name: enable urxvt keyboard-select plugin
   file:
     src: /usr/lib/urxvt/perl/keyboard-select
-    dest: "/home/{{ ansible_user }}/.urxvt/ext/keyboard-select"
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    dest: "/home/{{ user.name }}/.urxvt/ext/keyboard-select"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     state: link
   tags: [ 'i3' ]
 
 - name: enable urxvt url-select plugin
   file:
     src: /usr/lib/urxvt/perl/url-select
-    dest: "/home/{{ ansible_user }}/.urxvt/ext/url-select"
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    dest: "/home/{{ user.name }}/.urxvt/ext/url-select"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     state: link
   tags: [ 'i3' ]
 
 - name: create $HOME/screenshots dir for scrot
   file:
-    path: "/home/{{ ansible_user }}/screenshots/"
+    path: "/home/{{ user.name }}/screenshots/"
     state: directory
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     mode: 0755
   tags: [ 'i3' ]

roles/mutt/tasks/main.yml

@@ -11,9 +11,9 @@
     - mutt
 
 - name: install mutt deps from aur
-  yaourt:
+  yay:
     name: isync
-    user: "{{ ansible_user }}"
+    user: "{{ user.name }}"
   tags:
     - email
     - mutt
@@ -22,7 +22,7 @@
   become: false
   git:
     repo: https://github.com/ork/mutt-office365.git
-    dest: "/home/{{ ansible_user }}/.mutt"
+    dest: "/home/{{ user.name }}/.mutt"
     version: master
     update: no
   tags:
@@ -32,9 +32,9 @@
 - name: Generate ~/.mutt/user
   template:
     src: user.j2
-    dest: "/home/{{ ansible_user }}/.mutt/user"
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    dest: "/home/{{ user.name }}/.mutt/user"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     mode: "0644"
   tags:
     - email

roles/pianobar/tasks/main.yml

@@ -14,18 +14,18 @@
 
 - name: create config dir
   file:
-    path: "/home/{{ ansible_user }}/.config/pianobar"
+    path: "/home/{{ user.name }}/.config/pianobar"
     state: directory
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     mode: 0755
   tags: [ 'pianobar' ]
 
 - name: generate pianobar config
   template:
     src: config.j2
-    dest: "/home/{{ ansible_user }}/.config/pianobar/config"
-    owner: "{{ ansible_user }}"
-    group: "{{ ansible_user }}"
+    dest: "/home/{{ user.name }}/.config/pianobar/config"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
     mode: "0644"
   tags: [ 'pianobar' ]

roles/sound/tasks/main.yml

@@ -28,15 +28,15 @@
   tags: [ 'sound' ]
 
 #- name: Install pasystray
-#  yaourt:
+#  yay:
 #    name: pasystray-gtk3-standalone
-#    user: "{{ ansible_user }}"
+#    user: "{{ user.name }}"
 #  tags: [ 'sound' ]
 
 - name: Install pulseaudio-ctl
-  yaourt:
+  yay:
     name: pulseaudio-ctl
-    user: "{{ ansible_user }}"
+    user: "{{ user.name }}"
   tags: [ 'sound' ]
 
 - name: Generate /etc/libao.conf