diff options
| -rw-r--r-- | roles/bash/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/dotfiles/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/firefox/vars/archlinux.yml | 2 | ||||
| -rw-r--r-- | roles/firefox/vars/debian.yml | 2 | ||||
| -rw-r--r-- | roles/firefox/vars/ubuntu.yml | 2 | ||||
| -rw-r--r-- | roles/go/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/hyprcursor/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/hyprland/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/hyprtheme/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/hyprtheme/tasks/template-theme.yml | 4 | ||||
| -rw-r--r-- | roles/nautilus/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/password_policy/templates/debian-pam-pw.j2 | 2 | ||||
| -rw-r--r-- | roles/password_store/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/podman/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/python/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/rust/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/ssh/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/vim/tasks/main.yml | 8 |
18 files changed, 44 insertions, 44 deletions
diff --git a/roles/bash/tasks/main.yml b/roles/bash/tasks/main.yml index fbecafa6..4af7dc40 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_facts['env'].HOME }}/.bashrc" - - "{{ ansible_facts['env'].HOME }}/.bash_profile" - - "{{ ansible_facts['env'].HOME }}/.profile" + - "{{ ansible_facts['env']['HOME'] }}/.bashrc" + - "{{ ansible_facts['env']['HOME'] }}/.bash_profile" + - "{{ ansible_facts['env']['HOME'] }}/.profile" diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml index 9f6cead1..02a17c70 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_facts['env'].HOME }}/.rc" + dest: "{{ ansible_facts['env']['HOME'] }}/.rc" clone: true update: false single_branch: true diff --git a/roles/firefox/vars/archlinux.yml b/roles/firefox/vars/archlinux.yml index ac5ed73b..878d362c 100644 --- a/roles/firefox/vars/archlinux.yml +++ b/roles/firefox/vars/archlinux.yml @@ -1,6 +1,6 @@ --- firefox_package: "firefox" -firefox_folder: "{{ ansible_facts['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 b0318d09..793f6773 100644 --- a/roles/firefox/vars/debian.yml +++ b/roles/firefox/vars/debian.yml @@ -1,6 +1,6 @@ --- firefox_package: "firefox-esr" -firefox_folder: "{{ ansible_facts['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 bb92bf72..1f5c420d 100644 --- a/roles/firefox/vars/ubuntu.yml +++ b/roles/firefox/vars/ubuntu.yml @@ -1,6 +1,6 @@ --- firefox_package: "firefox" -firefox_folder: "{{ ansible_facts['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/go/tasks/main.yml b/roles/go/tasks/main.yml index 06f4308f..93ec8a3a 100644 --- a/roles/go/tasks/main.yml +++ b/roles/go/tasks/main.yml @@ -29,7 +29,7 @@ - name: "Add Go to shell profile" ansible.builtin.blockinfile: - path: "{{ ansible_facts['env'].HOME }}/.bashrc" + path: "{{ ansible_facts['env']['HOME'] }}/.bashrc" state: "present" prepend_newline: true append_newline: true diff --git a/roles/hyprcursor/tasks/main.yml b/roles/hyprcursor/tasks/main.yml index 2ca1366f..eb39b73e 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_facts['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_facts['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_facts['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 451adb01..4e36a6dc 100644 --- a/roles/hyprland/tasks/main.yml +++ b/roles/hyprland/tasks/main.yml @@ -35,7 +35,7 @@ state: "directory" mode: "0755" loop: - - "{{ ansible_facts['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 09835eee..44d2b60d 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_facts['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_facts['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_facts['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_facts['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_facts['env'].HOME }}/.config/hyprtheme/scripts/theme-set {{ hyprtheme_default_theme }}" - creates: "{{ ansible_facts['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 ef3323ff..ea202564 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_facts['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_facts['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/nautilus/tasks/main.yml b/roles/nautilus/tasks/main.yml index 76eaf0b3..1447a7a9 100644 --- a/roles/nautilus/tasks/main.yml +++ b/roles/nautilus/tasks/main.yml @@ -28,9 +28,9 @@ cmd: "xdg-user-dirs-update --set {{ item.name }} {{ item.path }}" changed_when: false loop: - - { 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" } + - { 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/password_policy/templates/debian-pam-pw.j2 b/roles/password_policy/templates/debian-pam-pw.j2 index 323aa41d..35be0ee4 100644 --- a/roles/password_policy/templates/debian-pam-pw.j2 +++ b/roles/password_policy/templates/debian-pam-pw.j2 @@ -44,7 +44,7 @@ password requisite pam_deny.so # this avoids us returning an error just because nothing sets a success code # since the modules above will each just jump around password required pam_permit.so -{% if ansible_distribution == "Ubuntu" %} +{% if ansible_facts['distribution'] == "Ubuntu" %} # and here are more per-package modules (the "Additional" block) password optional pam_gnome_keyring.so {% endif %} diff --git a/roles/password_store/tasks/main.yml b/roles/password_store/tasks/main.yml index be15bc7d..acd0b5f0 100644 --- a/roles/password_store/tasks/main.yml +++ b/roles/password_store/tasks/main.yml @@ -11,7 +11,7 @@ - name: "Clone password store git repo" ansible.builtin.git: repo: "{{ password_store_repo_url }}" - dest: "{{ ansible_facts['env'].HOME }}/.password-store" + dest: "{{ ansible_facts['env']['HOME'] }}/.password-store" clone: true update: false single_branch: true diff --git a/roles/podman/tasks/main.yml b/roles/podman/tasks/main.yml index a9b555f4..87462880 100644 --- a/roles/podman/tasks/main.yml +++ b/roles/podman/tasks/main.yml @@ -21,13 +21,13 @@ - name: "Create containers configuration directory" ansible.builtin.file: - path: "{{ ansible_facts['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_facts['env'].HOME }}/.config/containers/containers.conf" + dest: "{{ ansible_facts['env']['HOME'] }}/.config/containers/containers.conf" mode: "0644" content: | [containers] diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml index 3b41d8aa..d272b9f6 100644 --- a/roles/python/tasks/main.yml +++ b/roles/python/tasks/main.yml @@ -4,7 +4,7 @@ - name: "Check if uv binary exists" ansible.builtin.stat: - path: "{{ ansible_facts['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_facts['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_facts['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 640e4785..69e6c557 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_facts['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_facts['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_facts['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_facts['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_facts['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_facts['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/tasks/main.yml b/roles/ssh/tasks/main.yml index cb798c1e..30aa6b9f 100644 --- a/roles/ssh/tasks/main.yml +++ b/roles/ssh/tasks/main.yml @@ -99,7 +99,7 @@ ansible.builtin.known_hosts: name: "{{ item.split(' ') | first }}" key: "{{ item }}" - path: "{{ ansible_facts['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/vim/tasks/main.yml b/roles/vim/tasks/main.yml index c60bb5a8..69f19c90 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_facts['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_facts['env'].HOME }}/.vim/.vimrc" - dest: "{{ ansible_facts['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_facts['env'].HOME }}/.vim/bundle/" + creates: "{{ ansible_facts['env']['HOME'] }}/.vim/bundle/" failed_when: false |
