From f422450da6dca49fcc345d381a93de8712449f08 Mon Sep 17 00:00:00 2001 From: Pig Monkey Date: Fri, 10 Apr 2026 15:49:13 -0700 Subject: [PATCH] ansible-lint --- facts.yml | 18 +- playbook.yml | 199 ++++++++++++----------- requirements.yml | 1 + roles/android/tasks/main.yml | 14 +- roles/archive/tasks/main.yml | 18 +- roles/aria2/tasks/main.yml | 4 +- roles/aws/tasks/main.yml | 4 +- roles/backitup/tasks/main.yml | 5 +- roles/backlight/handlers/main.yml | 4 +- roles/backlight/tasks/main.yml | 26 +-- roles/base/handlers/main.yml | 8 +- roles/base/tasks/aur_user.yml | 10 +- roles/base/tasks/journal.yml | 10 +- roles/base/tasks/main.yml | 33 ++-- roles/base/tasks/packages.yml | 37 +++-- roles/base/tasks/shell.yml | 8 +- roles/base/tasks/sudo.yml | 12 +- roles/base/tasks/user.yml | 28 ++-- roles/bat/tasks/main.yml | 4 +- roles/bitlbee/handlers/main.yml | 6 +- roles/bitlbee/tasks/main.yml | 26 +-- roles/bluetooth/tasks/main.yml | 30 ++-- roles/borg/tasks/main.yml | 2 +- roles/browsers/tasks/main.yml | 59 ++++--- roles/calibre/tasks/main.yml | 20 ++- roles/clipboard/tasks/main.yml | 15 +- roles/cron/handlers/main.yml | 6 +- roles/cron/tasks/main.yml | 9 +- roles/cryptshot/handlers/main.yml | 6 +- roles/cryptshot/tasks/config.yml | 14 +- roles/cryptshot/tasks/main.yml | 53 ++++-- roles/cups/handlers/main.yml | 6 +- roles/cups/tasks/main.yml | 16 +- roles/dconf/handlers/main.yml | 5 +- roles/dconf/tasks/main.yml | 12 +- roles/dictd/tasks/main.yml | 16 +- roles/dotfiles/tasks/main.yml | 17 +- roles/dvorak/tasks/main.yml | 17 +- roles/editors/tasks/main.yml | 2 +- roles/f3/tasks/main.yml | 4 +- roles/filesystems/tasks/main.yml | 2 +- roles/firejail/files/profile-activate.sh | 5 +- roles/firejail/handlers/main.yml | 8 +- roles/firejail/tasks/main.yml | 21 ++- roles/fonts/tasks/main.yml | 19 ++- roles/gdm/tasks/main.yml | 25 ++- roles/gitannex/files/99-max_watches.conf | 1 + roles/gitannex/files/git-annex.service | 11 ++ roles/gitannex/handlers/main.yml | 6 + roles/gitannex/meta/main.yml | 5 + roles/gitannex/tasks/main.yml | 60 +++++++ roles/gnome/tasks/dconf.yml | 18 +- roles/gnome/tasks/gnome_shell.yml | 8 +- roles/gnome/tasks/gtk.yml | 10 +- roles/gnome/tasks/main.yml | 14 +- roles/gnome/tasks/online_accounts.yml | 4 +- roles/gnupg/tasks/main.yml | 26 +-- roles/goesimage/handlers/main.yml | 6 +- roles/goesimage/tasks/main.yml | 23 +-- roles/goimapnotify/tasks/main.yml | 10 +- roles/golang/tasks/main.yml | 19 ++- roles/grub/handlers/main.yml | 5 +- roles/grub/tasks/main.yml | 16 +- roles/hardened/tasks/main.yml | 9 +- roles/hashicorp/tasks/main.yml | 10 +- roles/himawaripy/handlers/main.yml | 6 +- roles/himawaripy/tasks/main.yml | 25 +-- roles/hostsctl/tasks/main.yml | 10 +- roles/i3/tasks/main.yml | 16 +- roles/i3/tasks/rofi.yml | 8 +- roles/interception/handlers/main.yml | 4 +- roles/interception/tasks/main.yml | 15 +- roles/iptables/handlers/main.yml | 12 +- roles/iptables/tasks/main.yml | 28 +++- roles/kdeconnect/tasks/main.yml | 18 +- roles/laptop/handlers/main.yml | 10 +- roles/laptop/tasks/framework.yml | 2 +- roles/laptop/tasks/main.yml | 35 ++-- roles/laptop/tasks/tlp.yml | 29 ++-- roles/laptop/tasks/tuned.yml | 23 +-- roles/ledger/tasks/main.yml | 4 +- roles/libvirt/tasks/main.yml | 18 +- roles/lightdm/tasks/main.yml | 43 +++-- roles/localtime/tasks/main.yml | 9 +- roles/logitech/tasks/main.yml | 22 +-- roles/macbook/tasks/main.yml | 7 +- roles/mail/handlers/main.yml | 6 +- roles/mail/tasks/isync.yml | 4 +- roles/mail/tasks/mailsync.yml | 25 +-- roles/mail/tasks/main.yml | 60 ++++--- roles/mail/tasks/msmtp.yml | 79 ++++++--- roles/mail/tasks/oauth2.yml | 10 +- roles/mail/tasks/offlineimap.yml | 4 +- roles/mapping/tasks/main.yml | 4 +- roles/media/tasks/beets.yml | 4 +- roles/media/tasks/darktable.yml | 4 +- roles/media/tasks/feh.yml | 11 +- roles/media/tasks/flac2all.yml | 2 +- roles/media/tasks/gimp.yml | 13 +- roles/media/tasks/gthumb.yml | 4 +- roles/media/tasks/imagemagick.yml | 2 +- roles/media/tasks/imv.yml | 4 +- roles/media/tasks/inkscape.yml | 4 +- roles/media/tasks/main.yml | 51 +++--- roles/media/tasks/qcode.yml | 9 +- roles/media/tasks/teiler.yml | 2 +- roles/microcode/tasks/main.yml | 30 ++-- roles/mirrorlist/handlers/main.yml | 6 +- roles/mirrorlist/tasks/main.yml | 48 +++--- roles/mpd/tasks/main.yml | 48 ++++-- roles/mpv/tasks/main.yml | 16 +- roles/nettools/tasks/main.yml | 69 ++++++-- roles/networkmanager/tasks/main.yml | 44 ++--- roles/nmtrust/tasks/main.yml | 34 ++-- roles/nmtrust/tasks/unit.yml | 89 +++++----- roles/ntp/handlers/main.yml | 6 +- roles/ntp/tasks/main.yml | 15 +- roles/office/tasks/main.yml | 33 ++-- roles/oomd/tasks/main.yml | 10 +- roles/openresolv/tasks/main.yml | 12 +- roles/openvpn/tasks/main.yml | 10 +- roles/optical/tasks/main.yml | 6 +- roles/parcimonie/tasks/main.yml | 14 +- roles/pass/tasks/main.yml | 10 +- roles/pdf/tasks/main.yml | 22 +-- roles/pianobar/tasks/main.yml | 18 +- roles/pim/tasks/main.yml | 19 ++- roles/pkgfile/tasks/main.yml | 13 +- roles/postgresql/handlers/main.yml | 8 +- roles/postgresql/tasks/main.yml | 66 +++++--- roles/pydev/tasks/main.yml | 30 ++-- roles/radio/tasks/main.yml | 12 +- roles/radio/tasks/radio_mgmt.yml | 2 +- roles/radio/tasks/radio_ops.yml | 4 +- roles/radio/tasks/rtl-sdr.yml | 4 +- roles/redshift/tasks/main.yml | 11 +- roles/regdomain/tasks/main.yml | 4 +- roles/ripgrep/tasks/main.yml | 4 +- roles/rtorrent/tasks/main.yml | 11 +- roles/screensaver/tasks/main.yml | 17 +- roles/signal/tasks/main.yml | 4 +- roles/sound/handlers/main.yml | 6 +- roles/sound/tasks/main.yml | 14 +- roles/spell/tasks/main.yml | 4 +- roles/ssd/tasks/main.yml | 9 +- roles/ssh/handlers/main.yml | 6 +- roles/ssh/tasks/main.yml | 45 ++--- roles/syncthing/tasks/main.yml | 13 +- roles/sysctl/handlers/main.yml | 5 +- roles/sysmon/tasks/main.yml | 16 +- roles/systemd/handlers/main.yml | 13 +- roles/tarsnap/handlers/main.yml | 6 +- roles/tarsnap/tasks/main.yml | 37 +++-- roles/taskwarrior/handlers/main.yml | 7 +- roles/taskwarrior/tasks/main.yml | 12 +- roles/terminal/tasks/main.yml | 2 +- roles/thinkpad/tasks/main.yml | 19 ++- roles/tor/tasks/main.yml | 9 +- roles/transmission/tasks/main.yml | 11 +- roles/udisks/tasks/main.yml | 23 ++- roles/unbound/handlers/main.yml | 12 +- roles/unbound/tasks/main.yml | 38 +++-- roles/units/tasks/main.yml | 11 +- roles/virtualbox/tasks/main.yml | 9 +- roles/virtualenv/tasks/main.yml | 19 ++- roles/visidata/tasks/main.yml | 15 +- roles/vopono/tasks/main.yml | 8 +- roles/weechat/tasks/main.yml | 15 +- roles/wormhole/tasks/main.yml | 9 +- roles/wttr/tasks/main.yml | 5 +- roles/x/tasks/autorandr.yml | 2 +- roles/x/tasks/main.yml | 63 +++++-- roles/x/tasks/sxhkd.yml | 4 +- roles/x/tasks/unclutter.yml | 4 +- roles/x/tasks/xdg.yml | 13 +- roles/yubikey/tasks/main.yml | 6 +- roles/zeal/tasks/main.yml | 6 +- 177 files changed, 1840 insertions(+), 1176 deletions(-) create mode 100644 roles/gitannex/files/99-max_watches.conf create mode 100644 roles/gitannex/files/git-annex.service create mode 100644 roles/gitannex/handlers/main.yml create mode 100644 roles/gitannex/meta/main.yml create mode 100644 roles/gitannex/tasks/main.yml diff --git a/facts.yml b/facts.yml index 89354c5..28653a9 100644 --- a/facts.yml +++ b/facts.yml @@ -1,10 +1,12 @@ --- -- hosts: localhost +- name: Gather and display Ansible facts + hosts: localhost tasks: - - name: Print ansible_facts - debug: - var: ansible_facts - - name: Save ansible_facts to /tmp/ansible_facts.json - copy: - content: "{{ ansible_facts|to_nice_json }}" - dest: /tmp/ansible_facts.json + - name: Print ansible_facts + ansible.builtin.debug: + var: ansible_facts + - name: Save ansible_facts to /tmp/ansible_facts.json + ansible.builtin.copy: + content: "{{ ansible_facts | to_nice_json }}" + dest: /tmp/ansible_facts.json + mode: "0644" diff --git a/playbook.yml b/playbook.yml index 4738874..4af985e 100644 --- a/playbook.yml +++ b/playbook.yml @@ -1,104 +1,105 @@ --- -- hosts: localhost - become: yes +- name: Configure Arch Linux desktop + hosts: localhost + become: true roles: - - { role: base, tags: ['base'] } - - { role: grub, tags: ['grub'], when: "bootloader == 'grub'"} - - { role: gnupg, tags: ['gnupg'] } - - { role: sysmon, tags: ['sysmon'] } - - { role: cron, tags: ['cron'] } - - { role: microcode, tags: ['microcode'] } - - { role: hardened, tags: ['hardened'] } - - { role: ssh, tags: ['ssh'] } - - { role: dotfiles, tags: ['dotfiles'] } - - { role: ssd, tags: ['ssd'] } - - { role: interception, tags: ['interception'], when: "interception is defined" } - - { role: fonts, tags: ['fonts'] } - - { role: x, tags: ['x'] } - - { role: terminal, tags: ['terminal'], when: "terminal is defined" } - - { role: lightdm, tags: ['lightdm'], when: "display_manager == 'lightdm'" } - - { role: gdm, tags: ['gdm'], when: "display_manager == 'gdm'" } - - { role: i3, tags: ['i3'], when: "desktop_environment == 'i3'" } - - { role: gnome, tags: ['gnome'], when: "desktop_environment == 'gnome'" } - - { role: pass, tags: ['pass'] } - - { role: iptables, tags: ['iptables'] } - - { role: nettools, tags: ['nettools'] } - - { role: regdomain, tags: ['regdomain'], when: "regdomain is defined" } - - { role: openvpn, tags: ['openvpn'] } - - { role: nmtrust, tags: ['nmtrust'] } - - { role: unbound, tags: ['unbound'] } - - { role: openresolv, tags: ['openresolv'] } - - { role: networkmanager, tags: ['networkmanager'] } - - { role: ntp, tags: ['ntp'] } - - { role: firejail, tags: ['firejail'] } - - { role: tor, tags: ['tor'], when: "tor is defined" } - - { role: editors, tags: ['editors'] } - - { role: filesystems, tags: ['filesystems'] } - - { role: archive, tags: ['archive'] } - - { role: optical, tags: ['optical'] } - - { role: udisks, tags: ['udisks'] } - - { role: spell, tags: ['spell'] } - - { role: browsers, tags: ['browsers'] } - - { role: yubikey, tags: ['yubikey'] } - - { role: media, tags: ['media'] } - - { role: mpd, tags: ['mpd'] } - - { role: mpv, tags: ['mpv'] } - - { role: pianobar, tags: ['pianobar'] } - - { role: laptop, tags: ['laptop'] } - - { role: thinkpad, tags: ['thinkpad'], when: "'ThinkPad' in ansible_product_version" } - - { role: macbook, tags: ['macbook'], when: "'MacBook' in ansible_product_name" } - - { role: backlight, tags: ['backlight'] } - - { role: screensaver, tags: ['screensaver'] } - - { role: weechat, tags: ['weechat'] } - - { role: git-annex, tags: ['git-annex'], when: "gitannex is defined" } - - { role: taskwarrior, tags: ['taskwarrior'] } - - { role: ledger, tags: ['ledger'] } - - { role: mail, tags: ['mail'] } - - { role: goimapnotify, tags: ['goimapnotify'] } - - { role: cups, tags: ['cups'] } - - { role: office, tags: ['office'] } - - { role: visidata, tags: ['visidata'] } - - { role: pdf, tags: ['pdf'] } - - { role: dictd, tags: ['dictd'] } - - { role: redshift, tags: ['redshift'] } - - { role: transmission, tags: ['transmission'] } - - { role: libvirt, tags: ['libvirt'] } - - { role: virtualbox, tags: ['virtualbox'] } - - { role: virtualenv, tags: ['virtualenv'] } - - { role: backitup, tags: ['backitup'] } - - { role: cryptshot, tags: ['cryptshot'], when: "cryptshot is defined" } - - { role: borg, tags: ['borg'] } - - { role: tarsnap, tags: ['tarsnap'] } - - { role: mapping, tags: ['mapping'] } - - { role: sound, tags: ['sound'] } - - { role: pim, tags: ['pim'] } - - { role: postgresql, tags: ['postgresql'] } - - { role: calibre, tags: ['calibre'] } - - { role: aws, tags: ['aws'] } - - { role: parcimonie, tags: ['parcimonie'], when: "tor is defined" } - - { role: localtime, tags: ['localtime'], when: "localtime is defined" } - - { role: wormhole, tags: ['wormhole'] } - - { role: bluetooth, tags: ['bluetooth'], when: "bluetooth is defined" } - - { role: wttr, tags: ['wttr'] } - - { role: hostsctl, tags: ['hostsctl'], when: "hostsctl is defined" } - - { role: himawaripy, tags: ['himawaripy'], when: "himawaripy is defined" } - - { role: goesimage, tags: ['goesimage'], when: "goesimage is defined" } - - { role: syncthing, tags: ['syncthing'], when: "syncthing is defined" } - - { role: mirrorlist, tags: ['mirrorlist'], when: "mirrorlist is defined" } - - { role: pkgfile, tags: ['pkgfile'], when: "pkgfile is defined" } - - { role: units, tags: ['units'], when: "units is defined" } - - { role: logitech, tags: ['logitech'] } - - { role: pydev, tags: ['pydev'] } - - { role: aria2, tags: ['aria2'] } - - { role: signal, tags: ['signal'] } - - { role: android, tags: ['android'] } - - { role: ripgrep, tags: ['ripgrep'] } - - { role: bat, tags: ['bat'] } - - { role: zeal, tags: ['zeal'] } - - { role: kdeconnect, tags: ['kdeconnect'] } - - { role: oomd, tags: ['oomd'] } - - { role: f3, tags: ['f3'] } - - { role: vopono, tags: ['vopono'] } + - { role: base, tags: ["base"] } + - { role: grub, tags: ["grub"], when: "bootloader == 'grub'" } + - { role: gnupg, tags: ["gnupg"] } + - { role: sysmon, tags: ["sysmon"] } + - { role: cron, tags: ["cron"] } + - { role: microcode, tags: ["microcode"] } + - { role: hardened, tags: ["hardened"] } + - { role: ssh, tags: ["ssh"] } + - { role: dotfiles, tags: ["dotfiles"] } + - { role: ssd, tags: ["ssd"] } + - { role: interception, tags: ["interception"], when: "interception is defined" } + - { role: fonts, tags: ["fonts"] } + - { role: x, tags: ["x"] } + - { role: terminal, tags: ["terminal"], when: "terminal is defined" } + - { role: lightdm, tags: ["lightdm"], when: "display_manager == 'lightdm'" } + - { role: gdm, tags: ["gdm"], when: "display_manager == 'gdm'" } + - { role: i3, tags: ["i3"], when: "desktop_environment == 'i3'" } + - { role: gnome, tags: ["gnome"], when: "desktop_environment == 'gnome'" } + - { role: pass, tags: ["pass"] } + - { role: iptables, tags: ["iptables"] } + - { role: nettools, tags: ["nettools"] } + - { role: regdomain, tags: ["regdomain"], when: "regdomain is defined" } + - { role: openvpn, tags: ["openvpn"] } + - { role: nmtrust, tags: ["nmtrust"] } + - { role: unbound, tags: ["unbound"] } + - { role: openresolv, tags: ["openresolv"] } + - { role: networkmanager, tags: ["networkmanager"] } + - { role: ntp, tags: ["ntp"] } + - { role: firejail, tags: ["firejail"] } + - { role: tor, tags: ["tor"], when: "tor is defined" } + - { role: editors, tags: ["editors"] } + - { role: filesystems, tags: ["filesystems"] } + - { role: archive, tags: ["archive"] } + - { role: optical, tags: ["optical"] } + - { role: udisks, tags: ["udisks"] } + - { role: spell, tags: ["spell"] } + - { role: browsers, tags: ["browsers"] } + - { role: yubikey, tags: ["yubikey"] } + - { role: media, tags: ["media"] } + - { role: mpd, tags: ["mpd"] } + - { role: mpv, tags: ["mpv"] } + - { role: pianobar, tags: ["pianobar"] } + - { role: laptop, tags: ["laptop"] } + - { role: thinkpad, tags: ["thinkpad"], when: "'ThinkPad' in ansible_product_version" } + - { role: macbook, tags: ["macbook"], when: "'MacBook' in ansible_product_name" } + - { role: backlight, tags: ["backlight"] } + - { role: screensaver, tags: ["screensaver"] } + - { role: weechat, tags: ["weechat"] } + - { role: gitannex, tags: ["gitannex"], when: "gitannex is defined" } + - { role: taskwarrior, tags: ["taskwarrior"] } + - { role: ledger, tags: ["ledger"] } + - { role: mail, tags: ["mail"] } + - { role: goimapnotify, tags: ["goimapnotify"] } + - { role: cups, tags: ["cups"] } + - { role: office, tags: ["office"] } + - { role: visidata, tags: ["visidata"] } + - { role: pdf, tags: ["pdf"] } + - { role: dictd, tags: ["dictd"] } + - { role: redshift, tags: ["redshift"] } + - { role: transmission, tags: ["transmission"] } + - { role: libvirt, tags: ["libvirt"] } + - { role: virtualbox, tags: ["virtualbox"] } + - { role: virtualenv, tags: ["virtualenv"] } + - { role: backitup, tags: ["backitup"] } + - { role: cryptshot, tags: ["cryptshot"], when: "cryptshot is defined" } + - { role: borg, tags: ["borg"] } + - { role: tarsnap, tags: ["tarsnap"] } + - { role: mapping, tags: ["mapping"] } + - { role: sound, tags: ["sound"] } + - { role: pim, tags: ["pim"] } + - { role: postgresql, tags: ["postgresql"] } + - { role: calibre, tags: ["calibre"] } + - { role: aws, tags: ["aws"] } + - { role: parcimonie, tags: ["parcimonie"], when: "tor is defined" } + - { role: localtime, tags: ["localtime"], when: "localtime is defined" } + - { role: wormhole, tags: ["wormhole"] } + - { role: bluetooth, tags: ["bluetooth"], when: "bluetooth is defined" } + - { role: wttr, tags: ["wttr"] } + - { role: hostsctl, tags: ["hostsctl"], when: "hostsctl is defined" } + - { role: himawaripy, tags: ["himawaripy"], when: "himawaripy is defined" } + - { role: goesimage, tags: ["goesimage"], when: "goesimage is defined" } + - { role: syncthing, tags: ["syncthing"], when: "syncthing is defined" } + - { role: mirrorlist, tags: ["mirrorlist"], when: "mirrorlist is defined" } + - { role: pkgfile, tags: ["pkgfile"], when: "pkgfile is defined" } + - { role: units, tags: ["units"], when: "units is defined" } + - { role: logitech, tags: ["logitech"] } + - { role: pydev, tags: ["pydev"] } + - { role: aria2, tags: ["aria2"] } + - { role: signal, tags: ["signal"] } + - { role: android, tags: ["android"] } + - { role: ripgrep, tags: ["ripgrep"] } + - { role: bat, tags: ["bat"] } + - { role: zeal, tags: ["zeal"] } + - { role: kdeconnect, tags: ["kdeconnect"] } + - { role: oomd, tags: ["oomd"] } + - { role: f3, tags: ["f3"] } + - { role: vopono, tags: ["vopono"] } vars_prompt: - name: user_password prompt: "Enter desired user password" diff --git a/requirements.yml b/requirements.yml index 052506b..369c0c9 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,2 +1,3 @@ +--- collections: - name: kewlfft.aur diff --git a/roles/android/tasks/main.yml b/roles/android/tasks/main.yml index 1af980a..3705d2c 100644 --- a/roles/android/tasks/main.yml +++ b/roles/android/tasks/main.yml @@ -1,18 +1,18 @@ --- - name: Install android-tools - pacman: + community.general.pacman: name: android-tools state: present - name: Install android-udev - pacman: + community.general.pacman: name: android-udev state: present -- name: Add {{ user.name }} to adbusers group - user: - name: "{{ user.name }}" - groups: adbusers - append: yes +- name: "Add user to adbusers group: {{ user.name }}" + ansible.builtin.user: + name: "{{ user.name }}" + groups: adbusers + append: true tags: - user diff --git a/roles/archive/tasks/main.yml b/roles/archive/tasks/main.yml index 5250e91..3da9655 100644 --- a/roles/archive/tasks/main.yml +++ b/roles/archive/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install zip archive utilities - pacman: + community.general.pacman: name: - zip - unzip @@ -10,49 +10,49 @@ - zip - name: Install unrar - pacman: + community.general.pacman: name: unrar state: present tags: - unrar - name: Install atool - pacman: + community.general.pacman: name: atool state: present tags: - atool - name: Install par2cmdline - pacman: + community.general.pacman: name: par2cmdline state: present tags: - par2 - name: Install ddrescue - pacman: + community.general.pacman: name: ddrescue state: present tags: - ddrescue - name: Install lesspipe - pacman: + community.general.pacman: name: lesspipe state: present tags: - lesspipe - name: Install libisoburn - pacman: + community.general.pacman: name: libisoburn state: present tags: - libisoburn - name: Install pigz - pacman: + community.general.pacman: name: pigz state: present tags: @@ -61,7 +61,7 @@ - name: Install ventoy kewlfft.aur.aur: name: ventoy-bin - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/aria2/tasks/main.yml b/roles/aria2/tasks/main.yml index 0a86167..3643359 100644 --- a/roles/aria2/tasks/main.yml +++ b/roles/aria2/tasks/main.yml @@ -1,11 +1,11 @@ --- - name: Install aria2 - pacman: + community.general.pacman: name: aria2 state: present - name: Jail aria2 - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/aria2c state: link diff --git a/roles/aws/tasks/main.yml b/roles/aws/tasks/main.yml index d668e8f..cd7bde5 100644 --- a/roles/aws/tasks/main.yml +++ b/roles/aws/tasks/main.yml @@ -1,5 +1,7 @@ --- - name: Install aws-cli - pacman: name=aws-cli state=present + community.general.pacman: + name: aws-cli + state: present tags: - aws-cli diff --git a/roles/backitup/tasks/main.yml b/roles/backitup/tasks/main.yml index b1a7953..5427bee 100644 --- a/roles/backitup/tasks/main.yml +++ b/roles/backitup/tasks/main.yml @@ -1,3 +1,6 @@ --- - name: Install backitup - copy: src=backitup/backitup.sh dest=/usr/local/bin/backitup mode=0755 + ansible.builtin.copy: + src: backitup/backitup.sh + dest: /usr/local/bin/backitup + mode: "0755" diff --git a/roles/backlight/handlers/main.yml b/roles/backlight/handlers/main.yml index fc1b962..8c695c9 100644 --- a/roles/backlight/handlers/main.yml +++ b/roles/backlight/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: restart illuminanced - service: +- name: Restart illuminanced + ansible.builtin.service: name: illuminanced.service state: restarted diff --git a/roles/backlight/tasks/main.yml b/roles/backlight/tasks/main.yml index 1a127bc..ead03ff 100644 --- a/roles/backlight/tasks/main.yml +++ b/roles/backlight/tasks/main.yml @@ -1,57 +1,57 @@ --- - name: Install brightnessctl - pacman: + community.general.pacman: name: brightnessctl state: present - name: Install illuminanced - pacman: + community.general.pacman: name: illuminanced when: illuminanced is defined - name: Set max backlight file - lineinfile: + ansible.builtin.lineinfile: dest: /etc/illuminanced.toml regexp: ^max_backlight_file state: present line: 'max_backlight_file = "{{ illuminanced.max_backlight_file }}"' when: illuminanced.max_backlight_file is defined notify: - - restart illuminanced + - Restart illuminanced - name: Set backlight file - lineinfile: + ansible.builtin.lineinfile: dest: /etc/illuminanced.toml regexp: ^backlight_file state: present line: 'backlight_file = "{{ illuminanced.backlight_file }}"' when: illuminanced.backlight_file is defined notify: - - restart illuminanced + - Restart illuminanced - name: Set illuminance file - lineinfile: + ansible.builtin.lineinfile: dest: /etc/illuminanced.toml regexp: ^illuminance_file state: present line: 'illuminance_file = "{{ illuminanced.illuminance_file }}"' when: illuminanced.illuminance_file is defined notify: - - restart illuminanced + - Restart illuminanced - name: Set min backlight value - lineinfile: + ansible.builtin.lineinfile: dest: /etc/illuminanced.toml regexp: ^min_backlight state: present - line: 'min_backlight = {{ illuminanced.min_backlight }}' + line: "min_backlight = {{ illuminanced.min_backlight }}" when: illuminanced.min_backlight is defined notify: - - restart illuminanced + - Restart illuminanced - name: Enable and start illuminanced - service: + ansible.builtin.service: name: illuminanced.service - enabled: yes + enabled: true state: started when: illuminanced is defined diff --git a/roles/base/handlers/main.yml b/roles/base/handlers/main.yml index 0767911..eef476a 100644 --- a/roles/base/handlers/main.yml +++ b/roles/base/handlers/main.yml @@ -1,10 +1,10 @@ --- -- name: restart paccache - service: +- name: Restart paccache + ansible.builtin.service: name: paccache.timer state: restarted -- name: stop systemd per-user instance - service: +- name: Stop systemd per-user instance + ansible.builtin.service: name: "user@{{ user.uid }}" state: stopped diff --git a/roles/base/tasks/aur_user.yml b/roles/base/tasks/aur_user.yml index 3428a8d..ad89ac8 100644 --- a/roles/base/tasks/aur_user.yml +++ b/roles/base/tasks/aur_user.yml @@ -1,18 +1,18 @@ --- - name: Create AUR user - user: + ansible.builtin.user: name: "{{ aur.user }}" - create_home: yes + create_home: true group: wheel tags: - aur - name: Allow passwordless Pacman for AUR user - template: + ansible.builtin.template: src: sudo_aur.j2 dest: /etc/sudoers.d/11-aur - mode: 0644 - validate: 'visudo -cf %s' + mode: "0644" + validate: "visudo -cf %s" tags: - aur - sudo diff --git a/roles/base/tasks/journal.yml b/roles/base/tasks/journal.yml index 074b5fa..564118c 100644 --- a/roles/base/tasks/journal.yml +++ b/roles/base/tasks/journal.yml @@ -1,11 +1,17 @@ --- - name: Create journal config directory - file: path=/etc/systemd/journald.conf.d state=directory + ansible.builtin.file: + path: /etc/systemd/journald.conf.d + state: directory + mode: "0755" tags: - journal - name: Push journal max size config - template: src=00-journal-size.conf.j2 dest=/etc/systemd/journald.conf.d/00-journal-size.conf + ansible.builtin.template: + src: 00-journal-size.conf.j2 + dest: /etc/systemd/journald.conf.d/00-journal-size.conf + mode: "0644" when: journal is defined and journal.max_size is defined tags: - journal diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 044be04..8a40053 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -1,26 +1,33 @@ --- - name: Copy pacman configuration file - copy: + ansible.builtin.copy: src: pacman.conf dest: /etc/pacman.conf + mode: "0644" - name: Refresh pacman mirrors - pacman: - update_cache: yes + community.general.pacman: + update_cache: true - name: Install inetutils for hostname - pacman: - name: inetutils - state: present + community.general.pacman: + name: inetutils + state: present - name: Set the hostname - hostname: + ansible.builtin.hostname: name: "{{ hostname }}" when: hostname is defined -- include_tasks: user.yml -- include_tasks: sudo.yml -- include_tasks: aur_user.yml -- include_tasks: shell.yml -- include_tasks: packages.yml -- include_tasks: journal.yml +- name: Include user tasks + ansible.builtin.include_tasks: user.yml +- name: Include sudo tasks + ansible.builtin.include_tasks: sudo.yml +- name: Include AUR user tasks + ansible.builtin.include_tasks: aur_user.yml +- name: Include shell tasks + ansible.builtin.include_tasks: shell.yml +- name: Include packages tasks + ansible.builtin.include_tasks: packages.yml +- name: Include journal tasks + ansible.builtin.include_tasks: journal.yml diff --git a/roles/base/tasks/packages.yml b/roles/base/tasks/packages.yml index c5cec7d..8e9c499 100644 --- a/roles/base/tasks/packages.yml +++ b/roles/base/tasks/packages.yml @@ -1,19 +1,21 @@ --- - name: Install universal base packages - pacman: - name: "{{ base_packages }}" - state: present + community.general.pacman: + name: "{{ base_packages }}" + state: present tags: - packages - name: Create pacman hook directory - file: path=/etc/pacman.d/hooks - state=directory + ansible.builtin.file: + path: /etc/pacman.d/hooks + state: directory + mode: "0755" tags: - packages - name: Use all cores when compressing packages - lineinfile: + ansible.builtin.lineinfile: dest: /etc/makepkg.conf regexp: "^COMPRESSXZ" line: "COMPRESSXZ=(xz -c -z - --threads=0)" @@ -21,28 +23,37 @@ - name: Install AUR base packages kewlfft.aur.aur: name: "{{ aur.packages }}" - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - packages - name: Push pacman cache cleanup service - copy: src=paccache.service dest=/etc/systemd/system/paccache.service + ansible.builtin.copy: + src: paccache.service + dest: /etc/systemd/system/paccache.service + mode: "0644" notify: - - reload systemd config + - Reload systemd config tags: - packages - name: Push pacman cache cleanup timer - copy: src=paccache.timer dest=/etc/systemd/system/paccache.timer + ansible.builtin.copy: + src: paccache.timer + dest: /etc/systemd/system/paccache.timer + mode: "0644" notify: - - reload systemd config - - restart paccache + - Reload systemd config + - Restart paccache tags: - packages - name: Enable and start pacman cache cleanup timer - service: name=paccache.timer enabled=yes state=started + ansible.builtin.service: + name: paccache.timer + enabled: true + state: started tags: - packages diff --git a/roles/base/tasks/shell.yml b/roles/base/tasks/shell.yml index 7277042..bccc76f 100644 --- a/roles/base/tasks/shell.yml +++ b/roles/base/tasks/shell.yml @@ -1,6 +1,6 @@ --- - name: Install Bash - pacman: + community.general.pacman: name: - bash - bash-completion @@ -9,7 +9,7 @@ - shell - name: Install ZSH - pacman: + community.general.pacman: name: - zsh - zsh-completions @@ -18,7 +18,7 @@ - shell - name: Install Starship - pacman: + community.general.pacman: name: - ttf-nerd-fonts-symbols-mono - starship @@ -29,7 +29,7 @@ - name: Install zsh-antidote kewlfft.aur.aur: name: zsh-antidote - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/base/tasks/sudo.yml b/roles/base/tasks/sudo.yml index c22b760..e7afa35 100644 --- a/roles/base/tasks/sudo.yml +++ b/roles/base/tasks/sudo.yml @@ -1,25 +1,25 @@ --- - name: Install sudo - pacman: + community.general.pacman: name: sudo state: present tags: - sudo - name: Add user to wheel group - user: + ansible.builtin.user: name: "{{ user.name }}" groups: wheel - append: yes + append: true tags: - sudo - user - name: Copy sudo wheel group configuration - template: + ansible.builtin.template: src: sudo_wheel.j2 dest: /etc/sudoers.d/01_wheel - mode: 440 - validate: 'visudo -cf %s' + mode: "0440" + validate: "visudo -cf %s" tags: - sudo diff --git a/roles/base/tasks/user.yml b/roles/base/tasks/user.yml index 912d605..7581108 100644 --- a/roles/base/tasks/user.yml +++ b/roles/base/tasks/user.yml @@ -1,6 +1,6 @@ --- - name: Create user group - group: + ansible.builtin.group: name: "{{ user.group }}" gid: "{{ user.gid }}" state: present @@ -8,55 +8,57 @@ - user - name: Create user and assign to group - user: + ansible.builtin.user: name: "{{ user.name }}" group: "{{ user.group }}" - password: "{{ user_password|password_hash('sha512') }}" + password: "{{ user_password | password_hash('sha512') }}" shell: "{{ user.shell }}" update_password: on_create uid: "{{ user.uid }}" groups: uucp - append: yes + append: true tags: - user - name: Create user log dir - file: + ansible.builtin.file: path: /home/{{ user.name }}/{{ user.log.dir }} state: directory owner: "{{ user.name }}" group: "{{ user.group }}" + mode: "0755" when: user.log.dir is defined tags: - user - name: Install logrotate - pacman: - name: logrotate - state: present + community.general.pacman: + name: logrotate + state: present - name: Push logrotate config for user logs - template: + ansible.builtin.template: src: logrotate.j2 dest: /etc/logrotate.d/user + mode: "0644" when: user.log.dir is defined tags: - user - name: Create user socket directory - file: + ansible.builtin.file: path: /run/user/{{ user.uid }} state: directory owner: "{{ user.name }}" group: "{{ user.group }}" - mode: 0700 + mode: "0700" tags: - user - name: Start user systemd instance - service: + ansible.builtin.service: name: "user@{{ user.uid }}" state: started - notify: stop systemd per-user instance + notify: Stop systemd per-user instance tags: - user diff --git a/roles/bat/tasks/main.yml b/roles/bat/tasks/main.yml index 6e2cf00..cf944e0 100644 --- a/roles/bat/tasks/main.yml +++ b/roles/bat/tasks/main.yml @@ -1,10 +1,10 @@ --- - name: Install bat - pacman: + community.general.pacman: name: bat state: present - name: Install bat-extras - pacman: + community.general.pacman: name: bat-extras state: present diff --git a/roles/bitlbee/handlers/main.yml b/roles/bitlbee/handlers/main.yml index bae4e21..777bf5b 100644 --- a/roles/bitlbee/handlers/main.yml +++ b/roles/bitlbee/handlers/main.yml @@ -1,3 +1,5 @@ --- -- name: restart bitlbee - service: name=bitlbee state=restarted +- name: Restart bitlbee + ansible.builtin.service: + name: bitlbee + state: restarted diff --git a/roles/bitlbee/tasks/main.yml b/roles/bitlbee/tasks/main.yml index 880fb85..cdb5a83 100644 --- a/roles/bitlbee/tasks/main.yml +++ b/roles/bitlbee/tasks/main.yml @@ -1,46 +1,50 @@ --- - name: Install libOTR - pacman: + community.general.pacman: name: libotr state: present - name: Install Bitlbee kewlfft.aur.aur: name: bitlbee - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Push Bitlbee configuration file - template: + ansible.builtin.template: src: bitlbee.conf.j2 dest: /etc/bitlbee/bitlbee.conf + mode: "0644" - name: Ensure proper ownership of configuration directory - file: + ansible.builtin.file: path: /var/lib/bitlbee group: bitlbee owner: bitlbee - name: Create Bitlbee systemd unit file directory - file: + ansible.builtin.file: path: /etc/systemd/system/bitlbee.service.d state: directory + mode: "0755" tags: - firejail - name: Push Bitlbee socket unit file - copy: + ansible.builtin.copy: src: bitlbee-service-override.conf dest: /etc/systemd/system/bitlbee.service.d/override.conf + mode: "0644" notify: - - reload systemd config - - restart bitlbee + - Reload systemd config + - Restart bitlbee tags: - firejail -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: bitlbee.service - run_on: "{{ bitlbee.run_on }}" + unit: bitlbee.service + run_on: "{{ bitlbee.run_on }}" diff --git a/roles/bluetooth/tasks/main.yml b/roles/bluetooth/tasks/main.yml index 0f7eff3..1d2ba3b 100644 --- a/roles/bluetooth/tasks/main.yml +++ b/roles/bluetooth/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install bluetooth libraries and tools - pacman: + community.general.pacman: name: - bluez - bluez-libs @@ -8,38 +8,38 @@ - blueman state: present notify: - - restart pulse as user + - Restart pulse as user - name: Do not auto power on the bluetooth device - lineinfile: + ansible.builtin.lineinfile: dest: /etc/bluetooth/main.conf state: present line: "AutoEnable=false" - name: Unblock the bluetooth service - service: + ansible.builtin.service: name: rfkill-block@bluetooth.service - enabled: no + enabled: false state: stopped - when: bluetooth.disable == False + when: not bluetooth.disable - name: Enable and start the bluetooth service - service: + ansible.builtin.service: name: bluetooth.service - enabled: yes + enabled: true state: started - when: bluetooth.disable == False + when: not bluetooth.disable - name: Disable and stop the bluetooth service - service: + ansible.builtin.service: name: bluetooth.service - enabled: no + enabled: false state: stopped - when: bluetooth.disable == True + when: bluetooth.disable - name: Block the bluetooth service - service: + ansible.builtin.service: name: rfkill-block@bluetooth.service - enabled: yes + enabled: true state: started - when: bluetooth.disable == True + when: bluetooth.disable diff --git a/roles/borg/tasks/main.yml b/roles/borg/tasks/main.yml index f3e3337..ec1fb69 100644 --- a/roles/borg/tasks/main.yml +++ b/roles/borg/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install borg - pacman: + community.general.pacman: name: - python-llfuse - borg diff --git a/roles/browsers/tasks/main.yml b/roles/browsers/tasks/main.yml index 98264af..b1cf25c 100644 --- a/roles/browsers/tasks/main.yml +++ b/roles/browsers/tasks/main.yml @@ -1,23 +1,23 @@ --- - name: Install w3m - pacman: + community.general.pacman: name: w3m state: present - name: Install lynx - pacman: + community.general.pacman: name: lynx state: present - name: Install Firefox - pacman: + community.general.pacman: name: firefox state: present tags: - firefox - name: Jail Firefox - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/firefox state: link @@ -26,16 +26,17 @@ - firejail - name: Verify Firefox firejail local profile exists - copy: + ansible.builtin.copy: content: "" dest: /etc/firejail/firefox.local force: false + mode: "0644" tags: - firefox - firejail - name: Restrict Firefox access to /etc - lineinfile: + ansible.builtin.lineinfile: dest: /etc/firejail/firefox.local regexp: "^private-etc" line: "private-etc firejail,passwd,group,hostname,hosts,nsswitch.conf,resolv.conf,gtk-2.0,gtk-3.0,fonts,mime.types,asound.conf,pulse,localtime" @@ -44,14 +45,14 @@ - firejail - name: Install Chromium - pacman: + community.general.pacman: name: chromium state: present tags: - chromium - name: Jail Chromium - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/chromium state: link @@ -60,16 +61,17 @@ - firejail - name: Verify Chromium firejail local profile exists - copy: + ansible.builtin.copy: content: "" dest: /etc/firejail/chromium.local force: false + mode: "0644" tags: - chromium - firejail - name: Restrict Chromium access to /etc - lineinfile: + ansible.builtin.lineinfile: dest: /etc/firejail/chromium.local regexp: "^private-etc" line: "private-etc firejail,passwd,group,hostname,hosts,nsswitch.conf,resolv.conf,gtk-2.0,gtk-3.0,fonts,mime.types,asound.conf,pulse,localtime" @@ -78,14 +80,14 @@ - firejail - name: Install Tor browser - pacman: + community.general.pacman: name: torbrowser-launcher state: present tags: - tor-browser - name: Jail Tor browser - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/torbrowser-launcher state: link @@ -94,7 +96,7 @@ - firejail - name: Install qutebrowser and dependencies - pacman: + community.general.pacman: name: - qutebrowser - python-adblock @@ -104,7 +106,7 @@ - qutebrowser - name: Jail qutebrowser - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/qutebrowser state: link @@ -113,52 +115,55 @@ - firejail - name: Push rofi browser chooser - template: + ansible.builtin.template: src: browser.sh.j2 dest: /usr/local/bin/browser - mode: 0755 + mode: "0755" tags: - rofi - chooser - name: Create local desktop application dir - file: + ansible.builtin.file: path: /usr/local/share/applications state: directory + mode: "0755" tags: - rofi - chooser - name: Push rofi browser chooser desktop file - copy: + ansible.builtin.copy: src: browser.desktop dest: /usr/local/share/applications/browser.desktop + mode: "0644" tags: - rofi - chooser - name: Verify mimeapps.list exists - copy: + ansible.builtin.copy: content: "" dest: /etc/xdg/mimeapps.list force: false + mode: "0644" tags: - rofi - chooser - name: Set rofi browser chooser as default application for relevant mimetypes - lineinfile: + ansible.builtin.lineinfile: dest: /etc/xdg/mimeapps.list regexp: "{{ item.regexp }}" line: "{{ item.line }}" with_items: - - { regexp: '^text/html=', line: 'text/html=browser.desktop' } - - { regexp: '^text/xml=', line: 'text/xml=browser.desktop' } - - { regexp: '^text/mml=', line: 'text/mml=browser.desktop' } - - { regexp: '^application/xhtml\+xml=', line: 'application/xhtml+xml=browser.desktop' } - - { regexp: '^application/xml=', line: 'application/xml=browser.desktop' } - - { regexp: '^x-scheme-handler/http=', line: 'x-scheme-handler/http=browser.desktop' } - - { regexp: '^x-scheme-handler/https=', line: 'x-scheme-handler/https=browser.desktop' } + - { regexp: "^text/html=", line: "text/html=browser.desktop" } + - { regexp: "^text/xml=", line: "text/xml=browser.desktop" } + - { regexp: "^text/mml=", line: "text/mml=browser.desktop" } + - { regexp: "^application/xhtml\\+xml=", line: "application/xhtml+xml=browser.desktop" } + - { regexp: "^application/xml=", line: "application/xml=browser.desktop" } + - { regexp: "^x-scheme-handler/http=", line: "x-scheme-handler/http=browser.desktop" } + - { regexp: "^x-scheme-handler/https=", line: "x-scheme-handler/https=browser.desktop" } tags: - rofi - chooser diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 887dd1a..c26f2e1 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -1,25 +1,29 @@ --- - name: Install calibre - pacman: name=calibre state=present + community.general.pacman: + name: calibre + state: present - name: Jail calibre - file: src=/usr/bin/firejail - dest=/usr/local/bin/calibre - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/calibre + state: link tags: - firejail - name: Jail ebook-viewer - file: src=/usr/bin/firejail - dest=/usr/local/bin/ebook-viewer - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/ebook-viewer + state: link tags: - firejail - name: Install libgourou kewlfft.aur.aur: name: gourou - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/clipboard/tasks/main.yml b/roles/clipboard/tasks/main.yml index db0b8ab..787b23b 100644 --- a/roles/clipboard/tasks/main.yml +++ b/roles/clipboard/tasks/main.yml @@ -1,24 +1,25 @@ --- -- name: install greenclip from AUR +- name: Install greenclip from AUR kewlfft.aur.aur: name: rofi-greenclip - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur -- name: copy greenclip.service - copy: +- name: Copy greenclip.service + ansible.builtin.copy: src: greenclip.service dest: /etc/systemd/user/greenclip.service + mode: "0644" - name: Enable greenclip.service - systemd: + ansible.builtin.systemd: name: greenclip.service scope: user - enabled: yes + enabled: true state: started - become: yes + become: true become_user: "{{ user.name }}" environment: XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}" diff --git a/roles/cron/handlers/main.yml b/roles/cron/handlers/main.yml index 9ab0f19..910706e 100644 --- a/roles/cron/handlers/main.yml +++ b/roles/cron/handlers/main.yml @@ -1,3 +1,5 @@ --- -- name: restart cron - service: name=cronie.service state=restarted +- name: Restart cron + ansible.builtin.service: + name: cronie.service + state: restarted diff --git a/roles/cron/tasks/main.yml b/roles/cron/tasks/main.yml index 5ec31f6..e6cd0d8 100644 --- a/roles/cron/tasks/main.yml +++ b/roles/cron/tasks/main.yml @@ -1,6 +1,11 @@ --- - name: Install cronie - pacman: name=cronie state=present + community.general.pacman: + name: cronie + state: present - name: Enable cronie - service: name=cronie.service enabled=yes state=started + ansible.builtin.service: + name: cronie.service + enabled: true + state: started diff --git a/roles/cryptshot/handlers/main.yml b/roles/cryptshot/handlers/main.yml index fa7ca91..279b4d0 100644 --- a/roles/cryptshot/handlers/main.yml +++ b/roles/cryptshot/handlers/main.yml @@ -1,3 +1,5 @@ --- -- name: restart cryptshot - service: name=cryptshot.timer state=restarted +- name: Restart cryptshot + ansible.builtin.service: + name: cryptshot.timer + state: restarted diff --git a/roles/cryptshot/tasks/config.yml b/roles/cryptshot/tasks/config.yml index ed443c4..d7cc0a8 100644 --- a/roles/cryptshot/tasks/config.yml +++ b/roles/cryptshot/tasks/config.yml @@ -1,6 +1,12 @@ --- -- name: Push {{ target.name }} rsnapshot config - template: src=rsnapshot.conf.j2 dest=/usr/local/etc/rsnapshot/{{ target.name }}.conf +- name: "Push rsnapshot config: {{ target.name }}" + ansible.builtin.template: + src: rsnapshot.conf.j2 + dest: /usr/local/etc/rsnapshot/{{ target.name }}.conf + mode: "0644" -- name: Push {{ target.name }} cryptshot config - template: src=cryptshot.conf.j2 dest=/usr/local/etc/cryptshot/{{ target.name }}.conf +- name: "Push cryptshot config: {{ target.name }}" + ansible.builtin.template: + src: cryptshot.conf.j2 + dest: /usr/local/etc/cryptshot/{{ target.name }}.conf + mode: "0644" diff --git a/roles/cryptshot/tasks/main.yml b/roles/cryptshot/tasks/main.yml index 7bfa797..d99b82f 100644 --- a/roles/cryptshot/tasks/main.yml +++ b/roles/cryptshot/tasks/main.yml @@ -1,37 +1,64 @@ --- - name: Install rsnapshot - pacman: name=rsnapshot state=present + community.general.pacman: + name: rsnapshot + state: present - name: Install cryptshot.sh script - copy: src=cryptshot/cryptshot.sh dest=/usr/local/bin/cryptshot mode=0755 + ansible.builtin.copy: + src: cryptshot/cryptshot.sh + dest: /usr/local/bin/cryptshot + mode: "0755" - name: Create rsnapshot config directory - file: path=/usr/local/etc/rsnapshot state=directory + ansible.builtin.file: + path: /usr/local/etc/rsnapshot + state: directory + mode: "0755" - name: Create cryptshot config directory - file: path=/usr/local/etc/cryptshot state=directory + ansible.builtin.file: + path: /usr/local/etc/cryptshot + state: directory + mode: "0755" - name: Create cryptshot last run directory - file: path=/usr/local/etc/cryptshot/lastrun state=directory + ansible.builtin.file: + path: /usr/local/etc/cryptshot/lastrun + state: directory + mode: "0755" -- include_tasks: config.yml +- name: Include cryptshot config tasks + ansible.builtin.include_tasks: config.yml with_items: "{{ cryptshot }}" loop_control: loop_var: target - name: Push cryptshot execution script - template: src=cryptshot.sh.j2 dest=/usr/local/bin/cryptshot-execute mode=0755 + ansible.builtin.template: + src: cryptshot.sh.j2 + dest: /usr/local/bin/cryptshot-execute + mode: "0755" - name: Push cryptshot service file - template: src=cryptshot.service.j2 dest=/etc/systemd/system/cryptshot.service + ansible.builtin.template: + src: cryptshot.service.j2 + dest: /etc/systemd/system/cryptshot.service + mode: "0644" notify: - - reload systemd config + - Reload systemd config - name: Push cryptshot timer file - template: src=cryptshot.timer.j2 dest=/etc/systemd/system/cryptshot.timer + ansible.builtin.template: + src: cryptshot.timer.j2 + dest: /etc/systemd/system/cryptshot.timer + mode: "0644" notify: - - reload systemd config - - restart cryptshot + - Reload systemd config + - Restart cryptshot - name: Enable and start cryptshot timer - service: name=cryptshot.timer enabled=yes state=started + ansible.builtin.service: + name: cryptshot.timer + enabled: true + state: started diff --git a/roles/cups/handlers/main.yml b/roles/cups/handlers/main.yml index 3c99a7b..71e5cac 100644 --- a/roles/cups/handlers/main.yml +++ b/roles/cups/handlers/main.yml @@ -1,3 +1,5 @@ --- -- name: restart cups - service: name=cups.service state=restarted +- name: Restart cups + ansible.builtin.service: + name: cups.service + state: restarted diff --git a/roles/cups/tasks/main.yml b/roles/cups/tasks/main.yml index a225e37..2d352fa 100644 --- a/roles/cups/tasks/main.yml +++ b/roles/cups/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install CUPS and drivers - pacman: + community.general.pacman: name: - ghostscript - gsfonts @@ -11,29 +11,29 @@ state: present - name: Add a print admin group - group: + ansible.builtin.group: name: printadmin state: present - name: Allow the print admin group to administer CUPS - lineinfile: + ansible.builtin.lineinfile: dest: /etc/cups/cups-files.conf regexp: SystemGroup state: present line: "SystemGroup sys root printadmin" notify: - - restart cups + - Restart cups - name: Add the user to the print and print admin groups - user: + ansible.builtin.user: name: "{{ user.name }}" groups: printadmin,lp - append: yes + append: true tags: - user - name: Enable and start CUPS - service: + ansible.builtin.service: name: cups.service - enabled: yes + enabled: true state: started diff --git a/roles/dconf/handlers/main.yml b/roles/dconf/handlers/main.yml index f3a39ca..08d8f0d 100644 --- a/roles/dconf/handlers/main.yml +++ b/roles/dconf/handlers/main.yml @@ -1,3 +1,4 @@ --- -- name: update DConf database - command: dconf update +- name: Update DConf database + ansible.builtin.command: dconf update + changed_when: false diff --git a/roles/dconf/tasks/main.yml b/roles/dconf/tasks/main.yml index fd2993b..8d920e2 100644 --- a/roles/dconf/tasks/main.yml +++ b/roles/dconf/tasks/main.yml @@ -1,6 +1,14 @@ --- - name: Creating DConf database directory - file: path=/etc/dconf/db state=directory mode=0755 recurse=yes + ansible.builtin.file: + path: /etc/dconf/db + state: directory + mode: "0755" + recurse: true - name: Creating DConf profile directory - file: path=/etc/dconf/profile state=directory mode=0755 recurse=yes \ No newline at end of file + ansible.builtin.file: + path: /etc/dconf/profile + state: directory + mode: "0755" + recurse: true diff --git a/roles/dictd/tasks/main.yml b/roles/dictd/tasks/main.yml index b1fdfeb..6513108 100644 --- a/roles/dictd/tasks/main.yml +++ b/roles/dictd/tasks/main.yml @@ -1,11 +1,11 @@ --- - name: Install dictd - pacman: + community.general.pacman: name: dictd state: present - name: Install flex - pacman: + community.general.pacman: name: flex state: present @@ -13,8 +13,8 @@ kewlfft.aur.aur: name: dict-gcide use: makepkg - skip_pgp_check: yes - become: yes + skip_pgp_check: true + become: true become_user: "{{ aur.user }}" tags: - aur @@ -22,7 +22,7 @@ - name: Install WordNet database kewlfft.aur.aur: name: wordnet-dictd - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur @@ -30,13 +30,13 @@ - name: Install Moby thesaurus kewlfft.aur.aur: name: dict-moby-thesaurus - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Enable and start dictd - service: + ansible.builtin.service: name: dictd.service - enabled: yes + enabled: true state: started diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml index c9bc39c..70a07ee 100644 --- a/roles/dotfiles/tasks/main.yml +++ b/roles/dotfiles/tasks/main.yml @@ -2,24 +2,25 @@ - name: Install rcm kewlfft.aur.aur: name: rcm - become: yes + become: true become_user: "{{ aur.user }}" when: dotfiles is defined tags: - aur -- name: Clone user dotfiles - git: +- name: Clone user dotfiles # noqa: latest[git] + ansible.builtin.git: repo: "{{ dotfiles.url }}" dest: /home/{{ user.name }}/{{ dotfiles.destination }} - accept_hostkey: yes - update: no + accept_hostkey: true + update: false when: dotfiles is defined - become: yes + become: true become_user: "{{ user.name }}" - name: Install user dotfiles - command: rcup -d /home/{{ user.name}}/{{ dotfiles.destination}} {{ dotfiles.rcup_flags }} + ansible.builtin.command: rcup -d /home/{{ user.name }}/{{ dotfiles.destination }} {{ dotfiles.rcup_flags }} when: dotfiles is defined - become: yes + become: true become_user: "{{ user.name }}" + changed_when: true diff --git a/roles/dvorak/tasks/main.yml b/roles/dvorak/tasks/main.yml index a850def..857100e 100644 --- a/roles/dvorak/tasks/main.yml +++ b/roles/dvorak/tasks/main.yml @@ -1,14 +1,19 @@ --- - name: Enable dvorak for XOrg libinput - template: + ansible.builtin.template: src: 40-libinput-dvorak.conf.j2 dest: /etc/X11/xorg.conf.d/40-libinput-dvorak.conf + mode: "0644" - name: Add control-caps dvorak keymap - copy: src=dvorak-cc.map.gz dest=/usr/share/kbd/keymaps/i386/dvorak/dvorak-cc.map.gz + ansible.builtin.copy: + src: dvorak-cc.map.gz + dest: /usr/share/kbd/keymaps/i386/dvorak/dvorak-cc.map.gz + mode: "0644" - name: Enable dvorak-cc for vconsole - lineinfile: "dest=/etc/vconsole.conf - regexp=^KEYMAP= - state=present - line='KEYMAP=dvorak-cc'" + ansible.builtin.lineinfile: + dest: /etc/vconsole.conf + regexp: ^KEYMAP= + state: present + line: "KEYMAP=dvorak-cc" diff --git a/roles/editors/tasks/main.yml b/roles/editors/tasks/main.yml index d24d967..29784e2 100644 --- a/roles/editors/tasks/main.yml +++ b/roles/editors/tasks/main.yml @@ -1,5 +1,5 @@ --- - name: Install editors - pacman: + community.general.pacman: name: "{{ editors }}" state: present diff --git a/roles/f3/tasks/main.yml b/roles/f3/tasks/main.yml index 8730966..fcfbfda 100644 --- a/roles/f3/tasks/main.yml +++ b/roles/f3/tasks/main.yml @@ -3,8 +3,8 @@ kewlfft.aur.aur: name: f3 use: makepkg - skip_pgp_check: yes - become: yes + skip_pgp_check: true + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/filesystems/tasks/main.yml b/roles/filesystems/tasks/main.yml index 64984f4..c719908 100644 --- a/roles/filesystems/tasks/main.yml +++ b/roles/filesystems/tasks/main.yml @@ -1,5 +1,5 @@ --- - name: Install filesystem packages - pacman: + community.general.pacman: name: "{{ filesystem_packages }}" state: present diff --git a/roles/firejail/files/profile-activate.sh b/roles/firejail/files/profile-activate.sh index 2769cf5..b801e2f 100755 --- a/roles/firejail/files/profile-activate.sh +++ b/roles/firejail/files/profile-activate.sh @@ -2,6 +2,7 @@ PROFILEDIR=~/.config/firejail SYSDIR=/usr/local/etc/firejail +COUNT=0 # If the profile directory does not exist, create it. if [ ! -d "$PROFILEDIR" ]; then @@ -14,7 +15,9 @@ for path in "$SYSDIR"/*.profile; do file=`basename $path` destination=$PROFILEDIR/$file if [ ! -e $destination ]; then - echo "creating $destination" echo "include $SYSDIR/$file" > $destination + COUNT=$((COUNT + 1)) fi done + +echo "$COUNT profiles activated" diff --git a/roles/firejail/handlers/main.yml b/roles/firejail/handlers/main.yml index dea473e..6103cb6 100644 --- a/roles/firejail/handlers/main.yml +++ b/roles/firejail/handlers/main.yml @@ -1,5 +1,7 @@ --- -- name: activate firejail profiles - command: /usr/local/bin/profile-activate - become: yes +- name: Activate firejail profiles + ansible.builtin.command: /usr/local/bin/profile-activate + become: true become_user: "{{ user.name }}" + register: firejail_result + changed_when: not firejail_result.stdout.startswith('0 ') diff --git a/roles/firejail/tasks/main.yml b/roles/firejail/tasks/main.yml index 329fa1a..642758d 100644 --- a/roles/firejail/tasks/main.yml +++ b/roles/firejail/tasks/main.yml @@ -1,49 +1,52 @@ --- - name: Install firejail - pacman: + community.general.pacman: name: firejail state: present - name: Install firewarden kewlfft.aur.aur: name: firewarden - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Install firejail profile update script - copy: + ansible.builtin.copy: src: profile-activate.sh dest: /usr/local/bin/profile-activate - mode: 0755 + mode: "0755" - name: Create firejail profile directory - file: + ansible.builtin.file: path: /usr/local/etc/firejail state: directory + mode: "0755" - name: Verify firejail globals file exists - copy: + ansible.builtin.copy: content: "" dest: /etc/firejail/globals.local force: false + mode: "0644" - name: Add blacklist to globals - lineinfile: + ansible.builtin.lineinfile: dest: /etc/firejail/globals.local state: present line: "blacklist {{ item }}" with_items: "{{ firejail.blacklist }}" - name: Verify firejail users file exists - copy: + ansible.builtin.copy: content: "" dest: /etc/firejail/firejail.users force: false + mode: "0644" - name: Add user to firejail users - lineinfile: + ansible.builtin.lineinfile: dest: /etc/firejail/firejail.users state: present line: "{{ user.name }}" diff --git a/roles/fonts/tasks/main.yml b/roles/fonts/tasks/main.yml index 0f9c560..c3fea63 100644 --- a/roles/fonts/tasks/main.yml +++ b/roles/fonts/tasks/main.yml @@ -1,51 +1,52 @@ --- - name: Install freetype2 - pacman: + community.general.pacman: name: freetype2 state: present - name: Install cairo - pacman: + community.general.pacman: name: cairo state: present - name: Install fontconfig - pacman: + community.general.pacman: name: fontconfig state: present - name: Enable LCD filter - file: + ansible.builtin.file: src: /usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf dest: /etc/fonts/conf.d/11-lcdfilter-default.conf state: link - name: Enable sub-pixel rendering - file: + ansible.builtin.file: src: /usr/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf dest: /etc/fonts/conf.d/10-sub-pixel-rgb.conf state: link - name: Enable hinting - file: + ansible.builtin.file: src: /usr/share/fontconfig/conf.avail/10-hinting-slight.conf dest: /etc/fonts/conf.d/10-hinting-slight.conf state: link - name: Push font substitutions - copy: + ansible.builtin.copy: src: local.conf dest: /etc/fonts/local.conf + mode: "0644" - name: Install base fonts - pacman: + community.general.pacman: name: "{{ base_fonts }}" state: present - name: Install AUR fonts kewlfft.aur.aur: name: "{{ aur_fonts }}" - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/gdm/tasks/main.yml b/roles/gdm/tasks/main.yml index 8c80a1c..7562a87 100644 --- a/roles/gdm/tasks/main.yml +++ b/roles/gdm/tasks/main.yml @@ -1,16 +1,29 @@ --- - name: Install GNOME Display Manager (GDM) - pacman: name=gdm state=present + community.general.pacman: + name: gdm + state: present - name: Enable GDM - service: name=gdm.service enabled=yes + ansible.builtin.service: + name: gdm.service + enabled: true - name: Creating DConf configuration profile - copy: src=profile/gdm dest=/etc/dconf/profile/gdm + ansible.builtin.copy: + src: profile/gdm + dest: /etc/dconf/profile/gdm + mode: "0644" - name: Creating gdm.d directory for DConf - file: path=/etc/dconf/db/gdm.d state=directory mode=0755 + ansible.builtin.file: + path: /etc/dconf/db/gdm.d + state: directory + mode: "0755" - name: Configuring GDM - template: src=gdm.d/00-spark.j2 dest=/etc/dconf/db/gdm.d/00-spark - notify: update DConf database + ansible.builtin.template: + src: gdm.d/00-spark.j2 + dest: /etc/dconf/db/gdm.d/00-spark + mode: "0644" + notify: Update DConf database diff --git a/roles/gitannex/files/99-max_watches.conf b/roles/gitannex/files/99-max_watches.conf new file mode 100644 index 0000000..471aef8 --- /dev/null +++ b/roles/gitannex/files/99-max_watches.conf @@ -0,0 +1 @@ +fs.inotify.max_user_watches = 100000 diff --git a/roles/gitannex/files/git-annex.service b/roles/gitannex/files/git-annex.service new file mode 100644 index 0000000..6fecb3c --- /dev/null +++ b/roles/gitannex/files/git-annex.service @@ -0,0 +1,11 @@ +[Unit] +Description=Git Annex Assistant Service + +[Service] +Type=simple +ExecStart=/usr/bin/git-annex assistant --foreground --autostart +StandardOutput=journal +StandardError=journal + +[Install] +WantedBy=multi-user.target diff --git a/roles/gitannex/handlers/main.yml b/roles/gitannex/handlers/main.yml new file mode 100644 index 0000000..0616699 --- /dev/null +++ b/roles/gitannex/handlers/main.yml @@ -0,0 +1,6 @@ +--- +- name: Restart git-annex + ansible.builtin.service: + name: "git-annex@{{ user.name }}.service" + state: restarted + when: gitannex is defined diff --git a/roles/gitannex/meta/main.yml b/roles/gitannex/meta/main.yml new file mode 100644 index 0000000..371455c --- /dev/null +++ b/roles/gitannex/meta/main.yml @@ -0,0 +1,5 @@ +--- +dependencies: + - { role: nmtrust } + - { role: systemd } + - { role: sysctl } diff --git a/roles/gitannex/tasks/main.yml b/roles/gitannex/tasks/main.yml new file mode 100644 index 0000000..8175cf1 --- /dev/null +++ b/roles/gitannex/tasks/main.yml @@ -0,0 +1,60 @@ +--- +- name: Install git-annex + community.general.pacman: + name: git-annex + state: present + +- name: Install git-annex-remote-rclone + kewlfft.aur.aur: + name: git-annex-remote-rclone + become: true + become_user: "{{ aur.user }}" + tags: + - aur + +- name: Push git-annex assistant service file + ansible.builtin.copy: + src: git-annex.service + dest: /etc/systemd/user/git-annex.service + mode: "0644" + notify: + - Reload systemd config + +- name: Check if git-annex autostart file exists + ansible.builtin.stat: + path: /home/{{ user.name }}/.config/git-annex/autostart + register: gitannex_autostart + +- name: Enable and start git-annex assistant service + ansible.builtin.systemd: + name: git-annex.service + scope: user + enabled: true + state: started + become: true + become_user: "{{ user.name }}" + environment: + XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}" + when: gitannex_autostart.stat is defined and gitannex_autostart.stat.exists + +- name: Add git-annex to trusted unit list + ansible.builtin.lineinfile: + dest: /etc/nmtrust/trusted_units + state: present + line: "git-annex.service,user:{{ user.name }},allow_offline" + when: gitannex.stop_on_untrusted is defined and gitannex.stop_on_untrusted + +- name: Remove git-annex from trusted unit list + ansible.builtin.lineinfile: + dest: /etc/nmtrust/trusted_units + state: absent + line: "git-annex.service,user:{{ user.name }},allow_offline" + when: gitannex.stop_on_untrusted is not defined or not gitannex.stop_on_untrusted + +- name: Increase the amount of inotify watchers + ansible.builtin.copy: + src: 99-max_watches.conf + dest: /etc/sysctl.d/99-max_watches.conf + mode: "0644" + notify: + - Reload sysctl diff --git a/roles/gnome/tasks/dconf.yml b/roles/gnome/tasks/dconf.yml index df1aaa0..0253b66 100644 --- a/roles/gnome/tasks/dconf.yml +++ b/roles/gnome/tasks/dconf.yml @@ -1,13 +1,23 @@ --- - name: Creating gnome.d directory for DConf - file: path=/etc/dconf/db/gnome.d state=directory mode=0755 + ansible.builtin.file: + path: /etc/dconf/db/gnome.d + state: directory + mode: "0755" - name: Configuring GNOME - template: src=gnome.d/00-spark.j2 dest=/etc/dconf/db/gnome.d/00-spark mode=0644 - notify: update DConf database + ansible.builtin.template: + src: gnome.d/00-spark.j2 + dest: /etc/dconf/db/gnome.d/00-spark + mode: "0644" + notify: Update DConf database - name: Configuring DConf - lineinfile: path=/etc/dconf/profile/user line={{ item }} create=yes mode=0644 + ansible.builtin.lineinfile: + path: /etc/dconf/profile/user + line: "{{ item }}" + create: "yes" + mode: "0644" with_items: - "user-db:user" - "system-db:gnome" diff --git a/roles/gnome/tasks/gnome_shell.yml b/roles/gnome/tasks/gnome_shell.yml index 8fabf33..79c2019 100644 --- a/roles/gnome/tasks/gnome_shell.yml +++ b/roles/gnome/tasks/gnome_shell.yml @@ -2,18 +2,20 @@ - name: Disabling GNOME Shell top left hot corner kewlfft.aur.aur: name: gnome-shell-extension-no-topleft-hot-corner - become: yes + become: true become_user: "{{ aur.user }}" when: "gnome.gnome_shell.disable_top_left_hot_corner" tags: - aur - name: Enabling GNOME Shell top left hot corner - pacman: name=gnome-shell-extension-no-topleft-hot-corner state=absent + community.general.pacman: + name: gnome-shell-extension-no-topleft-hot-corner + state: absent when: "not gnome.gnome_shell.disable_top_left_hot_corner" - name: Configuring GNOME Shell Extensions support - pacman: + community.general.pacman: name: - gnome-shell-extensions - chrome-gnome-shell diff --git a/roles/gnome/tasks/gtk.yml b/roles/gnome/tasks/gtk.yml index 4aaa9ee..4a3c9ff 100644 --- a/roles/gnome/tasks/gtk.yml +++ b/roles/gnome/tasks/gtk.yml @@ -1,6 +1,12 @@ --- - name: Creating GTK+ 3 system wide settings - file: path=/etc/gtk-3.0 state=directory mode=0755 + ansible.builtin.file: + path: /etc/gtk-3.0 + state: directory + mode: "0755" - name: Configuring GTK+ 3 theme - template: src=gtk-3.0/settings.ini.j2 dest=/etc/gtk-3.0/settings.ini mode=0644 + ansible.builtin.template: + src: gtk-3.0/settings.ini.j2 + dest: /etc/gtk-3.0/settings.ini + mode: "0644" diff --git a/roles/gnome/tasks/main.yml b/roles/gnome/tasks/main.yml index 649f6e4..f60d61d 100644 --- a/roles/gnome/tasks/main.yml +++ b/roles/gnome/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install GNOME - pacman: + community.general.pacman: name: - gnome - gnome-extra @@ -8,7 +8,11 @@ - xorg-server-xwayland state: present -- include_tasks: dconf.yml -- include_tasks: gtk.yml -- include_tasks: gnome_shell.yml -- include_tasks: online_accounts.yml +- name: Include DConf tasks + ansible.builtin.include_tasks: dconf.yml +- name: Include GTK tasks + ansible.builtin.include_tasks: gtk.yml +- name: Include GNOME Shell tasks + ansible.builtin.include_tasks: gnome_shell.yml +- name: Include online accounts tasks + ansible.builtin.include_tasks: online_accounts.yml diff --git a/roles/gnome/tasks/online_accounts.yml b/roles/gnome/tasks/online_accounts.yml index 5189e7c..d18243e 100644 --- a/roles/gnome/tasks/online_accounts.yml +++ b/roles/gnome/tasks/online_accounts.yml @@ -1,3 +1,5 @@ --- - name: Configuring GNOME Online Accounts integration - pacman: name=gvfs-goa state={{ "present" if gnome.online_accounts_support else "absent" }} + community.general.pacman: + name: gvfs-goa + state: '{{ "present" if gnome.online_accounts_support else "absent" }}' diff --git a/roles/gnupg/tasks/main.yml b/roles/gnupg/tasks/main.yml index 25e7471..9a56e77 100644 --- a/roles/gnupg/tasks/main.yml +++ b/roles/gnupg/tasks/main.yml @@ -1,41 +1,41 @@ --- - name: Install gnupg - pacman: + community.general.pacman: name: gnupg state: present - name: Enable gpg-agent.socket - systemd: + ansible.builtin.systemd: name: gpg-agent.socket scope: user - enabled: yes + enabled: true state: started - become: yes + become: true become_user: "{{ user.name }}" environment: XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}" - when: gnupg.enable_agent == True + when: gnupg.enable_agent - name: Enable dirmngr.socket - systemd: + ansible.builtin.systemd: name: dirmngr.socket scope: user - enabled: yes + enabled: true state: started - become: yes + become: true become_user: "{{ user.name }}" environment: XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}" - when: gnupg.enable_agent == True + when: gnupg.enable_agent - name: Enable gpg-agent-ssh.socket - systemd: + ansible.builtin.systemd: name: gpg-agent-ssh.socket scope: user - enabled: yes + enabled: true state: started - become: yes + become: true become_user: "{{ user.name }}" environment: XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}" - when: gnupg.enable_agent == True and gnupg.emulate_ssh == True + when: gnupg.enable_agent and gnupg.emulate_ssh diff --git a/roles/goesimage/handlers/main.yml b/roles/goesimage/handlers/main.yml index 5c34d77..ed99c08 100644 --- a/roles/goesimage/handlers/main.yml +++ b/roles/goesimage/handlers/main.yml @@ -1,4 +1,6 @@ --- -- name: restart GOESImage - service: name="goesimage@{{ user.name }}.timer" state=restarted +- name: Restart GOESImage + ansible.builtin.service: + name: "goesimage@{{ user.name }}.timer" + state: restarted when: goesimage.run_on == "all" diff --git a/roles/goesimage/tasks/main.yml b/roles/goesimage/tasks/main.yml index f87a6c7..71e2e36 100644 --- a/roles/goesimage/tasks/main.yml +++ b/roles/goesimage/tasks/main.yml @@ -2,28 +2,31 @@ - name: Install GOESImage kewlfft.aur.aur: name: goesimage - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Push GOESImage service file - template: + ansible.builtin.template: src: goesimage.service.j2 dest: /etc/systemd/user/goesimage.service + mode: "0644" notify: - - reload systemd config + - Reload systemd config - name: Push GOESImage timer file - template: + ansible.builtin.template: src: goesimage.timer.j2 dest: /etc/systemd/user/goesimage.timer + mode: "0644" notify: - - reload systemd config - - restart GOESImage + - Reload systemd config + - Restart GOESImage -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: goesimage.timer - run_on: "{{ goesimage.run_on }}" - user_unit: true + unit: goesimage.timer + run_on: "{{ goesimage.run_on }}" + user_unit: true diff --git a/roles/goimapnotify/tasks/main.yml b/roles/goimapnotify/tasks/main.yml index 6f4785b..f420364 100644 --- a/roles/goimapnotify/tasks/main.yml +++ b/roles/goimapnotify/tasks/main.yml @@ -1,19 +1,21 @@ --- - name: Install goimapnotify - pacman: + community.general.pacman: name: goimapnotify state: present - name: Create goimapnotify service override directory - file: + ansible.builtin.file: path: /etc/systemd/user/goimapnotify@.service.d state: directory + mode: "0755" when: mail.goimapnotify_wait is defined - name: Push goimapnotify service override file - template: + ansible.builtin.template: src: goimapnotify-service-override.conf.j2 dest: /etc/systemd/user/goimapnotify@.service.d/override.conf + mode: "0644" when: mail.goimapnotify_wait is defined notify: - - reload user systemd config + - Reload user systemd config diff --git a/roles/golang/tasks/main.yml b/roles/golang/tasks/main.yml index 43acdd2..a12b17a 100644 --- a/roles/golang/tasks/main.yml +++ b/roles/golang/tasks/main.yml @@ -1,14 +1,25 @@ --- - name: Install go - pacman: name=go state=present + community.general.pacman: + name: go + state: present - name: Create system go group - group: name=golang state=present + ansible.builtin.group: + name: golang + state: present - name: Add user to system golang group - user: name={{ user.name }} groups=golang append=yes + ansible.builtin.user: + name: "{{ user.name }}" + groups: golang + append: true tags: - user - name: Create system go dir - file: path=/usr/local/go state=directory group=golang mode=0775 + ansible.builtin.file: + path: /usr/local/go + state: directory + group: golang + mode: "0775" diff --git a/roles/grub/handlers/main.yml b/roles/grub/handlers/main.yml index 3cf5e55..78c7c5d 100644 --- a/roles/grub/handlers/main.yml +++ b/roles/grub/handlers/main.yml @@ -1,4 +1,5 @@ --- -- name: rebuild grub - command: grub-mkconfig -o /boot/grub/grub.cfg +- name: Rebuild grub + ansible.builtin.command: grub-mkconfig -o /boot/grub/grub.cfg when: bootloader == "grub" + changed_when: true diff --git a/roles/grub/tasks/main.yml b/roles/grub/tasks/main.yml index bce03d6..42c8625 100644 --- a/roles/grub/tasks/main.yml +++ b/roles/grub/tasks/main.yml @@ -1,27 +1,27 @@ --- - name: Set kernel parameters - lineinfile: + ansible.builtin.lineinfile: dest: /etc/default/grub - regexp: '^GRUB_CMDLINE_LINUX_DEFAULT' + regexp: "^GRUB_CMDLINE_LINUX_DEFAULT" state: present line: 'GRUB_CMDLINE_LINUX_DEFAULT="{{ kernel_parameters }}"' when: kernel_parameters is defined notify: - - rebuild grub + - Rebuild grub - name: Disable Grub submenus - lineinfile: + ansible.builtin.lineinfile: dest: /etc/default/grub - regexp: '^GRUB_DISABLE_SUBMENU' + regexp: "^GRUB_DISABLE_SUBMENU" state: present - line: 'GRUB_DISABLE_SUBMENU=y' + line: "GRUB_DISABLE_SUBMENU=y" notify: - - rebuild grub + - Rebuild grub - name: Install Grub Pacman hook kewlfft.aur.aur: name: grub-hook - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/hardened/tasks/main.yml b/roles/hardened/tasks/main.yml index b61d994..3f92ac6 100644 --- a/roles/hardened/tasks/main.yml +++ b/roles/hardened/tasks/main.yml @@ -1,17 +1,18 @@ --- - name: Install linux-hardened - pacman: + community.general.pacman: name: - linux-hardened - linux-hardened-headers state: present notify: - - rebuild grub + - Rebuild grub - name: Enable unprivileged containers for non-root users - copy: + ansible.builtin.copy: src: 99-userns.conf dest: /etc/sysctl.d/99-userns.conf + mode: "0644" notify: - - reload sysctl + - Reload sysctl when: hardened is defined and hardened.enable_namespaces diff --git a/roles/hashicorp/tasks/main.yml b/roles/hashicorp/tasks/main.yml index a14a961..2cc9964 100644 --- a/roles/hashicorp/tasks/main.yml +++ b/roles/hashicorp/tasks/main.yml @@ -1,28 +1,28 @@ --- - name: Install vagrant - pacman: + community.general.pacman: name: vagrant state: present - name: Install consul - pacman: + community.general.pacman: name: consul state: present - name: Install terraform - pacman: + community.general.pacman: name: terraform state: present - name: Install vault - pacman: + community.general.pacman: name: vault state: present - name: Install nomad kewlfft.aur.aur: name: nomad - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/himawaripy/handlers/main.yml b/roles/himawaripy/handlers/main.yml index d5e3c07..2d0893b 100644 --- a/roles/himawaripy/handlers/main.yml +++ b/roles/himawaripy/handlers/main.yml @@ -1,4 +1,6 @@ --- -- name: restart himawaripy - service: name="himawaripy@{{ user.name }}.timer" state=restarted +- name: Restart himawaripy + ansible.builtin.service: + name: "himawaripy@{{ user.name }}.timer" + state: restarted when: himawaripy.run_on == "all" diff --git a/roles/himawaripy/tasks/main.yml b/roles/himawaripy/tasks/main.yml index 4110f35..8fb2a30 100644 --- a/roles/himawaripy/tasks/main.yml +++ b/roles/himawaripy/tasks/main.yml @@ -1,33 +1,36 @@ --- - name: Install himawaripy into virtual environment - pip: + ansible.builtin.pip: name: git+https://github.com/boramalper/himawaripy#egg=himawaripy virtualenv: /usr/local/env/himawaripy virtualenv_command: virtualenv3 - name: Link himawaripy to bin - file: + ansible.builtin.file: src: /usr/local/env/himawaripy/bin/himawaripy dest: /usr/local/bin/himawaripy state: link - name: Push himawaripy service file - template: + ansible.builtin.template: src: himawaripy.service.j2 dest: /etc/systemd/user/himawaripy.service + mode: "0644" notify: - - reload systemd config + - Reload systemd config - name: Push himawaripy timer file - template: + ansible.builtin.template: src: himawaripy.timer.j2 dest: /etc/systemd/user/himawaripy.timer + mode: "0644" notify: - - reload systemd config - - restart himawaripy + - Reload systemd config + - Restart himawaripy -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: himawaripy.timer - run_on: "{{ himawaripy.run_on }}" - user_unit: true + unit: himawaripy.timer + run_on: "{{ himawaripy.run_on }}" + user_unit: true diff --git a/roles/hostsctl/tasks/main.yml b/roles/hostsctl/tasks/main.yml index 5b98e6c..f9c0928 100644 --- a/roles/hostsctl/tasks/main.yml +++ b/roles/hostsctl/tasks/main.yml @@ -2,13 +2,17 @@ - name: Install hostsctl kewlfft.aur.aur: name: hostsctl - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Push hostsctl config - template: src=hostsctl.conf.j2 dest=/etc/hostsctl.conf + ansible.builtin.template: + src: hostsctl.conf.j2 + dest: /etc/hostsctl.conf + mode: "0644" - name: Update hostsctl - command: hostsctl update + ansible.builtin.command: hostsctl update + changed_when: true diff --git a/roles/i3/tasks/main.yml b/roles/i3/tasks/main.yml index af710a5..871cca7 100644 --- a/roles/i3/tasks/main.yml +++ b/roles/i3/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install i3 - pacman: + community.general.pacman: name: - i3-wm - i3blocks @@ -9,26 +9,28 @@ state: present - name: Install py3status - pacman: + community.general.pacman: name: py3status state: present - name: Install wmfocus - pacman: + community.general.pacman: name: wmfocus state: present - name: Verify that default applications file exists - copy: + ansible.builtin.copy: content: "" dest: /etc/xdg/mimeapps.list force: false + mode: "0644" - name: Verify header in default applications file - lineinfile: + ansible.builtin.lineinfile: dest: /etc/xdg/mimeapps.list state: present - line: '[Default Applications]' + line: "[Default Applications]" insertbefore: BOF -- include_tasks: rofi.yml +- name: Include rofi tasks + ansible.builtin.include_tasks: rofi.yml diff --git a/roles/i3/tasks/rofi.yml b/roles/i3/tasks/rofi.yml index b06d4cb..9b7438f 100644 --- a/roles/i3/tasks/rofi.yml +++ b/roles/i3/tasks/rofi.yml @@ -1,10 +1,14 @@ --- - name: Install rofi - pacman: name=rofi state=present + community.general.pacman: + name: rofi + state: present tags: - rofi - name: Install i3-wm for rofi window switching - pacman: name=i3-wm state=present + community.general.pacman: + name: i3-wm + state: present tags: - rofi diff --git a/roles/interception/handlers/main.yml b/roles/interception/handlers/main.yml index 51216e1..cac8d9b 100644 --- a/roles/interception/handlers/main.yml +++ b/roles/interception/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: restart udevmon - service: +- name: Restart udevmon + ansible.builtin.service: name: udevmon.service state: restarted diff --git a/roles/interception/tasks/main.yml b/roles/interception/tasks/main.yml index a99103d..eaf5ba9 100644 --- a/roles/interception/tasks/main.yml +++ b/roles/interception/tasks/main.yml @@ -1,20 +1,21 @@ --- - name: Install caps2esc - pacman: + community.general.pacman: name: interception-caps2esc state: present - name: Push caps2esc udevmon config - template: + ansible.builtin.template: src: caps2esc.yaml.j2 dest: /etc/interception/udevmon.d/caps2esc.yaml + mode: "0644" notify: - - restart udevmon - when: interception.caps2esc.enabled is defined and interception.caps2esc.enabled == True + - Restart udevmon + when: interception.caps2esc.enabled is defined and interception.caps2esc.enabled - name: Enable and start udevmon - service: + ansible.builtin.service: name: udevmon.service - enabled: yes + enabled: true state: started - when: interception.caps2esc.enabled is defined and interception.caps2esc.enabled == True + when: interception.caps2esc.enabled is defined and interception.caps2esc.enabled diff --git a/roles/iptables/handlers/main.yml b/roles/iptables/handlers/main.yml index 9861c00..1ba0430 100644 --- a/roles/iptables/handlers/main.yml +++ b/roles/iptables/handlers/main.yml @@ -1,6 +1,10 @@ --- -- name: restart iptables - service: name=iptables.service state=restarted +- name: Restart iptables + ansible.builtin.service: + name: iptables.service + state: restarted -- name: restart ip6tables - service: name=ip6tables.service state=restarted +- name: Restart ip6tables + ansible.builtin.service: + name: ip6tables.service + state: restarted diff --git a/roles/iptables/tasks/main.yml b/roles/iptables/tasks/main.yml index cbf8dd1..9099733 100644 --- a/roles/iptables/tasks/main.yml +++ b/roles/iptables/tasks/main.yml @@ -1,16 +1,32 @@ --- - name: Push ipv4 firewall config - template: src=iptables.rules.j2 dest=/etc/iptables/iptables.rules + ansible.builtin.template: + src: iptables.rules.j2 + dest: /etc/iptables/iptables.rules + owner: root + group: root + mode: "0640" notify: - - restart iptables + - Restart iptables - name: Enable and start iptables - service: name=iptables.service enabled=yes state=started + ansible.builtin.service: + name: iptables.service + enabled: true + state: started - name: Push ipv6 firewall config - template: src=ip6tables.rules.j2 dest=/etc/iptables/ip6tables.rules + ansible.builtin.template: + src: ip6tables.rules.j2 + dest: /etc/iptables/ip6tables.rules + owner: root + group: root + mode: "0640" notify: - - restart ip6tables + - Restart ip6tables - name: Enable and start ip6tables - service: name=ip6tables.service enabled=yes state=started + ansible.builtin.service: + name: ip6tables.service + enabled: true + state: started diff --git a/roles/kdeconnect/tasks/main.yml b/roles/kdeconnect/tasks/main.yml index b7695d6..794af34 100644 --- a/roles/kdeconnect/tasks/main.yml +++ b/roles/kdeconnect/tasks/main.yml @@ -1,16 +1,20 @@ --- - name: Install KDE Connect - pacman: name=kdeconnect state=present + community.general.pacman: + name: kdeconnect + state: present - name: Push KDE Connect service file - template: + ansible.builtin.template: src: kdeconnect.service.j2 dest: /etc/systemd/user/kdeconnect.service + mode: "0644" notify: - - reload systemd config + - Reload systemd config -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: kdeconnect.service - run_on: "{{ kdeconnect.run_on }}" - user_unit: true + unit: kdeconnect.service + run_on: "{{ kdeconnect.run_on }}" + user_unit: true diff --git a/roles/laptop/handlers/main.yml b/roles/laptop/handlers/main.yml index 18d48bd..def2e56 100644 --- a/roles/laptop/handlers/main.yml +++ b/roles/laptop/handlers/main.yml @@ -1,8 +1,10 @@ --- -- name: restart tlp - service: name=tlp.service state=restarted +- name: Restart tlp + ansible.builtin.service: + name: tlp.service + state: restarted -- name: restart power monitor - service: +- name: Restart power monitor + ansible.builtin.service: name: power_monitor.service state: restarted diff --git a/roles/laptop/tasks/framework.yml b/roles/laptop/tasks/framework.yml index 31a888a..928824a 100644 --- a/roles/laptop/tasks/framework.yml +++ b/roles/laptop/tasks/framework.yml @@ -1,6 +1,6 @@ --- - name: Install framework-system - pacman: + community.general.pacman: name: framework-system tags: - framework diff --git a/roles/laptop/tasks/main.yml b/roles/laptop/tasks/main.yml index b2a8436..b0b11f4 100644 --- a/roles/laptop/tasks/main.yml +++ b/roles/laptop/tasks/main.yml @@ -1,45 +1,50 @@ --- -- include_tasks: tlp.yml +- name: Include TLP tasks + ansible.builtin.include_tasks: tlp.yml when: power_management is defined and power_management == "tlp" -- include_tasks: tuned.yml +- name: Include tuned tasks + ansible.builtin.include_tasks: tuned.yml when: power_management is defined and power_management == "tuned" -- include_tasks: framework.yml +- name: Include Framework tasks + ansible.builtin.include_tasks: framework.yml when: power_management is defined and power_management == "tuned" and ansible_system_vendor == "Framework" - name: Install x86_energy_perf_policy - pacman: + community.general.pacman: name: x86_energy_perf_policy state: present - name: Copy touchpad configuration file - copy: + ansible.builtin.copy: src: 30-touchpad.conf dest: /etc/X11/xorg.conf.d/30-touchpad.conf + mode: "0644" tags: - libinput - name: Copy logind configuration file - copy: + ansible.builtin.copy: src: logind.conf dest: /etc/systemd/logind.conf + mode: "0644" - name: Install poweralertd kewlfft.aur.aur: name: poweralertd - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Enable and start poweralertd - systemd: + ansible.builtin.systemd: name: poweralertd.service scope: user - enabled: yes + enabled: true state: started - become: yes + become: true become_user: "{{ user.name }}" environment: XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}" @@ -47,27 +52,27 @@ - aur - name: Install powertop - pacman: + community.general.pacman: name: powertop state: present - name: Install powerstat kewlfft.aur.aur: name: powerstat - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Install cmake for battery-stats - pacman: + community.general.pacman: name: cmake state: present - name: Install battery-stats kewlfft.aur.aur: name: battery-stats-git - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur @@ -75,7 +80,7 @@ - name: Install battop kewlfft.aur.aur: name: battop - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/laptop/tasks/tlp.yml b/roles/laptop/tasks/tlp.yml index 2502559..edd2b59 100644 --- a/roles/laptop/tasks/tlp.yml +++ b/roles/laptop/tasks/tlp.yml @@ -1,6 +1,6 @@ --- - name: Install TLP - pacman: + community.general.pacman: name: - ethtool - tlp @@ -10,45 +10,52 @@ - tlp - name: Push TLP battery threshold config - copy: + ansible.builtin.copy: src: tlp/20-battery.conf dest: /etc/tlp.d/ + mode: "0644" notify: - - restart tlp + - Restart tlp tags: - tlp - name: Push TLP radio device config - copy: + ansible.builtin.copy: src: tlp/20-rdw.conf dest: /etc/tlp.d/ + mode: "0644" notify: - - restart tlp + - Restart tlp tags: - tlp - name: Push TLP PCIe config - copy: + ansible.builtin.copy: src: tlp/20-pcie.conf dest: /etc/tlp.d/ + mode: "0644" notify: - - restart tlp + - Restart tlp tags: - tlp - name: Mask systemd radio service - command: systemctl mask systemd-rfkill.service + ansible.builtin.systemd: + name: systemd-rfkill.service + masked: true tags: - tlp - name: Mask systemd radio socket - command: systemctl mask systemd-rfkill.socket + ansible.builtin.systemd: + name: systemd-rfkill.socket + masked: true tags: - tlp - name: Enable TLP - service: + ansible.builtin.service: name: tlp.service - enabled: yes + enabled: true tags: - tlp diff --git a/roles/laptop/tasks/tuned.yml b/roles/laptop/tasks/tuned.yml index 0763cdc..5a50b90 100644 --- a/roles/laptop/tasks/tuned.yml +++ b/roles/laptop/tasks/tuned.yml @@ -1,43 +1,44 @@ --- - name: Install TuneD - pacman: + community.general.pacman: name: tuned-ppd state: present tags: - tuned - name: Enable and start TuneD - service: + ansible.builtin.service: name: tuned.service - enabled: yes + enabled: true state: started tags: - tuned - name: Install power monitor script - copy: + ansible.builtin.copy: src: power_monitor.sh dest: /usr/local/bin/ - mode: 0755 + mode: "0755" notify: - - restart power monitor + - Restart power monitor tags: - tuned - name: Copy power monitor service - copy: + ansible.builtin.copy: src: power_monitor.service dest: /etc/systemd/system/ + mode: "0644" notify: - - reload systemd config - - restart power monitor + - Reload systemd config + - Restart power monitor tags: - tuned - name: Enable and start power monitor service - service: + ansible.builtin.service: name: power_monitor.service - enabled: yes + enabled: true state: started tags: - tuned diff --git a/roles/ledger/tasks/main.yml b/roles/ledger/tasks/main.yml index 7601588..0e333fb 100644 --- a/roles/ledger/tasks/main.yml +++ b/roles/ledger/tasks/main.yml @@ -1,3 +1,5 @@ --- - name: Install ledger - pacman: name=ledger state=present + community.general.pacman: + name: ledger + state: present diff --git a/roles/libvirt/tasks/main.yml b/roles/libvirt/tasks/main.yml index 09e2c54..24a1a7e 100644 --- a/roles/libvirt/tasks/main.yml +++ b/roles/libvirt/tasks/main.yml @@ -1,37 +1,37 @@ --- - name: Install libvirt - pacman: + community.general.pacman: name: - libvirt - virt-install state: present - name: Install qemu-base - pacman: + community.general.pacman: name: qemu-base state: present - name: Install dnsmasq - pacman: + community.general.pacman: name: dnsmasq state: present - name: Enable libvirtd.socket - systemd: + ansible.builtin.systemd: name: libvirtd.socket - enabled: yes + enabled: true state: started - name: Enable virtlogd.socket - systemd: + ansible.builtin.systemd: name: virtlogd.socket - enabled: yes + enabled: true state: started - name: Add the user to libvirt group - user: + ansible.builtin.user: name: "{{ user.name }}" groups: libvirt - append: yes + append: true tags: - user diff --git a/roles/lightdm/tasks/main.yml b/roles/lightdm/tasks/main.yml index 6f626df..a76a496 100644 --- a/roles/lightdm/tasks/main.yml +++ b/roles/lightdm/tasks/main.yml @@ -1,34 +1,45 @@ --- - name: Install LightDM - pacman: + community.general.pacman: name: - lightdm - lightdm-gtk-greeter state: present - name: Enable LightDM - service: name=lightdm.service enabled=yes + ansible.builtin.service: + name: lightdm.service + enabled: true - name: Create background dir - file: path=/usr/share/backgrounds state=directory + ansible.builtin.file: + path: /usr/share/backgrounds + state: directory + mode: "0755" - name: Push LightDM greeter background - copy: src=onosendai.jpg dest=/usr/share/backgrounds/onosendai.jpg + ansible.builtin.copy: + src: onosendai.jpg + dest: /usr/share/backgrounds/onosendai.jpg + mode: "0644" - name: Specify LightDM greeter background - lineinfile: dest=/etc/lightdm/lightdm-gtk-greeter.conf - regexp="^background=" - state=present - line="background=/usr/share/backgrounds/onosendai.jpg" + ansible.builtin.lineinfile: + dest: /etc/lightdm/lightdm-gtk-greeter.conf + regexp: "^background=" + state: present + line: "background=/usr/share/backgrounds/onosendai.jpg" - name: Hide user images - lineinfile: dest=/etc/lightdm/lightdm-gtk-greeter.conf - regexp="^hide-user-image=" - state=present - line="hide-user-image=true" + ansible.builtin.lineinfile: + dest: /etc/lightdm/lightdm-gtk-greeter.conf + regexp: "^hide-user-image=" + state: present + line: "hide-user-image=true" - name: Force LightDM greeter theme - lineinfile: dest=/usr/share/xgreeters/lightdm-gtk-greeter.desktop - regexp="^Exec=" - state=present - line="Exec=env GTK_THEME=Adwaita:dark lightdm-gtk-greeter" + ansible.builtin.lineinfile: + dest: /usr/share/xgreeters/lightdm-gtk-greeter.desktop + regexp: "^Exec=" + state: present + line: "Exec=env GTK_THEME=Adwaita:dark lightdm-gtk-greeter" diff --git a/roles/localtime/tasks/main.yml b/roles/localtime/tasks/main.yml index 91ab974..012cd47 100644 --- a/roles/localtime/tasks/main.yml +++ b/roles/localtime/tasks/main.yml @@ -2,12 +2,13 @@ - name: Install localtime kewlfft.aur.aur: name: localtime-git - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: localtime.service - run_on: "{{ localtime.run_on }}" + unit: localtime.service + run_on: "{{ localtime.run_on }}" diff --git a/roles/logitech/tasks/main.yml b/roles/logitech/tasks/main.yml index e52b254..d3accf9 100644 --- a/roles/logitech/tasks/main.yml +++ b/roles/logitech/tasks/main.yml @@ -1,18 +1,18 @@ --- - name: Add plugdev group - group: - name: plugdev - state: present + ansible.builtin.group: + name: plugdev + state: present -- name: Add {{ user.name }} to plugdev group - user: - name: "{{ user.name }}" - groups: plugdev - append: yes +- name: "Add user to plugdev group: {{ user.name }}" + ansible.builtin.user: + name: "{{ user.name }}" + groups: plugdev + append: true tags: - user - name: Install Solaar - pacman: - name: solaar - state: present + community.general.pacman: + name: solaar + state: present diff --git a/roles/macbook/tasks/main.yml b/roles/macbook/tasks/main.yml index f9d3daf..1ce7a9c 100644 --- a/roles/macbook/tasks/main.yml +++ b/roles/macbook/tasks/main.yml @@ -1,11 +1,14 @@ --- - name: Copy mtrack-git configuration file - copy: src=50-mtrack-git.conf dest=/etc/X11/xorg.conf.d/50-mtrack-git.conf + ansible.builtin.copy: + src: 50-mtrack-git.conf + dest: /etc/X11/xorg.conf.d/50-mtrack-git.conf + mode: "0644" - name: Install xf86-input-mtrack-git kewlfft.aur.aur: name: xf86-input-mtrack-git - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/mail/handlers/main.yml b/roles/mail/handlers/main.yml index 785e365..f734c2b 100644 --- a/roles/mail/handlers/main.yml +++ b/roles/mail/handlers/main.yml @@ -1,4 +1,6 @@ --- -- name: restart mailsync - service: name="mailsync@{{ user.name }}.timer" state=restarted +- name: Restart mailsync + ansible.builtin.service: + name: "mailsync@{{ user.name }}.timer" + state: restarted when: mail.sync_on == "all" diff --git a/roles/mail/tasks/isync.yml b/roles/mail/tasks/isync.yml index 80e1aaa..5c33dca 100644 --- a/roles/mail/tasks/isync.yml +++ b/roles/mail/tasks/isync.yml @@ -1,5 +1,7 @@ --- - name: Install isync - pacman: name=isync state=present + community.general.pacman: + name: isync + state: present tags: - isync diff --git a/roles/mail/tasks/mailsync.yml b/roles/mail/tasks/mailsync.yml index bc67bca..ae8f8d0 100644 --- a/roles/mail/tasks/mailsync.yml +++ b/roles/mail/tasks/mailsync.yml @@ -1,35 +1,38 @@ --- - name: Push mail sync script - template: + ansible.builtin.template: src: mailsync.sh.j2 dest: /usr/local/bin/mailsync - mode: 0755 + mode: "0755" tags: - mailsync - name: Push mailsync service file - template: + ansible.builtin.template: src: mailsync.service.j2 dest: /etc/systemd/user/mailsync.service + mode: "0644" tags: - mailsync notify: - - reload systemd config + - Reload systemd config - name: Push mailsync timer file - template: + ansible.builtin.template: src: mailsync.timer.j2 dest: /etc/systemd/user/mailsync.timer + mode: "0644" tags: - mailsync notify: - - reload systemd config - - restart mailsync + - Reload systemd config + - Restart mailsync -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: mailsync.timer - run_on: "{{ mail.sync_on }}" - user_unit: true + unit: mailsync.timer + run_on: "{{ mail.sync_on }}" + user_unit: true tags: - mailsync diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml index 2493b8e..e747e89 100644 --- a/roles/mail/tasks/main.yml +++ b/roles/mail/tasks/main.yml @@ -1,85 +1,93 @@ --- - name: Install neomutt - pacman: + community.general.pacman: name: neomutt state: present - name: Make neomutt available as mutt - file: + ansible.builtin.file: src: /usr/bin/neomutt dest: /usr/local/bin/mutt state: link - name: Verify mutt firejail local profile exists - copy: + ansible.builtin.copy: content: "" dest: /etc/firejail/mutt.local force: false + mode: "0644" tags: - firejail - name: Whitelist mutt related files - blockinfile: + ansible.builtin.blockinfile: dest: /etc/firejail/mutt.local block: | - noblacklist ~/.config/vdirsyncer - noblacklist ~/.config/pimsync - noblacklist ~/.vdirsyncer - noblacklist ~/.calendars - noblacklist ~/.contacts - noblacklist ~/.mbsyncrc - noblacklist ~/.offlineimap - noblacklist ~/.offlineimaprc + noblacklist ~/.config/vdirsyncer + noblacklist ~/.config/pimsync + noblacklist ~/.vdirsyncer + noblacklist ~/.calendars + noblacklist ~/.contacts + noblacklist ~/.mbsyncrc + noblacklist ~/.offlineimap + noblacklist ~/.offlineimaprc tags: - firejail - name: Install urlscan - pacman: + community.general.pacman: name: urlscan - name: Install notmuch - pacman: + community.general.pacman: name: notmuch state: present - name: Install mutt-ics kewlfft.aur.aur: name: mutt-ics - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Push mutt-mailto script - copy: + ansible.builtin.copy: src: mutt-mailto.sh dest: /usr/local/bin/mutt-mailto - mode: 0755 + mode: "0755" - name: Create local desktop application dir - file: + ansible.builtin.file: path: /usr/local/share/applications state: directory + mode: "0755" - name: Push mutt desktop file - copy: + ansible.builtin.copy: src: mutt.desktop dest: /usr/local/share/applications/mutt.desktop + mode: "0644" - name: Verify mimeapps.list exists - copy: + ansible.builtin.copy: content: "" dest: /etc/xdg/mimeapps.list force: false + mode: "0644" - name: Set mutt as default application for mailto links - lineinfile: + ansible.builtin.lineinfile: dest: /etc/xdg/mimeapps.list regexp: "^x-scheme-handler/mailto=" line: "x-scheme-handler/mailto=mutt.desktop" -- include_tasks: msmtp.yml -- include_tasks: isync.yml -#- include_tasks: offlineimap.yml -- include_tasks: mailsync.yml -- include_tasks: oauth2.yml +- name: Include msmtp tasks + ansible.builtin.include_tasks: msmtp.yml +- name: Include isync tasks + ansible.builtin.include_tasks: isync.yml +# - ansible.builtin.include_tasks: offlineimap.yml +- name: Include mailsync tasks + ansible.builtin.include_tasks: mailsync.yml +- name: Include oauth2 tasks + ansible.builtin.include_tasks: oauth2.yml diff --git a/roles/mail/tasks/msmtp.yml b/roles/mail/tasks/msmtp.yml index cc8e964..d9877f0 100644 --- a/roles/mail/tasks/msmtp.yml +++ b/roles/mail/tasks/msmtp.yml @@ -1,83 +1,110 @@ --- - name: Install msmtp - pacman: name=msmtp-mta state=present + community.general.pacman: + name: msmtp-mta + state: present tags: - msmtp - name: Push msmtp configuration file - copy: src=msmtprc dest=/etc/msmtprc + ansible.builtin.copy: + src: msmtprc + dest: /etc/msmtprc + mode: "0644" tags: - msmtp - name: Verify alias file exists - copy: + ansible.builtin.copy: content: "" dest: /etc/aliases force: false + mode: "0644" tags: - msmtp - name: Set root email alias - lineinfile: "dest=/etc/aliases - regexp=^root - state=present - line='root: {{ user.email }}'" + ansible.builtin.lineinfile: + dest: /etc/aliases + regexp: ^root + state: present + line: "root: {{ user.email }}" when: user.email is defined tags: - msmtp - name: Set user email alias - lineinfile: "dest=/etc/aliases - regexp=^{{ user.name }} - state=present - line='{{ user.name }}: {{ user.email }}'" + ansible.builtin.lineinfile: + dest: /etc/aliases + regexp: ^{{ user.name }} + state: present + line: "{{ user.name }}: {{ user.email }}" when: user.email is defined tags: - msmtp - name: Create cronie systemd unit file directory - file: path=/etc/systemd/system/cronie.service.d state=directory + ansible.builtin.file: + path: /etc/systemd/system/cronie.service.d + state: directory + mode: "0755" tags: - msmtp - cron - name: Override cronie send mail via msmtp - copy: src=cronie-service-msmtp.conf dest=/etc/systemd/system/cronie.service.d/msmtp.conf + ansible.builtin.copy: + src: cronie-service-msmtp.conf + dest: /etc/systemd/system/cronie.service.d/msmtp.conf + mode: "0644" notify: - - reload systemd config - - restart cron + - Reload systemd config + - Restart cron tags: - msmtp - cron - name: Copy msmtpq script - copy: src=/usr/share/doc/msmtp/msmtpq/msmtpq dest=/usr/local/bin/ mode=0755 + ansible.builtin.copy: + src: /usr/share/doc/msmtp/msmtpq/msmtpq + dest: /usr/local/bin/ + mode: "0755" tags: - msmtp - name: Copy msmtp-queue script - copy: src=/usr/share/doc/msmtp/msmtpq/msmtp-queue dest=/usr/local/bin/ mode=0755 + ansible.builtin.copy: + src: /usr/share/doc/msmtp/msmtpq/msmtp-queue + dest: /usr/local/bin/ + mode: "0755" tags: - msmtp - name: Create msmtp queue directory - file: path=/home/{{ user.name }}/.msmtp.queue state=directory mode=0700 owner={{ user.name }} group={{ user.group }} + ansible.builtin.file: + path: /home/{{ user.name }}/.msmtp.queue + state: directory + mode: "0700" + owner: "{{ user.name }}" + group: "{{ user.group }}" tags: - msmtp - name: Disable msmtpq connectivity test - lineinfile: "dest=/usr/local/bin/msmtpq - regexp=^EMAIL_CONN_TEST= - state=present - line='EMAIL_CONN_TEST=x'" + ansible.builtin.lineinfile: + dest: /usr/local/bin/msmtpq + regexp: ^EMAIL_CONN_TEST= + state: present + line: "EMAIL_CONN_TEST=x" tags: - msmtp - name: Set msmtpq log dir - lineinfile: "dest=/usr/local/bin/msmtpq - regexp=^LOG= - state=present - line='LOG=/home/{{ user.name }}/{{ user.log_dir }}/msmtp.queue.log'" + ansible.builtin.lineinfile: + dest: /usr/local/bin/msmtpq + regexp: ^LOG= + state: present + line: "LOG=/home/{{ user.name }}/{{ user.log_dir }}/msmtp.queue.log" when: user.log_dir is defined tags: - msmtp diff --git a/roles/mail/tasks/oauth2.yml b/roles/mail/tasks/oauth2.yml index f842706..fe3752a 100644 --- a/roles/mail/tasks/oauth2.yml +++ b/roles/mail/tasks/oauth2.yml @@ -1,16 +1,16 @@ --- - name: Install cyrus-sasl-xoauth2-git kewlfft.aur.aur: - name: cyrus-sasl-xoauth2-git - become: yes + name: cyrus-sasl-xoauth2-git + become: true become_user: "{{ aur.user }}" tags: - aur -- name: oama-bin +- name: Oama-bin kewlfft.aur.aur: - name: oama-bin - become: yes + name: oama-bin + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/mail/tasks/offlineimap.yml b/roles/mail/tasks/offlineimap.yml index d0e05f6..193ca9e 100644 --- a/roles/mail/tasks/offlineimap.yml +++ b/roles/mail/tasks/offlineimap.yml @@ -1,5 +1,7 @@ --- - name: Install OfflineIMAP - pacman: name=offlineimap state=present + community.general.pacman: + name: offlineimap + state: present tags: - offlineimap diff --git a/roles/mapping/tasks/main.yml b/roles/mapping/tasks/main.yml index 687857e..7fc6207 100644 --- a/roles/mapping/tasks/main.yml +++ b/roles/mapping/tasks/main.yml @@ -1,10 +1,10 @@ --- - name: Install GPXSee - pacman: + community.general.pacman: name: gpxsee state: present - name: Install gpxpy - pacman: + community.general.pacman: name: python-gpxpy state: present diff --git a/roles/media/tasks/beets.yml b/roles/media/tasks/beets.yml index c78eb77..e71fb5f 100644 --- a/roles/media/tasks/beets.yml +++ b/roles/media/tasks/beets.yml @@ -1,6 +1,6 @@ --- - name: Install beets and dependencies - pacman: + community.general.pacman: name: - gst-libav - gst-plugins-bad @@ -21,7 +21,7 @@ - name: Install mp3val kewlfft.aur.aur: name: mp3val - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/media/tasks/darktable.yml b/roles/media/tasks/darktable.yml index 0569e5c..fbadb5d 100644 --- a/roles/media/tasks/darktable.yml +++ b/roles/media/tasks/darktable.yml @@ -1,5 +1,7 @@ --- - name: Install darktable - pacman: name=darktable state=present + community.general.pacman: + name: darktable + state: present tags: - darktable diff --git a/roles/media/tasks/feh.yml b/roles/media/tasks/feh.yml index 1178685..350df0f 100644 --- a/roles/media/tasks/feh.yml +++ b/roles/media/tasks/feh.yml @@ -1,13 +1,16 @@ --- - name: Install feh - pacman: name=feh state=present + community.general.pacman: + name: feh + state: present tags: - feh - name: Jail feh - file: src=/usr/bin/firejail - dest=/usr/local/bin/feh - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/feh + state: link tags: - feh - firejail diff --git a/roles/media/tasks/flac2all.yml b/roles/media/tasks/flac2all.yml index ac3ffe3..e1fb42f 100644 --- a/roles/media/tasks/flac2all.yml +++ b/roles/media/tasks/flac2all.yml @@ -2,7 +2,7 @@ - name: Install flac2all kewlfft.aur.aur: name: flac2all - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/media/tasks/gimp.yml b/roles/media/tasks/gimp.yml index 0a4ee85..9a2003b 100644 --- a/roles/media/tasks/gimp.yml +++ b/roles/media/tasks/gimp.yml @@ -1,11 +1,13 @@ --- - name: Install poppler-glib - pacman: name=poppler-glib state=present + community.general.pacman: + name: poppler-glib + state: present tags: - gimp - name: Install GIMP - pacman: + community.general.pacman: name: - gimp - gimp-plugin-gmic @@ -14,9 +16,10 @@ - gimp - name: Jail GIMP - file: src=/usr/bin/firejail - dest=/usr/local/bin/gimp - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/gimp + state: link tags: - gimp - firejail diff --git a/roles/media/tasks/gthumb.yml b/roles/media/tasks/gthumb.yml index d0e00d7..a0556c4 100644 --- a/roles/media/tasks/gthumb.yml +++ b/roles/media/tasks/gthumb.yml @@ -1,5 +1,7 @@ --- - name: Install gThumb - pacman: name=gthumb state=present + community.general.pacman: + name: gthumb + state: present tags: - gthumb diff --git a/roles/media/tasks/imagemagick.yml b/roles/media/tasks/imagemagick.yml index 9829485..4e7ed98 100644 --- a/roles/media/tasks/imagemagick.yml +++ b/roles/media/tasks/imagemagick.yml @@ -1,6 +1,6 @@ --- - name: Install imagemagick and dependencies - pacman: + community.general.pacman: name: - libraw - libpng diff --git a/roles/media/tasks/imv.yml b/roles/media/tasks/imv.yml index d2c53c4..ea564ed 100644 --- a/roles/media/tasks/imv.yml +++ b/roles/media/tasks/imv.yml @@ -1,5 +1,7 @@ --- - name: Install imv - pacman: name=imv state=present + community.general.pacman: + name: imv + state: present tags: - imv diff --git a/roles/media/tasks/inkscape.yml b/roles/media/tasks/inkscape.yml index 8dbf4a8..12abe3a 100644 --- a/roles/media/tasks/inkscape.yml +++ b/roles/media/tasks/inkscape.yml @@ -1,5 +1,7 @@ --- - name: Install Inkscape - pacman: name=inkscape state=present + community.general.pacman: + name: inkscape + state: present tags: - inkscape diff --git a/roles/media/tasks/main.yml b/roles/media/tasks/main.yml index 9e1986c..9cacdef 100644 --- a/roles/media/tasks/main.yml +++ b/roles/media/tasks/main.yml @@ -1,18 +1,29 @@ --- -- include_tasks: beets.yml -- include_tasks: imagemagick.yml -- include_tasks: inkscape.yml -- include_tasks: gimp.yml -- include_tasks: gthumb.yml -- include_tasks: feh.yml -- include_tasks: imv.yml -- include_tasks: teiler.yml -- include_tasks: flac2all.yml -- include_tasks: darktable.yml -- include_tasks: qcode.yml +- name: Include beets tasks + ansible.builtin.include_tasks: beets.yml +- name: Include ImageMagick tasks + ansible.builtin.include_tasks: imagemagick.yml +- name: Include Inkscape tasks + ansible.builtin.include_tasks: inkscape.yml +- name: Include GIMP tasks + ansible.builtin.include_tasks: gimp.yml +- name: Include gThumb tasks + ansible.builtin.include_tasks: gthumb.yml +- name: Include feh tasks + ansible.builtin.include_tasks: feh.yml +- name: Include imv tasks + ansible.builtin.include_tasks: imv.yml +- name: Include teiler tasks + ansible.builtin.include_tasks: teiler.yml +- name: Include flac2all tasks + ansible.builtin.include_tasks: flac2all.yml +- name: Include Darktable tasks + ansible.builtin.include_tasks: darktable.yml +- name: Include qcode tasks + ansible.builtin.include_tasks: qcode.yml - name: Install misc media codecs and helpers - pacman: + community.general.pacman: name: - flac - lame @@ -25,45 +36,45 @@ state: present - name: Install Metadata Anonymisation Toolkit - pacman: + community.general.pacman: name: mat2 state: present tags: - mat - name: Install yt-dlp - pacman: + community.general.pacman: name: - yt-dlp - yt-dlp-ejs state: present - name: Install zbar - pacman: + community.general.pacman: name: zbar state: present - name: Install sxiv - pacman: + community.general.pacman: name: sxiv state: present - name: Install svgcleaner - pacman: + community.general.pacman: name: svgcleaner state: present - name: Install flameshot - pacman: + community.general.pacman: name: flameshot state: present - name: Install digikam - pacman: + community.general.pacman: name: digikam state: present - name: Install whipper - pacman: + community.general.pacman: name: whipper state: present diff --git a/roles/media/tasks/qcode.yml b/roles/media/tasks/qcode.yml index 2693208..cdc4734 100644 --- a/roles/media/tasks/qcode.yml +++ b/roles/media/tasks/qcode.yml @@ -1,10 +1,15 @@ --- - name: Install qrencode - pacman: name=qrencode state=present + community.general.pacman: + name: qrencode + state: present tags: - qcode - name: Push qcode script - copy: src=qcode.sh dest=/usr/local/bin/qcode mode=0755 + ansible.builtin.copy: + src: qcode.sh + dest: /usr/local/bin/qcode + mode: "0755" tags: - qcode diff --git a/roles/media/tasks/teiler.yml b/roles/media/tasks/teiler.yml index 8494249..c57ce6b 100644 --- a/roles/media/tasks/teiler.yml +++ b/roles/media/tasks/teiler.yml @@ -4,7 +4,7 @@ name: - xininfo-git - teiler-git - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/microcode/tasks/main.yml b/roles/microcode/tasks/main.yml index dca7e4c..297784d 100644 --- a/roles/microcode/tasks/main.yml +++ b/roles/microcode/tasks/main.yml @@ -1,26 +1,28 @@ --- -- name: check if Intel processor - command: grep -q Intel /proc/cpuinfo - register: is_intel - failed_when: is_intel.rc > 1 +- name: Check if Intel processor + ansible.builtin.command: grep -q Intel /proc/cpuinfo + register: microcode_is_intel + changed_when: false + failed_when: microcode_is_intel.rc > 1 -- name: check if AMD processor - command: grep -q AMD /proc/cpuinfo - register: is_amd - failed_when: is_amd.rc > 1 +- name: Check if AMD processor + ansible.builtin.command: grep -q AMD /proc/cpuinfo + register: microcode_is_amd + changed_when: false + failed_when: microcode_is_amd.rc > 1 - name: Install Intel microcode - pacman: + community.general.pacman: name: intel-ucode state: present - when: is_intel.rc == 0 + when: microcode_is_intel.rc == 0 notify: - - rebuild grub + - Rebuild grub - name: Install AMD microcode - pacman: + community.general.pacman: name: amd-ucode state: present - when: is_amd.rc == 0 + when: microcode_is_amd.rc == 0 notify: - - rebuild grub + - Rebuild grub diff --git a/roles/mirrorlist/handlers/main.yml b/roles/mirrorlist/handlers/main.yml index 8436a6c..bc27b43 100644 --- a/roles/mirrorlist/handlers/main.yml +++ b/roles/mirrorlist/handlers/main.yml @@ -1,4 +1,6 @@ --- -- name: restart reflector update - service: name=mirrorlist.timer state=restarted +- name: Restart reflector update + ansible.builtin.service: + name: mirrorlist.timer + state: restarted when: mirrorlist.run_on == "all" diff --git a/roles/mirrorlist/tasks/main.yml b/roles/mirrorlist/tasks/main.yml index 3b863c8..60cb5d2 100644 --- a/roles/mirrorlist/tasks/main.yml +++ b/roles/mirrorlist/tasks/main.yml @@ -1,36 +1,40 @@ --- - name: Install reflector - pacman: - name: reflector - state: present + community.general.pacman: + name: reflector + state: present - name: Push reflector update script - template: - src: reflector-update.sh.j2 - dest: /usr/local/bin/reflector-update - mode: 0755 + ansible.builtin.template: + src: reflector-update.sh.j2 + dest: /usr/local/bin/reflector-update + mode: "0755" - name: Push pacman mirror list update hook - copy: - src: mirrorlist.hook - dest: /etc/pacman.d/hooks/mirrorlist.hook + ansible.builtin.copy: + src: mirrorlist.hook + dest: /etc/pacman.d/hooks/mirrorlist.hook + mode: "0644" - name: Push reflector update service file - copy: - src: reflector-update.service - dest: /etc/systemd/system/ + ansible.builtin.copy: + src: reflector-update.service + dest: /etc/systemd/system/ + mode: "0644" notify: - - reload systemd config + - Reload systemd config - name: Push reflector update timer file - copy: - src: reflector-update.timer - dest: /etc/systemd/system/ + ansible.builtin.copy: + src: reflector-update.timer + dest: /etc/systemd/system/ + mode: "0644" notify: - - reload systemd config - - restart reflector update + - Reload systemd config + - Restart reflector update -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: reflector-update.timer - run_on: "{{ mirrorlist.run_on }}" + unit: reflector-update.timer + run_on: "{{ mirrorlist.run_on }}" diff --git a/roles/mpd/tasks/main.yml b/roles/mpd/tasks/main.yml index 5a5fdd7..78a6779 100644 --- a/roles/mpd/tasks/main.yml +++ b/roles/mpd/tasks/main.yml @@ -1,21 +1,28 @@ --- - name: Install mpd - pacman: name=mpd state=present + community.general.pacman: + name: mpd + state: present - name: Jail mpd - file: src=/usr/bin/firejail - dest=/usr/local/bin/mpd - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/mpd + state: link tags: - firejail - name: Verify mpd firejail local profile exists - copy: content="" dest="/etc/firejail/mpd.local" force=false + ansible.builtin.copy: + content: "" + dest: "/etc/firejail/mpd.local" + force: false + mode: "0644" tags: - firejail - name: Set mpd firejail protocols - lineinfile: + ansible.builtin.lineinfile: dest: /etc/firejail/mpd.local regexp: "^protocol" line: "protocol unix,inet,inet6,netlink" @@ -23,28 +30,39 @@ - firejail - name: Push mpd service file - copy: src=mpd.service dest=/etc/systemd/user/mpd.service + ansible.builtin.copy: + src: mpd.service + dest: /etc/systemd/user/mpd.service + mode: "0644" notify: - - reload systemd config + - Reload systemd config tags: - firejail - name: Install mpc - pacman: name=mpc state=present + community.general.pacman: + name: mpc + state: present - name: Install ncmpcpp - pacman: name=ncmpcpp state=present + community.general.pacman: + name: ncmpcpp + state: present - name: Jail ncmpcpp - file: src=/usr/bin/firejail - dest=/usr/local/bin/ncmpcpp - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/ncmpcpp + state: link tags: - firejail - name: Push ncmpcpp firejail profile - copy: src=firejail/ncmpcpp.profile dest=/usr/local/etc/firejail/ncmpcpp.profile + ansible.builtin.copy: + src: firejail/ncmpcpp.profile + dest: /usr/local/etc/firejail/ncmpcpp.profile + mode: "0644" notify: - - activate firejail profiles + - Activate firejail profiles tags: - firejail diff --git a/roles/mpv/tasks/main.yml b/roles/mpv/tasks/main.yml index 5c08ea4..6539195 100644 --- a/roles/mpv/tasks/main.yml +++ b/roles/mpv/tasks/main.yml @@ -1,13 +1,19 @@ --- - name: Install mpv - pacman: name=mpv state=present + community.general.pacman: + name: mpv + state: present - name: Jail mpv - file: src=/usr/bin/firejail - dest=/usr/local/bin/mpv - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/mpv + state: link tags: - firejail - name: Push play script - copy: src=play.sh dest=/usr/local/bin/play mode=0755 + ansible.builtin.copy: + src: play.sh + dest: /usr/local/bin/play + mode: "0755" diff --git a/roles/nettools/tasks/main.yml b/roles/nettools/tasks/main.yml index d4656f7..652a19c 100644 --- a/roles/nettools/tasks/main.yml +++ b/roles/nettools/tasks/main.yml @@ -1,60 +1,93 @@ --- - name: Install MTR - pacman: name=mtr state=present + community.general.pacman: + name: mtr + state: present - name: Install net-tools - pacman: name=net-tools state=present + community.general.pacman: + name: net-tools + state: present - name: Install bind-tools - pacman: name=bind-tools state=present + community.general.pacman: + name: bind-tools + state: present - name: Install whois - pacman: name=whois state=present + community.general.pacman: + name: whois + state: present - name: Install netcat - pacman: name=openbsd-netcat state=present + community.general.pacman: + name: openbsd-netcat + state: present - name: Install lftp - pacman: name=lftp state=present + community.general.pacman: + name: lftp + state: present - name: Install nmap - pacman: name=nmap state=present + community.general.pacman: + name: nmap + state: present - name: Install tcpdump - pacman: name=tcpdump state=present + community.general.pacman: + name: tcpdump + state: present - name: Install sshuttle - pacman: name=sshuttle state=present + community.general.pacman: + name: sshuttle + state: present - name: Install wireshark - pacman: name=wireshark-qt state=present + community.general.pacman: + name: wireshark-qt + state: present - name: Add user to wireshark group - user: name={{ user.name }} groups=wireshark append=yes + ansible.builtin.user: + name: "{{ user.name }}" + groups: wireshark + append: true tags: - user - name: Install socat - pacman: name=socat state=present + community.general.pacman: + name: socat + state: present - name: Install nethogs - pacman: name=nethogs state=present + community.general.pacman: + name: nethogs + state: present - name: Install bmon - pacman: name=bmon state=present + community.general.pacman: + name: bmon + state: present - name: Install speedtest-cli - pacman: name=speedtest-cli state=present + community.general.pacman: + name: speedtest-cli + state: present - name: Install spiped - pacman: name=spiped state=present + community.general.pacman: + name: spiped + state: present - name: Install wireguard and kernel modules - pacman: + community.general.pacman: name: wireguard-tools state: present - name: Install wget - pacman: + community.general.pacman: name: wget state: present diff --git a/roles/networkmanager/tasks/main.yml b/roles/networkmanager/tasks/main.yml index 272fa7e..52c9675 100644 --- a/roles/networkmanager/tasks/main.yml +++ b/roles/networkmanager/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install NetworkManager and dependencies - pacman: + community.general.pacman: name: - networkmanager - networkmanager-openvpn @@ -10,35 +10,37 @@ state: present - name: Push connectivity check config - template: - src: connectivity.conf.j2 - dest: /etc/NetworkManager/conf.d/20-connectivity.conf + ansible.builtin.template: + src: connectivity.conf.j2 + dest: /etc/NetworkManager/conf.d/20-connectivity.conf + mode: "0644" - name: Push MAC address randomization config - template: - src: random_mac.conf.j2 - dest: /etc/NetworkManager/conf.d/20-random_mac.conf + ansible.builtin.template: + src: random_mac.conf.j2 + dest: /etc/NetworkManager/conf.d/20-random_mac.conf + mode: "0644" - name: Push WiFi/Wired Exclusive dispatcher - copy: + ansible.builtin.copy: src: wifi-wired-exclusive.sh dest: /etc/NetworkManager/dispatcher.d/70-wifi-wired-exclusive - mode: 0755 - when: network.wifi_wired_exclusive is defined and network.wifi_wired_exclusive == True + mode: "0755" + when: network.wifi_wired_exclusive is defined and network.wifi_wired_exclusive - name: Enable and start NetworkManager - service: - name: NetworkManager.service - enabled: yes - state: started + ansible.builtin.service: + name: NetworkManager.service + enabled: true + state: started - name: Enable and start NetworkManager dispatcher - service: - name: NetworkManager-dispatcher.service - enabled: yes - state: started + ansible.builtin.service: + name: NetworkManager-dispatcher.service + enabled: true + state: started - name: Disable dhcpcd service - service: - name: dhcpcd.service - enabled: no + ansible.builtin.service: + name: dhcpcd.service + enabled: false diff --git a/roles/nmtrust/tasks/main.yml b/roles/nmtrust/tasks/main.yml index f5d7243..51812ec 100644 --- a/roles/nmtrust/tasks/main.yml +++ b/roles/nmtrust/tasks/main.yml @@ -1,29 +1,33 @@ --- - name: Install nmtrust kewlfft.aur.aur: - name: nmtrust-git - become: yes + name: nmtrust-git + become: true become_user: "{{ aur.user }}" tags: - aur - name: Create nmtrust config directory - file: - path: /etc/nmtrust - state: directory + ansible.builtin.file: + path: /etc/nmtrust + state: directory + mode: "0755" - name: Push trusted network list - template: - src: trusted_networks.j2 - dest: /etc/nmtrust/trusted_networks + ansible.builtin.template: + src: trusted_networks.j2 + dest: /etc/nmtrust/trusted_networks + mode: "0644" - name: Push excluded network list - template: - src: excluded_networks.j2 - dest: /etc/nmtrust/excluded_networks + ansible.builtin.template: + src: excluded_networks.j2 + dest: /etc/nmtrust/excluded_networks + mode: "0644" - name: Verify trusted unit list exists - copy: - content: "" - dest: /etc/nmtrust/trusted_units - force: false + ansible.builtin.copy: + content: "" + dest: /etc/nmtrust/trusted_units + force: false + mode: "0644" diff --git a/roles/nmtrust/tasks/unit.yml b/roles/nmtrust/tasks/unit.yml index ab99aa3..7ca95b5 100644 --- a/roles/nmtrust/tasks/unit.yml +++ b/roles/nmtrust/tasks/unit.yml @@ -1,63 +1,64 @@ +--- - name: Enable and start {{ unit }} - systemd: - name: "{{ unit }}" - enabled: yes - state: started + ansible.builtin.systemd: + name: "{{ unit }}" + enabled: true + state: started when: run_on == "all" and user_unit is not defined - name: Disable {{ unit }} - systemd: - name: "{{ unit }}" - enabled: no + ansible.builtin.systemd: + name: "{{ unit }}" + enabled: false when: run_on != "all" and user_unit is not defined -- name: Add {{ unit }} to trusted unit list - lineinfile: - dest: /etc/nmtrust/trusted_units - state: present - line: "{{ unit }}" +- name: "Add to trusted unit list: {{ unit }}" + ansible.builtin.lineinfile: + dest: /etc/nmtrust/trusted_units + state: present + line: "{{ unit }}" when: run_on == "trusted" and user_unit is not defined -- name: Remove {{ unit }} from trusted unit list - lineinfile: - dest: /etc/nmtrust/trusted_units - state: absent - line: "{{ unit }}" +- name: "Remove from trusted unit list: {{ unit }}" + ansible.builtin.lineinfile: + dest: /etc/nmtrust/trusted_units + state: absent + line: "{{ unit }}" when: run_on != "trusted" and user_unit is not defined -- name: Enable and start {{ unit }} for user - systemd: - name: "{{ unit }}" - enabled: yes - state: started - scope: user - become: yes +- name: "Enable and start user unit: {{ unit }}" + ansible.builtin.systemd: + name: "{{ unit }}" + enabled: true + state: started + scope: user + become: true become_user: "{{ user.name }}" environment: XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}" - when: run_on == "all" and user_unit is defined and user_unit == true + when: run_on == "all" and user_unit is defined and user_unit -- name: Disable user {{ unit }} for user - systemd: - name: "{{ unit }}" - enabled: no - scope: user - become: yes +- name: "Disable user unit: {{ unit }}" + ansible.builtin.systemd: + name: "{{ unit }}" + enabled: false + scope: user + become: true become_user: "{{ user.name }}" environment: XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}" - when: run_on != "all" and user_unit is defined and user_unit == true + when: run_on != "all" and user_unit is defined and user_unit -- name: Add {{ unit }} for user to trusted unit list - lineinfile: - dest: /etc/nmtrust/trusted_units - state: present - line: "{{ unit }},user:{{ user.name }}" - when: run_on == "trusted" and user_unit is defined and user_unit == true +- name: "Add user unit to trusted unit list: {{ unit }}" + ansible.builtin.lineinfile: + dest: /etc/nmtrust/trusted_units + state: present + line: "{{ unit }},user:{{ user.name }}" + when: run_on == "trusted" and user_unit is defined and user_unit -- name: Remove {{ unit }} for user from trusted unit list - lineinfile: - dest: /etc/nmtrust/trusted_units - state: absent - line: "{{ unit }},user:{{ user.name }}" - when: run_on != "trusted" and user_unit is defined and user_unit == true +- name: "Remove user unit from trusted unit list: {{ unit }}" + ansible.builtin.lineinfile: + dest: /etc/nmtrust/trusted_units + state: absent + line: "{{ unit }},user:{{ user.name }}" + when: run_on != "trusted" and user_unit is defined and user_unit diff --git a/roles/ntp/handlers/main.yml b/roles/ntp/handlers/main.yml index 400b832..29ffa10 100644 --- a/roles/ntp/handlers/main.yml +++ b/roles/ntp/handlers/main.yml @@ -1,3 +1,5 @@ --- -- name: restart chrony - service: name=chronyd.service state=restarted +- name: Restart chrony + ansible.builtin.service: + name: chronyd.service + state: restarted diff --git a/roles/ntp/tasks/main.yml b/roles/ntp/tasks/main.yml index bd2d74f..a76189c 100644 --- a/roles/ntp/tasks/main.yml +++ b/roles/ntp/tasks/main.yml @@ -1,24 +1,25 @@ --- - name: Install chrony - pacman: + community.general.pacman: name: chrony state: present - name: Push chrony configuration file - copy: + ansible.builtin.copy: src: chrony.conf dest: /etc/chrony.conf + mode: "0644" notify: - - restart chrony + - Restart chrony - name: Enable and start chrony - service: + ansible.builtin.service: name: chronyd.service - enabled: yes + enabled: true state: started - name: Push chrony NetworkManager dispatcher - copy: + ansible.builtin.copy: src: chrony-dispatcher.sh dest: /etc/NetworkManager/dispatcher.d/70-chrony - mode: 0755 + mode: "0755" diff --git a/roles/office/tasks/main.yml b/roles/office/tasks/main.yml index 4693782..b6b58cf 100644 --- a/roles/office/tasks/main.yml +++ b/roles/office/tasks/main.yml @@ -1,11 +1,11 @@ --- - name: Install LibreOffice - pacman: + community.general.pacman: name: libreoffice-fresh state: present - name: Jail LibreOffice - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/libreoffice state: link @@ -13,15 +13,16 @@ - firejail - name: Verify LibreOffice firejail local profile exists - copy: + ansible.builtin.copy: content: "" dest: /etc/firejail/libreoffice.local force: false + mode: "0644" tags: - firejail - name: Restrict LibreOffice network access - lineinfile: + ansible.builtin.lineinfile: dest: /etc/firejail/libreoffice.local regexp: "^net" line: "net none" @@ -29,7 +30,7 @@ - firejail - name: Restrict LibreOffice access to /etc - lineinfile: + ansible.builtin.lineinfile: dest: /etc/firejail/libreoffice.local regexp: "^private-etc" line: "private-etc firejail,libreoffice,fonts,passwd" @@ -37,49 +38,49 @@ - firejail - name: Install enscript - pacman: + community.general.pacman: name: enscript state: present - name: Install Simple Scan - pacman: + community.general.pacman: name: simple-scan state: present - name: Install pandoc - pacman: + community.general.pacman: name: pandoc-cli state: present - name: Install texlive-basic - pacman: + community.general.pacman: name: texlive-basic state: present - name: Install texlive-latexextra - pacman: + community.general.pacman: name: texlive-latexextra state: present - name: Install texlive-binextra - pacman: + community.general.pacman: name: texlive-binextra state: present - name: Install qalculate - pacman: + community.general.pacman: name: qalculate-gtk state: present - name: Install GNU Plot - pacman: + community.general.pacman: name: gnuplot state: present - name: Install xsv kewlfft.aur.aur: name: xsv - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur @@ -87,12 +88,12 @@ - name: Install epy kewlfft.aur.aur: name: epy-git - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Install csvkit - pacman: + community.general.pacman: name: csvkit state: present diff --git a/roles/oomd/tasks/main.yml b/roles/oomd/tasks/main.yml index 3696f6e..d4df05d 100644 --- a/roles/oomd/tasks/main.yml +++ b/roles/oomd/tasks/main.yml @@ -1,16 +1,16 @@ --- - name: Install Fedora systemd-oomd configuration kewlfft.aur.aur: - name: systemd-oomd-defaults - become: yes + name: systemd-oomd-defaults + become: true become_user: "{{ aur.user }}" notify: - - reload systemd config + - Reload systemd config tags: - aur - name: Enable and start systemd-oomd - service: + ansible.builtin.service: name: systemd-oomd.service - enabled: yes + enabled: true state: started diff --git a/roles/openresolv/tasks/main.yml b/roles/openresolv/tasks/main.yml index f16612b..9bf417d 100644 --- a/roles/openresolv/tasks/main.yml +++ b/roles/openresolv/tasks/main.yml @@ -1,15 +1,17 @@ --- - name: Install openresolv - pacman: + community.general.pacman: name: openresolv state: present - name: Push resolvconf.conf - template: + ansible.builtin.template: src: resolvconf.conf.j2 dest: /etc/resolvconf.conf + mode: "0644" - name: Push NetworkManager openresolv config. - copy: - src: rc-manager.conf - dest: /etc/NetworkManager/conf.d/20-rc-manager.conf + ansible.builtin.copy: + src: rc-manager.conf + dest: /etc/NetworkManager/conf.d/20-rc-manager.conf + mode: "0644" diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index 4220ea7..bb2cce6 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -1,8 +1,14 @@ --- - name: Install OpenVPN - pacman: name=openvpn state=present + community.general.pacman: + name: openvpn + state: present - name: Allow passwordless OpenVPN for wheel group - template: src=sudo_openvpn.j2 dest=/etc/sudoers.d/02_openvpn mode=440 validate='visudo -cf %s' + ansible.builtin.template: + src: sudo_openvpn.j2 + dest: /etc/sudoers.d/02_openvpn + mode: "0440" + validate: "visudo -cf %s" tags: - sudo diff --git a/roles/optical/tasks/main.yml b/roles/optical/tasks/main.yml index e9ab461..370dbf1 100644 --- a/roles/optical/tasks/main.yml +++ b/roles/optical/tasks/main.yml @@ -1,15 +1,15 @@ --- - name: Install cdrtools - pacman: + community.general.pacman: name: cdrtools state: present - name: Install dvd+rw-tools - pacman: + community.general.pacman: name: dvd+rw-tools state: present - name: Install xfburn - pacman: + community.general.pacman: name: xfburn state: present diff --git a/roles/parcimonie/tasks/main.yml b/roles/parcimonie/tasks/main.yml index e63c780..ef824c6 100644 --- a/roles/parcimonie/tasks/main.yml +++ b/roles/parcimonie/tasks/main.yml @@ -3,18 +3,20 @@ kewlfft.aur.aur: name: parcimonie-sh-git use: makepkg - skip_pgp_check: yes - become: yes + skip_pgp_check: true + become: true become_user: "{{ aur.user }}" tags: - aur - name: Push parcimonie.sh user configuration - template: + ansible.builtin.template: src: user.conf.j2 dest: /etc/parcimonie.sh.d/{{ user.name }}.conf + mode: "0644" -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: "parcimonie.sh@{{ user.name }}.service" - run_on: "{{ tor.run_on }}" + unit: "parcimonie.sh@{{ user.name }}.service" + run_on: "{{ tor.run_on }}" diff --git a/roles/pass/tasks/main.yml b/roles/pass/tasks/main.yml index 2313faf..3c39086 100644 --- a/roles/pass/tasks/main.yml +++ b/roles/pass/tasks/main.yml @@ -1,16 +1,16 @@ --- - name: Install pass - pacman: + community.general.pacman: name: pass state: present - name: Install pass-otp - pacman: + community.general.pacman: name: pass-otp state: present - name: Install rofi-pass - pacman: + community.general.pacman: name: rofi-pass state: present tags: @@ -20,8 +20,8 @@ kewlfft.aur.aur: name: pass-update use: makepkg - skip_pgp_check: yes - become: yes + skip_pgp_check: true + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/pdf/tasks/main.yml b/roles/pdf/tasks/main.yml index c95d07a..ed47cf8 100644 --- a/roles/pdf/tasks/main.yml +++ b/roles/pdf/tasks/main.yml @@ -1,13 +1,13 @@ --- - name: Install Okular - pacman: + community.general.pacman: name: okular state: present tags: - okular - name: Jail Okular - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/okular state: link @@ -16,16 +16,17 @@ - firejail - name: Verify Okular firejail local profile exists - copy: + ansible.builtin.copy: content: "" dest: /etc/firejail/okular.local force: false + mode: "0644" tags: - okular - firejail - name: Restrict Okular network access - lineinfile: + ansible.builtin.lineinfile: dest: /etc/firejail/okular.local regexp: "^net" line: "net none" @@ -34,7 +35,7 @@ - firejail - name: Install Zathura and dependencies - pacman: + community.general.pacman: name: - zathura-cb - zathura-pdf-mupdf @@ -44,7 +45,7 @@ - zathura - name: Set Zathura as default PDF viewer - lineinfile: + ansible.builtin.lineinfile: dest: /etc/xdg/mimeapps.list regexp: "^application/pdf" state: present @@ -53,7 +54,7 @@ - zathura - name: Jail Zathura - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/zathura state: link @@ -61,9 +62,8 @@ - zathura - firejail - - name: Install pdfgrep - pacman: + community.general.pacman: name: pdfgrep state: present tags: @@ -75,14 +75,14 @@ - python-uharfbuzz - python-fpdf2 - ocrmypdf - become: yes + become: true become_user: "{{ aur.user }}" tags: - ocrmypdf - aur - name: Install tesseract-data-eng - pacman: + community.general.pacman: name: tesseract-data-eng state: present tags: diff --git a/roles/pianobar/tasks/main.yml b/roles/pianobar/tasks/main.yml index 5f5c7cd..365c9ef 100644 --- a/roles/pianobar/tasks/main.yml +++ b/roles/pianobar/tasks/main.yml @@ -1,17 +1,23 @@ --- - name: Install pianobar - pacman: name=pianobar state=present + community.general.pacman: + name: pianobar + state: present - name: Jail pianobar - file: src=/usr/bin/firejail - dest=/usr/local/bin/pianobar - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/pianobar + state: link tags: - firejail - name: Push pianobar firejail profile - copy: src=firejail/pianobar.profile dest=/usr/local/etc/firejail/pianobar.profile + ansible.builtin.copy: + src: firejail/pianobar.profile + dest: /usr/local/etc/firejail/pianobar.profile + mode: "0644" notify: - - activate firejail profiles + - Activate firejail profiles tags: - firejail diff --git a/roles/pim/tasks/main.yml b/roles/pim/tasks/main.yml index 840b992..e626d00 100644 --- a/roles/pim/tasks/main.yml +++ b/roles/pim/tasks/main.yml @@ -1,32 +1,33 @@ --- - name: Install pimsync - pacman: + community.general.pacman: name: pimsync state: present - name: Install khard - pacman: + community.general.pacman: name: khard state: present - name: Install khal - pacman: + community.general.pacman: name: khal state: present - name: Install etesync-dav kewlfft.aur.aur: - name: etesync-dav - become: yes + name: etesync-dav + become: true become_user: "{{ aur.user }}" tags: - aur - when: etesync is defined and etesync == True + when: etesync is defined and etesync - name: Push etesync-dav service file - copy: + ansible.builtin.copy: src: etesync-dav.service dest: /etc/systemd/user/etesync-dav.service + mode: "0644" notify: - - reload systemd config - when: etesync is defined and etesync == True + - Reload systemd config + when: etesync is defined and etesync diff --git a/roles/pkgfile/tasks/main.yml b/roles/pkgfile/tasks/main.yml index 81c178d..6f3218d 100644 --- a/roles/pkgfile/tasks/main.yml +++ b/roles/pkgfile/tasks/main.yml @@ -1,10 +1,11 @@ --- - name: Install pkgfile - pacman: - name: pkgfile - state: present + community.general.pacman: + name: pkgfile + state: present -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: pkgfile-update.timer - run_on: "{{ pkgfile.run_on }}" + unit: pkgfile-update.timer + run_on: "{{ pkgfile.run_on }}" diff --git a/roles/postgresql/handlers/main.yml b/roles/postgresql/handlers/main.yml index aaf9cab..2713e72 100644 --- a/roles/postgresql/handlers/main.yml +++ b/roles/postgresql/handlers/main.yml @@ -1,4 +1,6 @@ --- -- name: restart postgresql - service: name=postgresql.service state=restarted - when: postgresql is defined and postgresql.enable is defined and postgresql.enable == True +- name: Restart postgresql + ansible.builtin.service: + name: postgresql.service + state: restarted + when: postgresql is defined and postgresql.enable is defined and postgresql.enable diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml index 92d2623..102ec01 100644 --- a/roles/postgresql/tasks/main.yml +++ b/roles/postgresql/tasks/main.yml @@ -1,43 +1,69 @@ --- - name: Install PostgreSQL - pacman: name=postgresql state=present + community.general.pacman: + name: postgresql + state: present - name: Install psycopg2 - pacman: name=python-psycopg2 state=present + community.general.pacman: + name: python-psycopg2 + state: present - name: Create postgres data root - file: path={{ postgresql.root }}/data state=directory owner=postgres group=postgres + ansible.builtin.file: + path: "{{ postgresql.root }}/data" + state: directory + owner: postgres + group: postgres + mode: "0700" - name: Initialize database cluster - command: initdb --locale en_US.UTF-8 -E UTF8 -D {{ postgresql.root }}/data creates={{ postgresql.root }}/data/postgresql.conf - become: yes + ansible.builtin.command: + cmd: initdb --locale en_US.UTF-8 -E UTF8 -D {{ postgresql.root }}/data + creates: "{{ postgresql.root }}/data/postgresql.conf" + become: true become_user: postgres - name: Disable synchronous commits - lineinfile: dest={{ postgresql.root }}/data/postgresql.conf - regexp=^synchronous_commit - state=present - line="synchronous_commit = off" + ansible.builtin.lineinfile: + dest: "{{ postgresql.root }}/data/postgresql.conf" + regexp: ^synchronous_commit + state: present + line: "synchronous_commit = off" notify: - - restart postgresql + - Restart postgresql - name: Create service override directory - file: path=/etc/systemd/system/postgresql.service.d state=directory + ansible.builtin.file: + path: /etc/systemd/system/postgresql.service.d + state: directory + mode: "0755" - name: Push service override file - template: src=postgresql-override.conf.j2 dest=/etc/systemd/system/postgresql.service.d/override.conf + ansible.builtin.template: + src: postgresql-override.conf.j2 + dest: /etc/systemd/system/postgresql.service.d/override.conf + mode: "0644" notify: - - reload systemd config - - restart postgresql + - Reload systemd config + - Restart postgresql - name: Disable and stop PostgreSQL - service: name=postgresql.service enabled=no state=stopped - when: postgresql is not defined or postgresql.enable is not defined or postgresql.enable != True + ansible.builtin.service: + name: postgresql.service + enabled: false + state: stopped + when: postgresql is not defined or postgresql.enable is not defined or not postgresql.enable - name: Enable and start PostgreSQL - service: name=postgresql.service enabled=yes state=started - when: postgresql is defined and postgresql.enable is defined and postgresql.enable == True + ansible.builtin.service: + name: postgresql.service + enabled: true + state: started + when: postgresql is defined and postgresql.enable is defined and postgresql.enable - name: Create the PostgreSQL user - postgresql_user: name={{ user.name }} role_attr_flags=CREATEDB,NOSUPERUSER - when: postgresql is defined and postgresql.enable is defined and postgresql.enable == True + community.postgresql.postgresql_user: + name: "{{ user.name }}" + role_attr_flags: CREATEDB,NOSUPERUSER + when: postgresql is defined and postgresql.enable is defined and postgresql.enable diff --git a/roles/pydev/tasks/main.yml b/roles/pydev/tasks/main.yml index ff30801..2603325 100644 --- a/roles/pydev/tasks/main.yml +++ b/roles/pydev/tasks/main.yml @@ -1,25 +1,25 @@ --- - name: Install pipenv - pacman: - name: python-pipenv - state: present + community.general.pacman: + name: python-pipenv + state: present - name: Install pyenv - pacman: - name: pyenv - state: present + community.general.pacman: + name: pyenv + state: present - name: Install ruff - pacman: - name: ruff - state: present + community.general.pacman: + name: ruff + state: present - name: Install uv - pacman: - name: uv - state: present + community.general.pacman: + name: uv + state: present - name: Install documentation - pacman: - name: python-docs - state: present + community.general.pacman: + name: python-docs + state: present diff --git a/roles/radio/tasks/main.yml b/roles/radio/tasks/main.yml index 45d2200..6affa69 100644 --- a/roles/radio/tasks/main.yml +++ b/roles/radio/tasks/main.yml @@ -1,14 +1,16 @@ --- - name: Install GNUradio - pacman: + community.general.pacman: name: gnuradio state: present - name: Install hamlib - pacman: + community.general.pacman: name: hamlib state: present -- include_tasks: rtl-sdr.yml -#- include_tasks: radio_mgmt.yml -- include_tasks: radio_ops.yml +- name: Include RTL-SDR tasks + ansible.builtin.include_tasks: rtl-sdr.yml +- name: Include radio ops tasks + ansible.builtin.include_tasks: radio_ops.yml +# - ansible.builtin.include_tasks: radio_mgmt.yml diff --git a/roles/radio/tasks/radio_mgmt.yml b/roles/radio/tasks/radio_mgmt.yml index 2b07f77..f549143 100644 --- a/roles/radio/tasks/radio_mgmt.yml +++ b/roles/radio/tasks/radio_mgmt.yml @@ -4,7 +4,7 @@ name: - hamradio-menus - chirp-daily - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/radio/tasks/radio_ops.yml b/roles/radio/tasks/radio_ops.yml index f10d3cb..ed2a867 100644 --- a/roles/radio/tasks/radio_ops.yml +++ b/roles/radio/tasks/radio_ops.yml @@ -6,7 +6,7 @@ - flxmlrpc - fldigi - flrig - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur @@ -14,7 +14,7 @@ - name: Install wsjtx kewlfft.aur.aur: name: wsjtx - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/radio/tasks/rtl-sdr.yml b/roles/radio/tasks/rtl-sdr.yml index b44a708..7823b43 100644 --- a/roles/radio/tasks/rtl-sdr.yml +++ b/roles/radio/tasks/rtl-sdr.yml @@ -2,7 +2,7 @@ - name: Install rtl-sdr-git kewlfft.aur.aur: name: rtl-sdr-git - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur @@ -10,7 +10,7 @@ - name: Install gr-ais-git kewlfft.aur.aur: name: gr-ais-git - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/redshift/tasks/main.yml b/roles/redshift/tasks/main.yml index 45c62f4..0e11356 100644 --- a/roles/redshift/tasks/main.yml +++ b/roles/redshift/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install RedShift and dependencies - pacman: + community.general.pacman: name: - librsvg - python-gobject @@ -9,7 +9,7 @@ state: present - name: Jail RedShift - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/redshift state: link @@ -17,7 +17,7 @@ - firejail - name: Jail RedShift GTK - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/redshift-gtk state: link @@ -25,10 +25,11 @@ - firejail - name: Push RedShift GTK firejail profile - copy: + ansible.builtin.copy: src: firejail/redshift-gtk.profile dest: /usr/local/etc/firejail/redshift-gtk.profile + mode: "0644" notify: - - activate firejail profiles + - Activate firejail profiles tags: - firejail diff --git a/roles/regdomain/tasks/main.yml b/roles/regdomain/tasks/main.yml index a37d2a8..e0c35e4 100644 --- a/roles/regdomain/tasks/main.yml +++ b/roles/regdomain/tasks/main.yml @@ -1,11 +1,11 @@ --- - name: Install wireless-regdb - pacman: + community.general.pacman: name: wireless-regdb state: present - name: Set wireless regulatory domain - lineinfile: + ansible.builtin.lineinfile: dest: /etc/conf.d/wireless-regdom regexp: ^WIRELESS_REGDOM state: present diff --git a/roles/ripgrep/tasks/main.yml b/roles/ripgrep/tasks/main.yml index 9c435c9..fa4fd90 100644 --- a/roles/ripgrep/tasks/main.yml +++ b/roles/ripgrep/tasks/main.yml @@ -1,10 +1,10 @@ --- - name: Install ripgrep - pacman: + community.general.pacman: name: ripgrep state: present - name: Install ripgrep-all - pacman: + community.general.pacman: name: ripgrep-all state: present diff --git a/roles/rtorrent/tasks/main.yml b/roles/rtorrent/tasks/main.yml index 591207d..ca5aa07 100644 --- a/roles/rtorrent/tasks/main.yml +++ b/roles/rtorrent/tasks/main.yml @@ -1,10 +1,13 @@ --- - name: Install rtorrent - pacman: name=rtorrent state=present + community.general.pacman: + name: rtorrent + state: present - name: Jail rtorrent - file: src=/usr/bin/firejail - dest=/usr/local/bin/rtorrent - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/rtorrent + state: link tags: - firejail diff --git a/roles/screensaver/tasks/main.yml b/roles/screensaver/tasks/main.yml index 907ad1a..e6dc984 100644 --- a/roles/screensaver/tasks/main.yml +++ b/roles/screensaver/tasks/main.yml @@ -2,30 +2,31 @@ - name: Install xautolock kewlfft.aur.aur: name: xautolock - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Install i3lock - pacman: + community.general.pacman: name: i3lock state: present - name: Push lock script - copy: + ansible.builtin.copy: src: lock.sh dest: /usr/local/bin/lock - mode: 0755 + mode: "0755" - name: Push screen lock service file - copy: + ansible.builtin.copy: src: screenlock.service dest: /etc/systemd/system/screenlock@.service + mode: "0644" notify: - - reload systemd config + - Reload systemd config - name: Enable screen lock service - service: + ansible.builtin.service: name: "screenlock@{{ user.name }}.service" - enabled: yes + enabled: true diff --git a/roles/signal/tasks/main.yml b/roles/signal/tasks/main.yml index 5334ca6..df780a3 100644 --- a/roles/signal/tasks/main.yml +++ b/roles/signal/tasks/main.yml @@ -1,11 +1,11 @@ --- - name: Install signal-desktop - pacman: + community.general.pacman: name: signal-desktop state: present - name: Jail signal-desktop - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/signal-desktop state: link diff --git a/roles/sound/handlers/main.yml b/roles/sound/handlers/main.yml index 7b96790..5069821 100644 --- a/roles/sound/handlers/main.yml +++ b/roles/sound/handlers/main.yml @@ -1,10 +1,10 @@ --- -- name: restart pulse as user - systemd: +- name: Restart pulse as user + ansible.builtin.systemd: name: pipewire-pulse.service scope: user state: restarted - become: yes + become: true become_user: "{{ user.name }}" environment: XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}" diff --git a/roles/sound/tasks/main.yml b/roles/sound/tasks/main.yml index 626c639..cdd630d 100644 --- a/roles/sound/tasks/main.yml +++ b/roles/sound/tasks/main.yml @@ -1,16 +1,16 @@ --- - name: Install alsa-utils - pacman: + community.general.pacman: name: alsa-utils state: present - name: Install sof-firmware - pacman: + community.general.pacman: name: sof-firmware state: present - name: Install Pipewire - pacman: + community.general.pacman: name: - pipewire - pipewire-pulse @@ -18,21 +18,21 @@ state: present - name: Install pasystray - pacman: + community.general.pacman: name: pasystray state: present - name: Install easyeffects - pacman: + community.general.pacman: name: easyeffects state: present - name: Install Linux Studio Plugins - pacman: + community.general.pacman: name: lsp-plugins state: present - name: Install calf studio gear - pacman: + community.general.pacman: name: calf state: present diff --git a/roles/spell/tasks/main.yml b/roles/spell/tasks/main.yml index 27a47d3..9628c7b 100644 --- a/roles/spell/tasks/main.yml +++ b/roles/spell/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install hunspell - pacman: + community.general.pacman: name: - hunspell - hunspell-en_US @@ -9,7 +9,7 @@ - hunspell - name: Install aspell - pacman: + community.general.pacman: name: - aspell - aspell-en diff --git a/roles/ssd/tasks/main.yml b/roles/ssd/tasks/main.yml index 60935d0..f280ec6 100644 --- a/roles/ssd/tasks/main.yml +++ b/roles/ssd/tasks/main.yml @@ -1,6 +1,11 @@ --- - name: Install hdparm - pacman: name=hdparm state=present + community.general.pacman: + name: hdparm + state: present - name: Enable and start weekly filesystem TRIM timer - service: name=fstrim.timer enabled=yes state=started + ansible.builtin.service: + name: fstrim.timer + enabled: true + state: started diff --git a/roles/ssh/handlers/main.yml b/roles/ssh/handlers/main.yml index 6018910..03812bd 100644 --- a/roles/ssh/handlers/main.yml +++ b/roles/ssh/handlers/main.yml @@ -1,6 +1,6 @@ --- -- name: restart sshd - service: +- name: Restart sshd + ansible.builtin.service: name: sshd.service state: restarted - when: ssh.enable_sshd == True + when: ssh.enable_sshd diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml index 629ff61..097cbed 100644 --- a/roles/ssh/tasks/main.yml +++ b/roles/ssh/tasks/main.yml @@ -1,78 +1,81 @@ --- - name: Install OpenSSH - pacman: + community.general.pacman: name: openssh state: present - name: Push OpenSSH daemon configuration file - template: + ansible.builtin.template: src: sshd_config.j2 dest: /etc/ssh/sshd_config + mode: "0644" notify: - - restart sshd + - Restart sshd - name: Enable and start OpenSSH - service: + ansible.builtin.service: name: sshd.service - enabled: yes + enabled: true state: started - when: ssh.enable_sshd is defined and ssh.enable_sshd == True + when: ssh.enable_sshd is defined and ssh.enable_sshd - name: Disable and stop OpenSSH - service: + ansible.builtin.service: name: sshd.service - enabled: no + enabled: false state: stopped - when: ssh.enable_sshd is defined and ssh.enable_sshd == False + when: ssh.enable_sshd is defined and not ssh.enable_sshd - name: Install sshfs - pacman: + community.general.pacman: name: sshfs state: present - name: Install autossh - pacman: + community.general.pacman: name: autossh state: present - name: Copy fuse configuration file - copy: + ansible.builtin.copy: src: fuse.conf dest: /etc/fuse.conf + mode: "0644" - name: Install keychain - pacman: + community.general.pacman: name: keychain state: present - name: Install x11-ask-pass - pacman: + community.general.pacman: name: x11-ssh-askpass state: present - name: Export SSH_ASKPASS environment variable - lineinfile: + ansible.builtin.lineinfile: dest: /etc/profile state: present line: "export SSH_ASKPASS=\"/usr/lib/ssh/x11-ssh-askpass\"" - name: Make directory for user SSH key - file: + ansible.builtin.file: path: /home/{{ user.name }}/.ssh state: directory owner: "{{ user.name }}" group: "{{ user.group }}" + mode: "0700" - name: Install user SSH key - copy: + ansible.builtin.copy: src: "{{ ssh.user_key }}" dest: /home/{{ user.name }}/.ssh/id_rsa - mode: 600 - owner: "{{ user.name }}" - group: "{{ user.group }}" + mode: "0600" + owner: "{{ user.name }}" + ansible.builtin.group: "{{ user.group }}" when: ssh.user_key is defined - name: Install Mosh - pacman: + community.general.pacman: name: mosh state: present diff --git a/roles/syncthing/tasks/main.yml b/roles/syncthing/tasks/main.yml index cf80c71..7bd648a 100644 --- a/roles/syncthing/tasks/main.yml +++ b/roles/syncthing/tasks/main.yml @@ -1,9 +1,12 @@ --- - name: Install syncthing - pacman: name=syncthing state=present + community.general.pacman: + name: syncthing + state: present -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: syncthing.service - run_on: "{{ syncthing.run_on }}" - user_unit: true + unit: syncthing.service + run_on: "{{ syncthing.run_on }}" + user_unit: true diff --git a/roles/sysctl/handlers/main.yml b/roles/sysctl/handlers/main.yml index 170c231..15d21fd 100644 --- a/roles/sysctl/handlers/main.yml +++ b/roles/sysctl/handlers/main.yml @@ -1,3 +1,4 @@ --- -- name: reload sysctl - command: sysctl --system +- name: Reload sysctl + ansible.builtin.command: sysctl --system + changed_when: false diff --git a/roles/sysmon/tasks/main.yml b/roles/sysmon/tasks/main.yml index ec9c771..a04e1bd 100644 --- a/roles/sysmon/tasks/main.yml +++ b/roles/sysmon/tasks/main.yml @@ -1,40 +1,40 @@ --- - name: Install sysstat - pacman: + community.general.pacman: name: sysstat state: present - name: Install glances - pacman: + community.general.pacman: name: glances state: present - name: Install btop - pacman: + community.general.pacman: name: btop state: present - name: Install htop - pacman: + community.general.pacman: name: htop state: present - name: Install lsof - pacman: + community.general.pacman: name: lsof state: present - name: Install strace - pacman: + community.general.pacman: name: strace state: present - name: Install smartmontools - pacman: + community.general.pacman: name: smartmontools state: present - name: Install progress - pacman: + community.general.pacman: name: progress state: present diff --git a/roles/systemd/handlers/main.yml b/roles/systemd/handlers/main.yml index aa45a8e..76e5e69 100644 --- a/roles/systemd/handlers/main.yml +++ b/roles/systemd/handlers/main.yml @@ -1,10 +1,13 @@ --- -- name: reload systemd config - command: systemctl daemon-reload +- name: Reload systemd config + ansible.builtin.systemd: + daemon_reload: true -- name: reload user systemd config - command: systemctl --user daemon-reload - become: yes +- name: Reload user systemd config + ansible.builtin.systemd: + daemon_reload: true + scope: user + become: true become_user: "{{ user.name }}" environment: XDG_RUNTIME_DIR: "/run/user/{{ user.uid }}" diff --git a/roles/tarsnap/handlers/main.yml b/roles/tarsnap/handlers/main.yml index d1cb9aa..9e02a97 100644 --- a/roles/tarsnap/handlers/main.yml +++ b/roles/tarsnap/handlers/main.yml @@ -1,4 +1,6 @@ --- -- name: restart tarsnapper - service: name=tarsnapper.timer state=restarted +- name: Restart tarsnapper + ansible.builtin.service: + name: tarsnapper.timer + state: restarted when: tarsnapper.run_on == "all" diff --git a/roles/tarsnap/tasks/main.yml b/roles/tarsnap/tasks/main.yml index b95d116..192d94a 100644 --- a/roles/tarsnap/tasks/main.yml +++ b/roles/tarsnap/tasks/main.yml @@ -1,21 +1,23 @@ --- - name: Install Tarsnap - pacman: + community.general.pacman: name: tarsnap state: present - name: Copy default Tarsnap config - copy: + ansible.builtin.copy: src: /etc/tarsnap/tarsnap.conf.sample dest: /etc/tarsnap/tarsnap.conf + mode: "0644" - name: Create Tarsnap cache dir - file: + ansible.builtin.file: path: /usr/local/tarsnap-cache state: directory + mode: "0700" - name: Humanize Tarsnap numbers - lineinfile: + ansible.builtin.lineinfile: dest: /etc/tarsnap/tarsnap.conf state: present line: humanize-numbers @@ -23,37 +25,42 @@ - name: Install tarsnapper kewlfft.aur.aur: name: tarsnapper - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Create Tarsnapper config include dir - file: + ansible.builtin.file: path: /usr/local/etc/tarsnapper.d/ state: directory + mode: "0755" - name: Push Tarsnapper config - template: + ansible.builtin.template: src: tarsnapper.conf.j2 dest: /usr/local/etc/tarsnapper.conf + mode: "0644" - name: Push Tarsnapper service file - template: + ansible.builtin.template: src: tarsnapper.service.j2 dest: /etc/systemd/system/tarsnapper.service + mode: "0644" notify: - - reload systemd config + - Reload systemd config - name: Push Tarsnapper timer file - template: + ansible.builtin.template: src: tarsnapper.timer.j2 dest: /etc/systemd/system/tarsnapper.timer + mode: "0644" notify: - - reload systemd config - - restart tarsnapper + - Reload systemd config + - Restart tarsnapper -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: tarsnapper.timer - run_on: "{{ tarsnapper.run_on }}" + unit: tarsnapper.timer + run_on: "{{ tarsnapper.run_on }}" diff --git a/roles/taskwarrior/handlers/main.yml b/roles/taskwarrior/handlers/main.yml index 7acf84f..799d59a 100644 --- a/roles/taskwarrior/handlers/main.yml +++ b/roles/taskwarrior/handlers/main.yml @@ -1,5 +1,6 @@ --- -- name: refresh holidays - command: /usr/share/doc/timew/holidays/refresh +- name: Refresh holidays + ansible.builtin.command: /usr/share/doc/timew/holidays/refresh args: - chdir: /usr/share/doc/timew/holidays + chdir: /usr/share/doc/timew/holidays + changed_when: true diff --git a/roles/taskwarrior/tasks/main.yml b/roles/taskwarrior/tasks/main.yml index 940e4ef..da8eeb0 100644 --- a/roles/taskwarrior/tasks/main.yml +++ b/roles/taskwarrior/tasks/main.yml @@ -1,16 +1,20 @@ --- - name: Install taskwarrior - pacman: name=task state=present + community.general.pacman: + name: task + state: present - name: Install timewarrior - pacman: name=timew state=present + community.general.pacman: + name: timew + state: present notify: - - refresh holidays + - Refresh holidays - name: Install taskopen kewlfft.aur.aur: name: taskopen - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur diff --git a/roles/terminal/tasks/main.yml b/roles/terminal/tasks/main.yml index a103537..57ab4c8 100644 --- a/roles/terminal/tasks/main.yml +++ b/roles/terminal/tasks/main.yml @@ -1,5 +1,5 @@ --- - name: Install {{ terminal }} - pacman: + community.general.pacman: name: "{{ terminal }}" state: present diff --git a/roles/thinkpad/tasks/main.yml b/roles/thinkpad/tasks/main.yml index fddca53..5d7bcbf 100644 --- a/roles/thinkpad/tasks/main.yml +++ b/roles/thinkpad/tasks/main.yml @@ -1,20 +1,31 @@ --- - name: Install fprintd - pacman: name=fprintd state=present + community.general.pacman: + name: fprintd + state: present tags: - fingerprint - name: Push sudo authentication file - template: src=pam.d/sudo.j2 dest=/etc/pam.d/sudo + ansible.builtin.template: + src: pam.d/sudo.j2 + dest: /etc/pam.d/sudo + mode: "0644" tags: - fingerprint - name: Push i3lock authentication file - template: src=pam.d/i3lock.j2 dest=/etc/pam.d/i3lock + ansible.builtin.template: + src: pam.d/i3lock.j2 + dest: /etc/pam.d/i3lock + mode: "0644" tags: - fingerprint - name: Push trackpoint udev rules - copy: src=10-trackpoint.rules dest=/etc/udev/rules.d/10-trackpoint.rules + ansible.builtin.copy: + src: 10-trackpoint.rules + dest: /etc/udev/rules.d/10-trackpoint.rules + mode: "0644" tags: - trackpoint diff --git a/roles/tor/tasks/main.yml b/roles/tor/tasks/main.yml index 0517777..9c258da 100644 --- a/roles/tor/tasks/main.yml +++ b/roles/tor/tasks/main.yml @@ -1,12 +1,13 @@ --- - name: Install Tor - pacman: + community.general.pacman: name: - tor - torsocks state: present -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: tor.service - run_on: "{{ tor.run_on }}" + unit: tor.service + run_on: "{{ tor.run_on }}" diff --git a/roles/transmission/tasks/main.yml b/roles/transmission/tasks/main.yml index 3f7e518..3936865 100644 --- a/roles/transmission/tasks/main.yml +++ b/roles/transmission/tasks/main.yml @@ -1,10 +1,13 @@ --- - name: Install transmission - pacman: name=transmission-gtk state=present + community.general.pacman: + name: transmission-gtk + state: present - name: Jail transmission - file: src=/usr/bin/firejail - dest=/usr/local/bin/transmission-gtk - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/transmission-gtk + state: link tags: - firejail diff --git a/roles/udisks/tasks/main.yml b/roles/udisks/tasks/main.yml index 4f45380..720ed14 100644 --- a/roles/udisks/tasks/main.yml +++ b/roles/udisks/tasks/main.yml @@ -1,15 +1,28 @@ --- - name: Install udisks2 - pacman: name=udisks2 state=present + community.general.pacman: + name: udisks2 + state: present - name: Configure auto mount - template: src=10-udisks.rules.j2 dest=/etc/udev/rules.d/10-udisks.rules + ansible.builtin.template: + src: 10-udisks.rules.j2 + dest: /etc/udev/rules.d/10-udisks.rules + mode: "0644" - name: Verify /media exists - file: path=/media state=directory + ansible.builtin.file: + path: /media + state: directory + mode: "0755" - name: Configure mount location - template: src=99-udisks2.rules.j2 dest=/etc/udev/rules.d/99-udisks2.rules + ansible.builtin.template: + src: 99-udisks2.rules.j2 + dest: /etc/udev/rules.d/99-udisks2.rules + mode: "0644" - name: Install udiskie - pacman: name=udiskie state=present + community.general.pacman: + name: udiskie + state: present diff --git a/roles/unbound/handlers/main.yml b/roles/unbound/handlers/main.yml index b0d9051..3c07fb8 100644 --- a/roles/unbound/handlers/main.yml +++ b/roles/unbound/handlers/main.yml @@ -1,7 +1,11 @@ --- -- name: restart unbound - service: name=unbound state=restarted +- name: Restart unbound + ansible.builtin.service: + name: unbound + state: restarted -- name: restart roothints - service: name=roothints.timer state=restarted +- name: Restart roothints + ansible.builtin.service: + name: roothints.timer + state: restarted when: unbound.roothints_update == "all" diff --git a/roles/unbound/tasks/main.yml b/roles/unbound/tasks/main.yml index 5f0f720..40e8a48 100644 --- a/roles/unbound/tasks/main.yml +++ b/roles/unbound/tasks/main.yml @@ -1,50 +1,56 @@ --- - name: Install Unbound - pacman: + community.general.pacman: name: unbound state: present - name: Download root hints - get_url: + ansible.builtin.get_url: url: https://www.internic.net/domain/named.cache dest: /etc/unbound/root.hints - force: yes + force: true + mode: "0644" - name: Verify unbound resolvconf config file exists - copy: + ansible.builtin.copy: content: "" dest: /etc/unbound/resolvconf.conf force: false + mode: "0644" - name: Copy Unbound configuration file - template: + ansible.builtin.template: src: unbound.conf.j2 dest: /etc/unbound/unbound.conf + mode: "0644" notify: - - restart unbound + - Restart unbound - name: Enable and start Unbound - service: + ansible.builtin.service: name: unbound.service - enabled: yes + enabled: true state: started - name: Push Unbound root hits update service file - copy: + ansible.builtin.copy: src: roothints.service dest: /etc/systemd/system/roothints.service + mode: "0644" notify: - - reload systemd config + - Reload systemd config - name: Push Unbound root hits update timer file - copy: + ansible.builtin.copy: src: roothints.timer dest: /etc/systemd/system/roothints.timer + mode: "0644" notify: - - reload systemd config - - restart roothints + - Reload systemd config + - Restart roothints -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: roothints.timer - run_on: "{{ unbound.roothints_update }}" + unit: roothints.timer + run_on: "{{ unbound.roothints_update }}" diff --git a/roles/units/tasks/main.yml b/roles/units/tasks/main.yml index a6eaaed..ca943e1 100644 --- a/roles/units/tasks/main.yml +++ b/roles/units/tasks/main.yml @@ -3,13 +3,14 @@ kewlfft.aur.aur: name: units use: makepkg - skip_pgp_check: yes - become: yes + skip_pgp_check: true + become: true become_user: "{{ aur.user }}" tags: - aur -- include_tasks: roles/nmtrust/tasks/unit.yml +- name: Include nmtrust unit tasks + ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml vars: - unit: units_currency.timer - run_on: "{{ units.run_on }}" + unit: units_currency.timer + run_on: "{{ units.run_on }}" diff --git a/roles/virtualbox/tasks/main.yml b/roles/virtualbox/tasks/main.yml index 1f36499..71dcc34 100644 --- a/roles/virtualbox/tasks/main.yml +++ b/roles/virtualbox/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install VirtualBox and dependencies - pacman: + community.general.pacman: name: - net-tools - virtualbox @@ -11,12 +11,15 @@ - name: Install VirtualBox extensions kewlfft.aur.aur: name: virtualbox-ext-oracle - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Add the user to vboxusers group - user: name={{ user.name }} groups=vboxusers append=yes + ansible.builtin.user: + name: "{{ user.name }}" + groups: vboxusers + append: true tags: - user diff --git a/roles/virtualenv/tasks/main.yml b/roles/virtualenv/tasks/main.yml index 7c56bc8..fc6bf75 100644 --- a/roles/virtualenv/tasks/main.yml +++ b/roles/virtualenv/tasks/main.yml @@ -1,14 +1,25 @@ --- - name: Install virtualenv and virtualenvwrapper - pacman: name=python-virtualenvwrapper state=present + community.general.pacman: + name: python-virtualenvwrapper + state: present - name: Create system environment group - group: name=env state=present + ansible.builtin.group: + name: env + state: present - name: Add user to system environment group - user: name={{ user.name }} groups=env append=yes + ansible.builtin.user: + name: "{{ user.name }}" + groups: env + append: true tags: - user - name: Create system environment dir - file: path=/usr/local/env state=directory group=env mode=2775 + ansible.builtin.file: + path: /usr/local/env + state: directory + group: env + mode: "02775" diff --git a/roles/visidata/tasks/main.yml b/roles/visidata/tasks/main.yml index ac36745..3cd2dda 100644 --- a/roles/visidata/tasks/main.yml +++ b/roles/visidata/tasks/main.yml @@ -1,7 +1,6 @@ --- - - name: Install visidata and libraries - pacman: + community.general.pacman: name: - visidata - python-lxml @@ -12,21 +11,23 @@ state: present - name: Push visidata desktop file - copy: + ansible.builtin.copy: src: visidata.desktop dest: /usr/local/share/applications/visidata.desktop + mode: "0644" - name: Verify mimeapps.list exists - copy: + ansible.builtin.copy: content: "" dest: /etc/xdg/mimeapps.list force: false + mode: "0644" - name: Set visidata as default application for relevant mimetypes - lineinfile: + ansible.builtin.lineinfile: dest: /etc/xdg/mimeapps.list regexp: "{{ item.regexp }}" line: "{{ item.line }}" with_items: - - { regexp: '^text/csv=', line: 'text/csv=visidata.desktop' } - - { regexp: '^text/tab-separated-values=', line: 'text/tab-separated-values=visidata.desktop' } + - { regexp: "^text/csv=", line: "text/csv=visidata.desktop" } + - { regexp: "^text/tab-separated-values=", line: "text/tab-separated-values=visidata.desktop" } diff --git a/roles/vopono/tasks/main.yml b/roles/vopono/tasks/main.yml index 6757cbe..ab39788 100644 --- a/roles/vopono/tasks/main.yml +++ b/roles/vopono/tasks/main.yml @@ -2,17 +2,17 @@ - name: Install Vopono kewlfft.aur.aur: name: vopono - become: yes + become: true become_user: "{{ aur.user }}" tags: - aur - name: Allow passwordless Vopono for wheel group - copy: + ansible.builtin.copy: src: sudo_vopono dest: /etc/sudoers.d/03_vopono - mode: 440 - validate: 'visudo -cf %s' + mode: "0440" + validate: "visudo -cf %s" tags: - aur - sudo diff --git a/roles/weechat/tasks/main.yml b/roles/weechat/tasks/main.yml index 7426483..c8d9df9 100644 --- a/roles/weechat/tasks/main.yml +++ b/roles/weechat/tasks/main.yml @@ -1,13 +1,18 @@ --- - name: Install weechat - pacman: name=weechat state=present + community.general.pacman: + name: weechat + state: present - name: Jail weechat - file: src=/usr/bin/firejail - dest=/usr/local/bin/weechat - state=link + ansible.builtin.file: + src: /usr/bin/firejail + dest: /usr/local/bin/weechat + state: link tags: - firejail - name: Install dunst - pacman: name=dunst state=present + community.general.pacman: + name: dunst + state: present diff --git a/roles/wormhole/tasks/main.yml b/roles/wormhole/tasks/main.yml index 5ee1868..55e6f24 100644 --- a/roles/wormhole/tasks/main.yml +++ b/roles/wormhole/tasks/main.yml @@ -1,11 +1,11 @@ --- - name: Install magic-wormhole - pacman: + community.general.pacman: name: magic-wormhole state: present - name: Jail magic-wormhole - file: + ansible.builtin.file: src: /usr/bin/firejail dest: /usr/local/bin/wormhole state: link @@ -13,10 +13,11 @@ - firejail - name: Push magic-wormhole firejail profile - copy: + ansible.builtin.copy: src: firejail/wormhole.profile dest: /usr/local/etc/firejail/wormhole.profile + mode: "0644" notify: - - activate firejail profiles + - Activate firejail profiles tags: - firejail diff --git a/roles/wttr/tasks/main.yml b/roles/wttr/tasks/main.yml index dcd7d43..0e5d38f 100644 --- a/roles/wttr/tasks/main.yml +++ b/roles/wttr/tasks/main.yml @@ -1,3 +1,6 @@ --- - name: Push wttr script - copy: src=wttr.sh dest=/usr/local/bin/wttr mode=0755 + ansible.builtin.copy: + src: wttr.sh + dest: /usr/local/bin/wttr + mode: "0755" diff --git a/roles/x/tasks/autorandr.yml b/roles/x/tasks/autorandr.yml index 91b1696..a2300b5 100644 --- a/roles/x/tasks/autorandr.yml +++ b/roles/x/tasks/autorandr.yml @@ -1,6 +1,6 @@ --- - name: Install autorandr - pacman: + community.general.pacman: name: autorandr state: present tags: diff --git a/roles/x/tasks/main.yml b/roles/x/tasks/main.yml index 6b39265..f9d6aca 100644 --- a/roles/x/tasks/main.yml +++ b/roles/x/tasks/main.yml @@ -1,57 +1,86 @@ --- - name: Install Xorg - pacman: name=xorg-server state=present + community.general.pacman: + name: xorg-server + state: present - name: Install Xinit - pacman: name=xorg-xinit state=present + community.general.pacman: + name: xorg-xinit + state: present - name: Install xmodmap - pacman: name=xorg-xmodmap state=present + community.general.pacman: + name: xorg-xmodmap + state: present - name: Install xdpyinfo - pacman: name=xorg-xdpyinfo state=present + community.general.pacman: + name: xorg-xdpyinfo + state: present - name: Install xev - pacman: name=xorg-xev state=present + community.general.pacman: + name: xorg-xev + state: present - name: Install xorg-sessreg - pacman: name=xorg-sessreg state=present + community.general.pacman: + name: xorg-sessreg + state: present - name: Install xorg-xwininfo - pacman: name=xorg-xwininfo state=present + community.general.pacman: + name: xorg-xwininfo + state: present - name: Install xautomation - pacman: name=xautomation state=present + community.general.pacman: + name: xautomation + state: present - name: Install xcalib - pacman: + community.general.pacman: name: xcalib state: present - name: Install video driver(s) - pacman: + community.general.pacman: name: "{{ video_drivers }}" state: present when: video_drivers is defined - name: Add user to video group - user: name={{ user.name }} groups=video append=yes + ansible.builtin.user: + name: "{{ user.name }}" + groups: video + append: true tags: - user - name: Enable middle-click scrolling - template: src=30-scroll.conf dest=/etc/X11/xorg.conf.d/30-scroll.conf + ansible.builtin.template: + src: 30-scroll.conf + dest: /etc/X11/xorg.conf.d/30-scroll.conf + mode: "0644" when: libinput.middle_click_scroll is defined tags: - libinput - name: Remap mouse buttons - template: src=30-button_mapping.conf dest=/etc/X11/xorg.conf.d/30-button_mapping.conf + ansible.builtin.template: + src: 30-button_mapping.conf + dest: /etc/X11/xorg.conf.d/30-button_mapping.conf + mode: "0644" when: libinput.button_mapping is defined tags: - libinput -- include_tasks: sxhkd.yml -- include_tasks: unclutter.yml -- include_tasks: autorandr.yml -- include_tasks: xdg.yml +- name: Include sxhkd tasks + ansible.builtin.include_tasks: sxhkd.yml +- name: Include unclutter tasks + ansible.builtin.include_tasks: unclutter.yml +- name: Include autorandr tasks + ansible.builtin.include_tasks: autorandr.yml +- name: Include XDG tasks + ansible.builtin.include_tasks: xdg.yml diff --git a/roles/x/tasks/sxhkd.yml b/roles/x/tasks/sxhkd.yml index f9c084c..4f60f15 100644 --- a/roles/x/tasks/sxhkd.yml +++ b/roles/x/tasks/sxhkd.yml @@ -1,5 +1,7 @@ --- - name: Install sxhkd - pacman: name=sxhkd state=present + community.general.pacman: + name: sxhkd + state: present tags: - sxhkd diff --git a/roles/x/tasks/unclutter.yml b/roles/x/tasks/unclutter.yml index f71f54e..d85feb0 100644 --- a/roles/x/tasks/unclutter.yml +++ b/roles/x/tasks/unclutter.yml @@ -1,5 +1,7 @@ --- - name: Install unclutter - pacman: name=unclutter state=present + community.general.pacman: + name: unclutter + state: present tags: - unclutter diff --git a/roles/x/tasks/xdg.yml b/roles/x/tasks/xdg.yml index d94cb2b..6c5b119 100644 --- a/roles/x/tasks/xdg.yml +++ b/roles/x/tasks/xdg.yml @@ -1,17 +1,22 @@ --- - name: Install xdg-user-dirs - pacman: name=xdg-user-dirs state=present + community.general.pacman: + name: xdg-user-dirs + state: present tags: - xdg - name: Create user directories - command: /usr/bin/xdg-user-dirs-update - become: yes + ansible.builtin.command: /usr/bin/xdg-user-dirs-update + become: true become_user: "{{ user.name }}" + changed_when: false tags: - xdg - name: Install perl-file-mimeinfo - pacman: name=perl-file-mimeinfo state=present + community.general.pacman: + name: perl-file-mimeinfo + state: present tags: - xdg diff --git a/roles/yubikey/tasks/main.yml b/roles/yubikey/tasks/main.yml index 31d4cb1..289c4d4 100644 --- a/roles/yubikey/tasks/main.yml +++ b/roles/yubikey/tasks/main.yml @@ -1,16 +1,16 @@ --- - name: Install YubiKey Personalization GUI - pacman: + community.general.pacman: name: yubikey-personalization-gui state: present - name: Install YubiKey Manager - pacman: + community.general.pacman: name: yubikey-manager state: present - name: Install smartcard libs/tools - pacman: + community.general.pacman: name: - pcsclite - libusb-compat diff --git a/roles/zeal/tasks/main.yml b/roles/zeal/tasks/main.yml index e0b699e..f4b1e3b 100644 --- a/roles/zeal/tasks/main.yml +++ b/roles/zeal/tasks/main.yml @@ -1,5 +1,5 @@ --- - name: Install zeal - pacman: - name: zeal - state: present + community.general.pacman: + name: zeal + state: present