diff --git a/dotfiles.yml b/dotfiles.yml index 6a07d2f..eea7b3e 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -4,7 +4,6 @@ - ping: - include_vars: file: vars.yml - - import_tasks: tasks/yaourt.yml - import_tasks: tasks/common.yml - import_tasks: tasks/packages.yml - import_tasks: tasks/config.yml diff --git a/files/.yaourtrc b/files/.yaourtrc deleted file mode 100644 index e900d8e..0000000 --- a/files/.yaourtrc +++ /dev/null @@ -1,68 +0,0 @@ -# yaourtrc - Configuration for yaourt -# -# See yaourtrc(5) for more information -# -# - -# General -#AUTOSAVEBACKUPFILE=0 -#DEVEL=0 -#DEVELSRCDIR="" -#FORCE=0 -#NO_TESTDB=0 - -# Environment variables -#EDITOR="$EDITOR" -#TMPDIR="/tmp" -#VISUAL="$VISUAL" - -# SUDO -#SUDONOVERIF=0 # Avoid multiple sudo checks when timestamp_timeout=0 -#SUDOREDIRECT=1 # Define to 0 in case you use a fingerprint device - -# ABS -#USE_GIT=0 -# If the package "abs" is installed, those var are parsed from abs.conf -#REPOS=() # REPOS available at $SYNCSERVER -#SYNCSERVER="" - -# AUR -#AURURL="https://aur.archlinux.org" -#AURCOMMENT=5 -#AURDEVELONLY=0 -#AURSEARCH=1 -#AURSHOWDIFF=0 -#AURUPGRADE=0 -#AURVOTE=1 -#AURUSEGIT=0 - -# Build -#EXPORT=0 # Export to 1: EXPORTDIR or PKGDEST - # 2: pacman cache (as root) -#EXPORTSRC=0 # Need EXPORT>0 to be used -#EXPORTDIR="" # If empty, use makepkg's configuration (see makepkg.conf) - -# Prompt -NOCONFIRM=0 -#UP_NOCONFIRM=0 # No prompt while build upgrades (including -Sbu) -BUILD_NOCONFIRM=1 # Only prompt for editing files -#PU_NOCONFIRM=0 # Add --noconfirm to $PACMAN -U -#EDITFILES=1 -#NOENTER=1 - -# Output -#USECOLOR=1 -#USEPAGER=0 -#DETAILUPGRADE=1 -#SHOWORPHANS=1 -#TERMINALTITLE=1 - -# Command -#PACMAN="pacman" -#MAKEPKG="makepkg" -#DIFFEDITCMD="vimdiff" - -# pacdiffviewer -#P_LOCATE=0 # Use locate instead of find -#P_SEARCHDIR=(/etc/ /boot/) -#P_SAVEDIR='/var/lib/yaourt/backupfiles' diff --git a/tasks/packages.yml b/tasks/packages.yml index 4335dc0..cb88c1d 100644 --- a/tasks/packages.yml +++ b/tasks/packages.yml @@ -1,3 +1,24 @@ +- copy: + src: ./files/pacman.conf + dest: /etc/pacman.conf + mode: 0644 + +- set_fact: + keys: + - '8A8F901A' # Sublime Text + - 'D1483FA6C3C07136' # Tor Browser + - '9D5F1C051D146843CDA4858BDE64825E7CBC0D51' # ArchStrike + - '7448C890582975CD' + +- name: "Add keys to pacman" + shell: "pacman-key -r {{ item }}" + with_items: "{{ keys }}" + +- name: "Sign keys in pacman" + shell: "pacman-key --lsign-key {{ item }}" + with_items: "{{ keys }}" + + - user: name: aur_builder group: wheel diff --git a/tasks/yaourt.yml b/tasks/yaourt.yml deleted file mode 100644 index f413078..0000000 --- a/tasks/yaourt.yml +++ /dev/null @@ -1,24 +0,0 @@ -- copy: - src: ./files/pacman.conf - dest: /etc/pacman.conf - mode: 0644 - -- copy: - src: ./files/.yaourtrc - dest: "{{ home }}/.yaourtrc" - mode: 0644 - -- set_fact: - keys: - - '8A8F901A' # Sublime Text - - 'D1483FA6C3C07136' # Tor Browser - - '9D5F1C051D146843CDA4858BDE64825E7CBC0D51' # ArchStrike - - '7448C890582975CD' - -- name: "Add keys to pacman" - shell: "pacman-key -r {{ item }}" - with_items: "{{ keys }}" - -- name: "Sign keys in pacman" - shell: "pacman-key --lsign-key {{ item }}" - with_items: "{{ keys }}"