From 8eeb3e77a6a549dce7d316deeb3c32ce26910d5f Mon Sep 17 00:00:00 2001 From: Ariejan de Vroom Date: Fri, 7 Jun 2024 09:04:58 +0200 Subject: [PATCH] Fix linting stuff --- .ansible-lint | 2 +- .gitea/workflows/lint.yml | 2 +- .gitignore | 1 + .yamllint.yml | 4 ++-- group_vars/all.yml | 5 +++-- main.yml | 6 +++--- requirements.yml | 2 +- roles/02_basics/tasks/main.yml | 2 +- roles/03_wayland/tasks/main.yml | 2 +- roles/04_desktop/tasks/main.yml | 2 +- roles/05_packages/tasks/aur.yml | 2 +- roles/05_packages/tasks/flatpak.yml | 2 +- roles/05_packages/tasks/fonts.yml | 2 +- roles/05_packages/tasks/main.yml | 4 ++-- roles/07_user/tasks/main.yml | 8 ++++---- 15 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 .gitignore diff --git a/.ansible-lint b/.ansible-lint index 00eba7e..b278e81 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -4,4 +4,4 @@ enable_list: warn_list: - role-name - var-naming - - yaml[truthy] \ No newline at end of file + - yaml[truthy] diff --git a/.gitea/workflows/lint.yml b/.gitea/workflows/lint.yml index 0c8d894..564a945 100644 --- a/.gitea/workflows/lint.yml +++ b/.gitea/workflows/lint.yml @@ -43,4 +43,4 @@ jobs: ansible-lint --version yamllint --version yamllint --format parsable . - ansible-lint -v \ No newline at end of file + ansible-lint -v diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1d74e21 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode/ diff --git a/.yamllint.yml b/.yamllint.yml index 3593e6f..9904816 100644 --- a/.yamllint.yml +++ b/.yamllint.yml @@ -2,7 +2,7 @@ extends: default ignore: | - .github/workflows/main.yml + .gitea/workflows/lint.yml rules: braces: @@ -14,4 +14,4 @@ rules: - "yes" - "true" - "no" - - "false" \ No newline at end of file + - "false" diff --git a/group_vars/all.yml b/group_vars/all.yml index 3b8eb80..9a1c7da 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -1,3 +1,4 @@ +--- user: name: ariejan password: $1$$$CW5QNaFq/vWd019fB9a/H. @@ -5,7 +6,7 @@ user: primary_group: users additional_groups: docker,wheel shell: /bin/zsh - country: Netherlands + country: Netherlands pacman: parallel_downloads: 10 @@ -78,4 +79,4 @@ base_fonts: - otf-cascadia-code - ttf-cascadia-code - ttf-hack - - ttf-hack-nerd \ No newline at end of file + - ttf-hack-nerd diff --git a/main.yml b/main.yml index 70aeac9..fb88be4 100644 --- a/main.yml +++ b/main.yml @@ -2,9 +2,9 @@ - name: Ariejan's Arch Linux hosts: all roles: - - { role: 01_host_info } - - { role: 02_basics } + - { role: 01_host_info } + - { role: 02_basics } - { role: 03_wayland } - { role: 04_desktop } - { role: 05_packages } - - { role: 07_user } \ No newline at end of file + - { role: 07_user } diff --git a/requirements.yml b/requirements.yml index f6c7b31..8ee13d5 100644 --- a/requirements.yml +++ b/requirements.yml @@ -5,4 +5,4 @@ collections: source: https://galaxy.ansible.com - name: kewlfft.aur version: 0.11.1 - source: https://galaxy.ansible.com \ No newline at end of file + source: https://galaxy.ansible.com diff --git a/roles/02_basics/tasks/main.yml b/roles/02_basics/tasks/main.yml index c171491..6d6e172 100644 --- a/roles/02_basics/tasks/main.yml +++ b/roles/02_basics/tasks/main.yml @@ -41,4 +41,4 @@ community.general.pacman: update_cache: yes upgrade: yes - become: true \ No newline at end of file + become: true diff --git a/roles/03_wayland/tasks/main.yml b/roles/03_wayland/tasks/main.yml index 2f2692f..e290fbd 100644 --- a/roles/03_wayland/tasks/main.yml +++ b/roles/03_wayland/tasks/main.yml @@ -68,4 +68,4 @@ - opencl-nvidia state: present become: true - when: "'nvidia' in gpu_result.stdout.lower()" \ No newline at end of file + when: "'nvidia' in gpu_result.stdout.lower()" diff --git a/roles/04_desktop/tasks/main.yml b/roles/04_desktop/tasks/main.yml index 0b009d2..0b103c1 100644 --- a/roles/04_desktop/tasks/main.yml +++ b/roles/04_desktop/tasks/main.yml @@ -17,4 +17,4 @@ ansible.builtin.systemd: name: gdm.service enabled: yes - become: true \ No newline at end of file + become: true diff --git a/roles/05_packages/tasks/aur.yml b/roles/05_packages/tasks/aur.yml index 3bb00b5..f978fc3 100644 --- a/roles/05_packages/tasks/aur.yml +++ b/roles/05_packages/tasks/aur.yml @@ -27,4 +27,4 @@ state: present use: "{{ aur_helper }}" become: true - become_user: aur_builder \ No newline at end of file + become_user: aur_builder diff --git a/roles/05_packages/tasks/flatpak.yml b/roles/05_packages/tasks/flatpak.yml index 2bbd76e..78f7781 100644 --- a/roles/05_packages/tasks/flatpak.yml +++ b/roles/05_packages/tasks/flatpak.yml @@ -12,4 +12,4 @@ state: present remote: flathub become: true - become_user: "{{ user.name }}" \ No newline at end of file + become_user: "{{ user.name }}" diff --git a/roles/05_packages/tasks/fonts.yml b/roles/05_packages/tasks/fonts.yml index a232657..73cd7f1 100644 --- a/roles/05_packages/tasks/fonts.yml +++ b/roles/05_packages/tasks/fonts.yml @@ -3,4 +3,4 @@ community.general.pacman: name: "{{ base_fonts }}" state: present - become: true \ No newline at end of file + become: true diff --git a/roles/05_packages/tasks/main.yml b/roles/05_packages/tasks/main.yml index 25c9d0d..0dc0aff 100644 --- a/roles/05_packages/tasks/main.yml +++ b/roles/05_packages/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install Arch packages - ansible.builtin.pacman: + community.general.pacman: name: "{{ packages }}" state: present become: true @@ -12,4 +12,4 @@ ansible.builtin.import_tasks: aur.yml - name: Install flatpaks - ansible.builtin.import_tasks: flatpak.yml \ No newline at end of file + ansible.builtin.import_tasks: flatpak.yml diff --git a/roles/07_user/tasks/main.yml b/roles/07_user/tasks/main.yml index 6ae3caf..5b69bd9 100644 --- a/roles/07_user/tasks/main.yml +++ b/roles/07_user/tasks/main.yml @@ -1,13 +1,13 @@ --- - name: Make sure we have a 'wheel' group - group: + ansible.builtin.group: name: wheel state: present - + - name: Create user ansible.builtin.user: name: "{{ user.name }}" - # Use: openssl passwd -salt -1 + # Use: openssl passwd -salt <salt> -1 <plaintext> password: "{{ user.password }}" update_password: on_create comment: "{{ user.full_name }}" @@ -24,4 +24,4 @@ content: "{{ user.name }} ALL=(ALL:ALL) ALL" mode: 0440 validate: /usr/sbin/visudo -cf %s - become: true \ No newline at end of file + become: true