diff options
40 files changed, 91 insertions, 91 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ee6fcde..fbcc9fff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: with: python-version: "3.13" - name: Install dependencies - run: pip3 install ansible-core==2.19.3 molecule==25.9.0 molecule-plugins[docker,podman]==25.8.12 + run: pip3 install ansible-core==2.20.1 molecule==25.9.0 molecule-plugins[docker,podman]==25.8.12 - name: Remove encrypted var files run: | rm host_vars/*.yml diff --git a/roles/ag/tasks/main.yml b/roles/ag/tasks/main.yml index 37171d32..92f9b8f9 100644 --- a/roles/ag/tasks/main.yml +++ b/roles/ag/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure the silver searcher (ag) is installed" become: true diff --git a/roles/bash/tasks/main.yml b/roles/bash/tasks/main.yml index 475581ee..fbecafa6 100644 --- a/roles/bash/tasks/main.yml +++ b/roles/bash/tasks/main.yml @@ -14,6 +14,6 @@ modification_time: "preserve" access_time: "preserve" loop: - - "{{ ansible_env.HOME }}/.bashrc" - - "{{ ansible_env.HOME }}/.bash_profile" - - "{{ ansible_env.HOME }}/.profile" + - "{{ ansible_facts['env'].HOME }}/.bashrc" + - "{{ ansible_facts['env'].HOME }}/.bash_profile" + - "{{ ansible_facts['env'].HOME }}/.profile" diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index facd6d18..66d55105 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Install Docker" become: true @@ -18,6 +18,6 @@ - name: "Add user to docker group" become: true ansible.builtin.user: - name: "{{ ansible_user_id }}" + name: "{{ ansible_facts['user_id'] }}" groups: "docker" append: true diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml index c8646cd0..9f6cead1 100644 --- a/roles/dotfiles/tasks/main.yml +++ b/roles/dotfiles/tasks/main.yml @@ -2,7 +2,7 @@ - name: "Clone dotfiles git repo" ansible.builtin.git: repo: "{{ dotfiles_repo_url }}" - dest: "{{ ansible_env.HOME }}/.rc" + dest: "{{ ansible_facts['env'].HOME }}/.rc" clone: true update: false single_branch: true diff --git a/roles/firefox/tasks/main.yml b/roles/firefox/tasks/main.yml index a412df0c..b013432f 100644 --- a/roles/firefox/tasks/main.yml +++ b/roles/firefox/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_distribution | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['distribution'] | lower }}.yml" - name: "Ensure firefox is installed" become: true diff --git a/roles/firefox/vars/archlinux.yml b/roles/firefox/vars/archlinux.yml index 54fc1838..ac5ed73b 100644 --- a/roles/firefox/vars/archlinux.yml +++ b/roles/firefox/vars/archlinux.yml @@ -1,6 +1,6 @@ --- firefox_package: "firefox" -firefox_folder: "{{ ansible_env.HOME }}/.mozilla/firefox" +firefox_folder: "{{ ansible_facts['env'].HOME }}/.mozilla/firefox" firefox_browserpass_packages: - "browserpass" diff --git a/roles/firefox/vars/debian.yml b/roles/firefox/vars/debian.yml index 423ba11c..b0318d09 100644 --- a/roles/firefox/vars/debian.yml +++ b/roles/firefox/vars/debian.yml @@ -1,6 +1,6 @@ --- firefox_package: "firefox-esr" -firefox_folder: "{{ ansible_env.HOME }}/.mozilla/firefox" +firefox_folder: "{{ ansible_facts['env'].HOME }}/.mozilla/firefox" firefox_browserpass_packages: - "webext-browserpass" diff --git a/roles/firefox/vars/ubuntu.yml b/roles/firefox/vars/ubuntu.yml index 7f624e48..bb92bf72 100644 --- a/roles/firefox/vars/ubuntu.yml +++ b/roles/firefox/vars/ubuntu.yml @@ -1,6 +1,6 @@ --- firefox_package: "firefox" -firefox_folder: "{{ ansible_env.HOME }}/snap/firefox/common/.mozilla/firefox" +firefox_folder: "{{ ansible_facts['env'].HOME }}/snap/firefox/common/.mozilla/firefox" firefox_browserpass_packages: - "webext-browserpass" diff --git a/roles/font/tasks/main.yml b/roles/font/tasks/main.yml index 6a6e19b1..ab266c2b 100644 --- a/roles/font/tasks/main.yml +++ b/roles/font/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure fontconfig is installed" become: true diff --git a/roles/gcc/tasks/main.yml b/roles/gcc/tasks/main.yml index 92cb96dd..30849b9e 100644 --- a/roles/gcc/tasks/main.yml +++ b/roles/gcc/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure gcc is installed" become: true diff --git a/roles/gettext/tasks/main.yml b/roles/gettext/tasks/main.yml index 1b3caa8f..64b4654f 100644 --- a/roles/gettext/tasks/main.yml +++ b/roles/gettext/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure envsubst is installed" become: true diff --git a/roles/gnome/tasks/main.yml b/roles/gnome/tasks/main.yml index 5b9eee94..7a7ba73c 100644 --- a/roles/gnome/tasks/main.yml +++ b/roles/gnome/tasks/main.yml @@ -1,9 +1,9 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_distribution | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['distribution'] | lower }}.yml" - name: "Include OS-specific tasks" - ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_tasks: "install-{{ ansible_facts['os_family'] | lower }}.yml" - name: "Configure gnome font" ansible.builtin.command: diff --git a/roles/go/tasks/main.yml b/roles/go/tasks/main.yml index f29e6c2d..06f4308f 100644 --- a/roles/go/tasks/main.yml +++ b/roles/go/tasks/main.yml @@ -11,8 +11,8 @@ block: - name: "Set go facts" ansible.builtin.set_fact: - go_arch: "{{ 'amd64' if ansible_architecture == 'x86_64' else 'arm64' }}" - go_platform: "{{ ansible_system | lower }}" + go_arch: "{{ 'amd64' if ansible_facts['architecture'] == 'x86_64' else 'arm64' }}" + go_platform: "{{ ansible_facts['system'] | lower }}" - name: "Download Go" ansible.builtin.get_url: @@ -29,7 +29,7 @@ - name: "Add Go to shell profile" ansible.builtin.blockinfile: - path: "{{ ansible_env.HOME }}/.bashrc" + path: "{{ ansible_facts['env'].HOME }}/.bashrc" state: "present" prepend_newline: true append_newline: true diff --git a/roles/gpg/tasks/main.yml b/roles/gpg/tasks/main.yml index 98b52ad2..3b830c83 100644 --- a/roles/gpg/tasks/main.yml +++ b/roles/gpg/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure gpg is installed" become: true diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml index 30db5c83..3e29489b 100644 --- a/roles/grafana/tasks/main.yml +++ b/roles/grafana/tasks/main.yml @@ -1,9 +1,9 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Include OS-specific installation tasks" - ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_tasks: "install-{{ ansible_facts['os_family'] | lower }}.yml" - name: "Create grafana group" become: true diff --git a/roles/hyprcursor/tasks/main.yml b/roles/hyprcursor/tasks/main.yml index ee93accf..2ca1366f 100644 --- a/roles/hyprcursor/tasks/main.yml +++ b/roles/hyprcursor/tasks/main.yml @@ -7,19 +7,19 @@ - name: "Ensure icons directory exists" ansible.builtin.file: - path: "{{ ansible_env.HOME }}/.local/share/icons" + path: "{{ ansible_facts['env'].HOME }}/.local/share/icons" state: "directory" mode: "0755" - name: "Check if cursor theme exists" ansible.builtin.stat: - path: "{{ ansible_env.HOME }}/.local/share/icons/{{ hyprcursor_variant }}" + path: "{{ ansible_facts['env'].HOME }}/.local/share/icons/{{ hyprcursor_variant }}" register: hyprcursor_theme_dir - name: "Download and extract banana cursor" ansible.builtin.unarchive: # yamllint disable-line src: "https://github.com/ful1e5/banana-cursor/releases/download/{{ hyprcursor_version }}/{{ hyprcursor_variant }}.tar.xz" - dest: "{{ ansible_env.HOME }}/.local/share/icons" + dest: "{{ ansible_facts['env'].HOME }}/.local/share/icons" remote_src: true when: not hyprcursor_theme_dir.stat.exists diff --git a/roles/hyprland/tasks/main.yml b/roles/hyprland/tasks/main.yml index 151003a7..451adb01 100644 --- a/roles/hyprland/tasks/main.yml +++ b/roles/hyprland/tasks/main.yml @@ -35,7 +35,7 @@ state: "directory" mode: "0755" loop: - - "{{ ansible_env.HOME }}/.config/hypr" + - "{{ ansible_facts['env'].HOME }}/.config/hypr" - name: "Configure system defaults" become: true diff --git a/roles/hyprtheme/tasks/main.yml b/roles/hyprtheme/tasks/main.yml index 7686df0d..09835eee 100644 --- a/roles/hyprtheme/tasks/main.yml +++ b/roles/hyprtheme/tasks/main.yml @@ -12,20 +12,20 @@ - name: "Create current theme directory" ansible.builtin.file: - path: "{{ ansible_env.HOME }}/.config/hyprtheme/current" + path: "{{ ansible_facts['env'].HOME }}/.config/hyprtheme/current" state: "directory" mode: "0755" - name: "Create themes directory" ansible.builtin.file: - path: "{{ ansible_env.HOME }}/.config/hyprtheme/themes/{{ item }}" + path: "{{ ansible_facts['env'].HOME }}/.config/hyprtheme/themes/{{ item }}" state: "directory" mode: "0755" loop: "{{ hyprtheme_themes }}" - name: "Create scripts directory" ansible.builtin.file: - path: "{{ ansible_env.HOME }}/.config/hyprtheme/scripts" + path: "{{ ansible_facts['env'].HOME }}/.config/hyprtheme/scripts" state: "directory" mode: "0755" @@ -38,7 +38,7 @@ - name: "Copy theme scripts" ansible.builtin.copy: src: "{{ item }}" - dest: "{{ ansible_env.HOME }}/.config/hyprtheme/{{ item }}" + dest: "{{ ansible_facts['env'].HOME }}/.config/hyprtheme/{{ item }}" mode: "0755" loop: - "scripts/theme-set" @@ -51,6 +51,6 @@ # This will ignore the errors in the script, because the script restarts some hyprland services, which # will fail on ssh connection, but having the theme files placed in the right directory will make sure that # the first setup of hyprtheme is working and doesn't show errors on first boot - cmd: "{{ ansible_env.HOME }}/.config/hyprtheme/scripts/theme-set {{ hyprtheme_default_theme }}" - creates: "{{ ansible_env.HOME }}/.config/hyprtheme/current/hyprland.conf" + cmd: "{{ ansible_facts['env'].HOME }}/.config/hyprtheme/scripts/theme-set {{ hyprtheme_default_theme }}" + creates: "{{ ansible_facts['env'].HOME }}/.config/hyprtheme/current/hyprland.conf" failed_when: false diff --git a/roles/hyprtheme/tasks/template-theme.yml b/roles/hyprtheme/tasks/template-theme.yml index bf6df935..ef3323ff 100644 --- a/roles/hyprtheme/tasks/template-theme.yml +++ b/roles/hyprtheme/tasks/template-theme.yml @@ -19,7 +19,7 @@ - name: "Template theme files for: {{ hyprtheme_name }}" ansible.builtin.template: src: "theme/{{ file }}.j2" - dest: "{{ ansible_env.HOME }}/.config/hyprtheme/themes/{{ hyprtheme_name }}/{{ file }}" + dest: "{{ ansible_facts['env'].HOME }}/.config/hyprtheme/themes/{{ hyprtheme_name }}/{{ file }}" mode: "0644" loop: "{{ hyprtheme_theme_files }}" loop_control: @@ -35,7 +35,7 @@ - name: "Copy static theme files for: {{ hyprtheme_name }}" ansible.builtin.copy: src: "themes/{{ hyprtheme_name }}/" - dest: "{{ ansible_env.HOME }}/.config/hyprtheme/themes/{{ hyprtheme_name }}/" + dest: "{{ ansible_facts['env'].HOME }}/.config/hyprtheme/themes/{{ hyprtheme_name }}/" mode: "0644" tags: # This is ignored because it is possible that some themes (ex. matte-black), would provide diff --git a/roles/locales/tasks/main.yml b/roles/locales/tasks/main.yml index e68426af..f4ef8f1b 100644 --- a/roles/locales/tasks/main.yml +++ b/roles/locales/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure locales package is installed" become: true diff --git a/roles/nautilus/tasks/main.yml b/roles/nautilus/tasks/main.yml index 82b6304a..76eaf0b3 100644 --- a/roles/nautilus/tasks/main.yml +++ b/roles/nautilus/tasks/main.yml @@ -11,7 +11,7 @@ ansible.builtin.command: cmd: "gsettings set {{ item.key }} {{ item.value }}" environment: - DBUS_SESSION_BUS_ADDRESS: "unix:path=/run/user/{{ ansible_user_uid }}/bus" + DBUS_SESSION_BUS_ADDRESS: "unix:path=/run/user/{{ ansible_facts['user_uid'] }}/bus" changed_when: false loop: - key: "org.gnome.nautilus.preferences default-folder-viewer" @@ -28,9 +28,9 @@ cmd: "xdg-user-dirs-update --set {{ item.name }} {{ item.path }}" changed_when: false loop: - - { name: "DESKTOP", path: "{{ ansible_env.HOME }}/Desktop" } - - { name: "DOCUMENTS", path: "{{ ansible_env.HOME }}/Documents" } - - { name: "DOWNLOAD", path: "{{ ansible_env.HOME }}/Downloads" } - - { name: "MUSIC", path: "{{ ansible_env.HOME }}/Music" } - - { name: "PICTURES", path: "{{ ansible_env.HOME }}/Pictures" } - - { name: "VIDEOS", path: "{{ ansible_env.HOME }}/Videos" } + - { name: "DESKTOP", path: "{{ ansible_facts['env'].HOME }}/Desktop" } + - { name: "DOCUMENTS", path: "{{ ansible_facts['env'].HOME }}/Documents" } + - { name: "DOWNLOAD", path: "{{ ansible_facts['env'].HOME }}/Downloads" } + - { name: "MUSIC", path: "{{ ansible_facts['env'].HOME }}/Music" } + - { name: "PICTURES", path: "{{ ansible_facts['env'].HOME }}/Pictures" } + - { name: "VIDEOS", path: "{{ ansible_facts['env'].HOME }}/Videos" } diff --git a/roles/network/handlers/main.yml b/roles/network/handlers/main.yml index 8bd5cdec..45306362 100644 --- a/roles/network/handlers/main.yml +++ b/roles/network/handlers/main.yml @@ -3,7 +3,7 @@ become: true ansible.builtin.systemd_service: daemon_reload: true - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] - name: "Restart NetworkManager" become: true @@ -11,7 +11,7 @@ name: "NetworkManager" enabled: true state: "restarted" - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] - name: "Restart systemd-resolved" become: true @@ -19,5 +19,5 @@ name: "systemd-resolved" enabled: true state: "restarted" - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] failed_when: false diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index a3483891..394ec688 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -1,9 +1,9 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_distribution | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['distribution'] | lower }}.yml" - name: "Include OS-specific tasks" - ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_tasks: "install-{{ ansible_facts['os_family'] | lower }}.yml" - name: "Validate network_ipv4_* params" ansible.builtin.assert: @@ -28,14 +28,14 @@ enabled: true state: "started" loop: "{{ network_enabled_services }}" - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] - name: "(chroot): Ensure network enabled services are enabled" ansible.builtin.command: cmd: "systemctl enable {{ item }}" changed_when: true loop: "{{ network_enabled_services }}" - when: ansible_is_chroot + when: ansible_facts['is_chroot'] # noqa: command-instead-of-module module doesn't work inside chroot - name: "Ensure network disabled services are masked" @@ -45,14 +45,14 @@ masked: true state: "stopped" loop: "{{ network_disabled_services }}" - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] - name: "(chroot): Ensure network disabled services are masked" ansible.builtin.command: cmd: "systemctl mask {{ item }}" changed_when: true loop: "{{ network_disabled_services }}" - when: ansible_is_chroot + when: ansible_facts['is_chroot'] # noqa: command-instead-of-module module doesn't work inside chroot - name: "Configure NetworkManager" diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml index c58d0c02..9cc8906f 100644 --- a/roles/nginx/defaults/main.yml +++ b/roles/nginx/defaults/main.yml @@ -1,5 +1,5 @@ --- -nginx_server_name: "{{ ansible_hostname }}.local" +nginx_server_name: "{{ ansible_facts['hostname'] }}.local" nginx_worker_processes: 2 nginx_worker_connections: 512 nginx_ssl_certificate: "/etc/ssl/certs/nginx-selfsigned.crt" diff --git a/roles/nginx/meta/argument_specs.yml b/roles/nginx/meta/argument_specs.yml index 18b8de89..2964c3a8 100644 --- a/roles/nginx/meta/argument_specs.yml +++ b/roles/nginx/meta/argument_specs.yml @@ -7,7 +7,7 @@ argument_specs: nginx_server_name: type: "str" description: "The server name for nginx configuration" - default: "{{ ansible_hostname }}.local" + default: "{{ ansible_facts['hostname'] }}.local" nginx_worker_processes: type: "int" description: "Number of nginx worker processes" diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index 7af4515d..f913272e 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure nginx is installed" become: true diff --git a/roles/password_policy/tasks/main.yml b/roles/password_policy/tasks/main.yml index 5d51bf16..b8ee7b62 100644 --- a/roles/password_policy/tasks/main.yml +++ b/roles/password_policy/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure password_policy package is installed" become: true @@ -14,7 +14,7 @@ src: "archlinux-pam-pw.j2" dest: "/etc/pam.d/system-auth" mode: "0644" - when: ansible_os_family == "Archlinux" + when: ansible_facts['os_family'] == "Archlinux" - name: "Configure debian password policy" become: true @@ -22,4 +22,4 @@ src: "debian-pam-pw.j2" dest: "/etc/pam.d/common-password" mode: "0644" - when: ansible_os_family == "Debian" + when: ansible_facts['os_family'] == "Debian" diff --git a/roles/password_store/tasks/main.yml b/roles/password_store/tasks/main.yml index f25364a2..be15bc7d 100644 --- a/roles/password_store/tasks/main.yml +++ b/roles/password_store/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure pass packages are installed" become: true @@ -11,7 +11,7 @@ - name: "Clone password store git repo" ansible.builtin.git: repo: "{{ password_store_repo_url }}" - dest: "{{ ansible_env.HOME }}/.password-store" + dest: "{{ ansible_facts['env'].HOME }}/.password-store" clone: true update: false single_branch: true diff --git a/roles/pipewire/tasks/main.yml b/roles/pipewire/tasks/main.yml index 8ef80004..535197d0 100644 --- a/roles/pipewire/tasks/main.yml +++ b/roles/pipewire/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific tasks" - ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_tasks: "install-{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure pulseaudio services are masked" ansible.builtin.systemd_service: diff --git a/roles/podman/tasks/main.yml b/roles/podman/tasks/main.yml index 74b608ee..a9b555f4 100644 --- a/roles/podman/tasks/main.yml +++ b/roles/podman/tasks/main.yml @@ -14,20 +14,20 @@ - name: "Configure Podman for rootless operation" ansible.builtin.command: - cmd: "loginctl enable-linger {{ ansible_user_uid }}" + cmd: "loginctl enable-linger {{ ansible_facts['user_uid'] }}" become: true changed_when: false failed_when: false - name: "Create containers configuration directory" ansible.builtin.file: - path: "{{ ansible_env.HOME }}/.config/containers" + path: "{{ ansible_facts['env'].HOME }}/.config/containers" state: "directory" mode: "0755" - name: "Configure Podman containers.conf" ansible.builtin.copy: - dest: "{{ ansible_env.HOME }}/.config/containers/containers.conf" + dest: "{{ ansible_facts['env'].HOME }}/.config/containers/containers.conf" mode: "0644" content: | [containers] diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index e08767fe..e4c8c6f5 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Create prometheus group" become: true diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml index c267b93c..3b41d8aa 100644 --- a/roles/python/tasks/main.yml +++ b/roles/python/tasks/main.yml @@ -1,10 +1,10 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Check if uv binary exists" ansible.builtin.stat: - path: "{{ ansible_env.HOME }}/.local/bin/uv" + path: "{{ ansible_facts['env'].HOME }}/.local/bin/uv" register: python_uv_binary - name: "Download uv installer" @@ -18,12 +18,12 @@ ansible.builtin.command: cmd: "/tmp/install_uv.sh" args: - creates: "{{ ansible_env.HOME }}/.local/bin/uv" + creates: "{{ ansible_facts['env'].HOME }}/.local/bin/uv" when: not python_uv_binary.stat.exists - name: "Add uv to shell profile" ansible.builtin.blockinfile: - path: "{{ ansible_env.HOME }}/.bashrc" + path: "{{ ansible_facts['env'].HOME }}/.bashrc" state: "present" prepend_newline: true append_newline: true diff --git a/roles/rust/tasks/main.yml b/roles/rust/tasks/main.yml index 20ec930c..640e4785 100644 --- a/roles/rust/tasks/main.yml +++ b/roles/rust/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "Check if cargo binary exists" ansible.builtin.stat: - path: "{{ ansible_env.HOME }}/.cargo/bin/cargo" + path: "{{ ansible_facts['env'].HOME }}/.cargo/bin/cargo" register: rust_cargo_binary - name: "Download rustup installer" @@ -15,23 +15,23 @@ ansible.builtin.command: cmd: "/tmp/install_rustup.sh -y --default-toolchain {{ rust_toolchain }} --profile minimal" args: - creates: "{{ ansible_env.HOME }}/.cargo/bin/cargo" + creates: "{{ ansible_facts['env'].HOME }}/.cargo/bin/cargo" when: not rust_cargo_binary.stat.exists - name: "Ensure default toolchain is set" ansible.builtin.command: - cmd: "{{ ansible_env.HOME }}/.cargo/bin/rustup default {{ rust_toolchain }}" + cmd: "{{ ansible_facts['env'].HOME }}/.cargo/bin/rustup default {{ rust_toolchain }}" changed_when: false - name: "Remove cargo default shell profile modification" ansible.builtin.lineinfile: - path: "{{ ansible_env.HOME }}/.bashrc" + path: "{{ ansible_facts['env'].HOME }}/.bashrc" line: '. "$HOME/.cargo/env"' state: "absent" - name: "Add cargo to shell profile" ansible.builtin.blockinfile: - path: "{{ ansible_env.HOME }}/.bashrc" + path: "{{ ansible_facts['env'].HOME }}/.bashrc" state: "present" prepend_newline: true append_newline: true @@ -43,7 +43,7 @@ - name: "Install rust components" ansible.builtin.command: - cmd: "{{ ansible_env.HOME }}/.cargo/bin/rustup component add {{ item }}" + cmd: "{{ ansible_facts['env'].HOME }}/.cargo/bin/rustup component add {{ item }}" register: rust_component_result changed_when: "'is up to date' not in rust_component_result.stdout" loop: "{{ rust_components }}" diff --git a/roles/ssh/handlers/main.yml b/roles/ssh/handlers/main.yml index f8760549..d9e025d0 100644 --- a/roles/ssh/handlers/main.yml +++ b/roles/ssh/handlers/main.yml @@ -3,11 +3,11 @@ become: true ansible.builtin.systemd_service: daemon_reload: true - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] - name: "Restart ssh" become: true ansible.builtin.systemd_service: name: "{{ ssh_service }}" state: "restarted" - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml index 76ba7aa5..cb798c1e 100644 --- a/roles/ssh/tasks/main.yml +++ b/roles/ssh/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure ssh package is installed" become: true @@ -14,13 +14,13 @@ name: "{{ ssh_service }}" state: "started" enabled: true - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] - name: "(chroot): Ensure ssh service is enabled" # noqa: command-instead-of-module intentional isnide chroot ansible.builtin.command: cmd: "systemctl enable {{ ssh_service }}" - when: ansible_is_chroot + when: ansible_facts['is_chroot'] changed_when: true - name: "Generate /etc/ssh/ RSA host key" @@ -46,7 +46,7 @@ ansible.builtin.copy: dest: "/etc/ssh/sshd_config" mode: "0640" - validate: "{{ 'sshd -T -f %s' if (not ansible_is_chroot) else omit }}" + validate: "{{ 'sshd -T -f %s' if (not ansible_facts['is_chroot']) else omit }}" content: | KbdInteractiveAuthentication no # default installation is no UsePAM no # default installation is yes @@ -70,7 +70,7 @@ ansible.builtin.copy: dest: "/etc/ssh/sshd_config.d/99-auth-policy.conf" mode: "0640" - validate: "{{ 'sshd -T -f %s' if (not ansible_is_chroot) else omit }}" + validate: "{{ 'sshd -T -f %s' if (not ansible_facts['is_chroot']) else omit }}" content: | Port {{ ssh_port }} PasswordAuthentication no @@ -89,7 +89,7 @@ ansible.builtin.copy: dest: "/etc/ssh/sshd_config.d/99-allowed-users.conf" mode: "0640" - validate: "{{ 'sshd -T -f %s' if (not ansible_is_chroot) else omit }}" + validate: "{{ 'sshd -T -f %s' if (not ansible_facts['is_chroot']) else omit }}" content: | AllowUsers {{ username }} notify: @@ -99,7 +99,7 @@ ansible.builtin.known_hosts: name: "{{ item.split(' ') | first }}" key: "{{ item }}" - path: "{{ ansible_env.HOME }}/.ssh/known_hosts" + path: "{{ ansible_facts['env'].HOME }}/.ssh/known_hosts" state: present loop: "{{ ssh_known_hosts }}" when: ssh_known_hosts is defined and ssh_known_hosts | length > 0 diff --git a/roles/user/tasks/main.yml b/roles/user/tasks/main.yml index bebedfcb..a06cb9eb 100644 --- a/roles/user/tasks/main.yml +++ b/roles/user/tasks/main.yml @@ -63,4 +63,4 @@ ansible.builtin.command: cmd: "loginctl enable-linger {{ username }}" creates: "/var/lib/systemd/linger/{{ username }}" - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] diff --git a/roles/vim/tasks/main.yml b/roles/vim/tasks/main.yml index 03059eec..c60bb5a8 100644 --- a/roles/vim/tasks/main.yml +++ b/roles/vim/tasks/main.yml @@ -8,7 +8,7 @@ - name: "Clone vimrc git repo" ansible.builtin.git: repo: "{{ vimrc_repo_url }}" - dest: "{{ ansible_env.HOME }}/.vim" + dest: "{{ ansible_facts['env'].HOME }}/.vim" clone: true update: false single_branch: true @@ -16,8 +16,8 @@ - name: "Ensure .vimrc is linked" ansible.builtin.file: - src: "{{ ansible_env.HOME }}/.vim/.vimrc" - dest: "{{ ansible_env.HOME }}/.vimrc" + src: "{{ ansible_facts['env'].HOME }}/.vim/.vimrc" + dest: "{{ ansible_facts['env'].HOME }}/.vimrc" state: "link" # We don't care much if vim failed to install all plugins @@ -26,5 +26,5 @@ ansible.builtin.shell: cmd: "{{ vimrc_setup_script }}" executable: "/bin/bash" - creates: "{{ ansible_env.HOME }}/.vim/bundle/" + creates: "{{ ansible_facts['env'].HOME }}/.vim/bundle/" failed_when: false diff --git a/roles/waybar/templates/waybar/style.css.j2 b/roles/waybar/templates/waybar/style.css.j2 index cde074f2..dc46a297 100644 --- a/roles/waybar/templates/waybar/style.css.j2 +++ b/roles/waybar/templates/waybar/style.css.j2 @@ -1,5 +1,5 @@ /* vim: set filetype=css : */ -@import "{{ ansible_user_dir }}/.config/hyprtheme/current/waybar.css"; +@import "{{ ansible_facts['user_dir'] }}/.config/hyprtheme/current/waybar.css"; * { font-family: 'JetBrainsMono Nerd Font'; diff --git a/roles/wireguard/tasks/main.yml b/roles/wireguard/tasks/main.yml index 72c37a6a..3e5543b3 100644 --- a/roles/wireguard/tasks/main.yml +++ b/roles/wireguard/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml" - name: "Ensure wireguard is installed" become: true |