Major role refactoring

defaults/locales.yml

@@ -1,9 +1,11 @@
 ---
 
-system_locales:
-  - "{{ system_locale_lang }}"
+# https://sourceware.org/glibc/wiki/Locales
 
-system_locale_lang: en_US.UTF-8
+system_locales:
+  - en_US.UTF-8 UTF-8
+
+system_locale_lang: "{{ (system_locales | first). split(' ')[0] }}"
 
 system_locale_ctype: "{{ system_locale_lang }}"
 system_locale_numeric: "{{ system_locale_lang }}"

defaults/packages.yml

@@ -0,0 +1,18 @@
+---
+
+common_packages:
+  - htop
+  - nano
+  - strace
+  - lsof
+  - wget
+  - curl
+  - go
+  - tcpdump
+  - nmap
+  - dosfstools
+  - arch-install-scripts
+  - gptfdisk
+  - bash-completion
+  - git
+  - bind

defaults/pacman.yml

@@ -0,0 +1,10 @@
+---
+
+pacman_mirrors:
+  - https://mirrors.kernel.org/archlinux/$repo/os/$arch
+  - https://mirror.surf/archlinux/$repo/os/$arch
+  - https://mirror.yandex.ru/archlinux/$repo/os/$arch
+
+pacman_ignorepkg: []
+
+pacman_parallel_downloads: 2

defaults/timezone.yml

@@ -0,0 +1,3 @@
+---
+
+common_timezone: "Europe/Moscow"

tasks/main.yml

@@ -1,13 +1,49 @@
 ---
 
-- name: Common | Configure system
-  import_tasks: system.yml
-
-- name: Common | Configure pacman
-  import_tasks: pacman.yml
-
-- name: Common | Packages
-  import_tasks: packages.yml
+- name: Common | Set available locales
+  template:
+    src: locale.gen.j2
+    dest: /etc/locale.gen
+    mode: 0644
+    owner: root
+    group: root
+  notify: Common | Generate locales
 
 - name: Common | Run handlers
   meta: flush_handlers
+
+- name: Common | Set system locale
+  template:
+    src: locale.conf.j2
+    mode: 0644
+    owner: root
+    group: root
+    dest: /etc/locale.conf
+
+
+- name: Common | Set timezone
+  timezone:
+    name: "{{ common_timezone }}"
+
+
+- name: Common | Deploy pacman main config
+  template:
+    src: pacman.conf.j2
+    dest: /etc/pacman.conf
+    mode: 0644
+    owner: root
+    group: root
+
+- name: Common | Setup pacman repos
+  template:
+    src: mirrorlist.j2
+    dest: /etc/pacman.d/mirrorlist
+    mode: 0644
+    owner: root
+    group: root
+
+- name: Common | Install useful common packages
+  pacman:
+    state: present
+    update_cache: yes
+    name: "{{ common_packages }}"

tasks/packages.yml

@@ -1,34 +0,0 @@
----
-
-- name: Common | Install useful packages
-  pacman:
-    state: present
-    update_cache: yes
-# Move this to vars and add additional variable for custom packages
-    name:
-      - htop
-      - nano
-      - strace
-      - lsof
-      - wget
-      - curl
-      - go
-      - tcpdump
-      - nmap
-      - dosfstools
-      - arch-install-scripts
-      - gptfdisk
-      - bash-completion
-      - git
-      - bind
-
-#- block:
-#  - name: Common | Install yay from aur
-#    aur:
-#      name: yay
-#      use: makepkg
-#      skip_installed: yes
-
-#  become: no
-
-

tasks/pacman.yml

@@ -1,17 +0,0 @@
----
-
-- name: Common | Deploy pacman main config
-  template:
-    src: pacman.conf.j2
-    dest: /etc/pacman.conf
-    mode: 0644
-    owner: root
-    group: root
-
-- name: Common | Setup pacman repos
-  template:
-    src: mirrorlist.j2
-    dest: /etc/pacman.d/mirrorlist
-    mode: 0644
-    owner: root
-    group: root

tasks/system.yml

@@ -1,23 +0,0 @@
----
-
-- name: Common | Set or/and generate locales
-  template:
-    src: locale.gen.j2
-    dest: /etc/locale.gen
-    mode: 0644
-    owner: root
-    group: root
-  notify: Common | Generate locales
-
-- name: Common | Set system locale
-  template:
-    src: locale.conf.j2
-    mode: 0644
-    owner: root
-    group: root
-    dest: /etc/locale.conf
-
-- name: Common | Set timezone
-  timezone:
-    name: Europe/Moscow
-

templates/locale.conf.j2

@@ -1,4 +1,5 @@
 # {{ ansible_managed }}
+
 LANG="{{ system_locale_lang }}"
 LC_CTYPE="{{ system_locale_ctype }}"
 LC_NUMERIC="{{ system_locale_numeric }}"

templates/locale.gen.j2

@@ -1,4 +1,5 @@
 # {{ ansible_managed }}
-{% for item in system_locales %}
-{{ item }}
+
+{% for locale in system_locales %}
+{{ locale }}
 {% endfor %}

templates/mirrorlist.j2

@@ -1,4 +1,5 @@
 # {{ ansible_managed }}
-Server = http://mirror.zeym.org/archlinux/$repo/os/$arch
-Server = http://mirror.yandex.ru/archlinux/$repo/os/$arch
 
+{% for server in pacman_mirrors %}
+Server = {{ server }}
+{% endfor %}

templates/pacman.conf.j2

@@ -1,4 +1,5 @@
 # {{ ansible_managed}}
+
 [options]
 # The following paths are commented out with their default values listed.
 # If you wish to use different paths, uncomment and update the paths.
@@ -16,7 +17,7 @@ HoldPkg     = pacman glibc
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
+IgnorePkg   = {{ pacman_ignorepkg | join(' ') }}
 #IgnoreGroup =
 
 #NoUpgrade   =
@@ -25,9 +26,9 @@ Architecture = auto
 # Misc options
 #UseSyslog
 Color
-#TotalDownload
 CheckSpace
 VerbosePkgLists
+ParallelDownloads = {{ pacman_parallel_downloads }}
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -35,15 +36,15 @@ SigLevel    = Required DatabaseOptional
 LocalFileSigLevel = Optional
 RemoteFileSigLevel = Required
 
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
 [core]
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
 #[community-testing]
 #Include = /etc/pacman.d/mirrorlist
 

templates/timesyncd.conf.j2

@@ -1,5 +0,0 @@
-# {{ ansible_managed }}
-[Time]
-NTP=pool.ntp.org
-FallbackNTP=0.arch.pool.ntp.org 1.arch.pool.ntp.org 2.arch.pool.ntp.org 3.arch.pool.ntp.org
-RootDistanceMaxSec=10