diff --git a/tasks/pkgs/yazi.yml b/tasks/pkgs/yazi.yml
index aac6ae8..569d975 100644
--- a/tasks/pkgs/yazi.yml
+++ b/tasks/pkgs/yazi.yml
@@ -1,41 +1,48 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Configure yazi-fm
+- name: Configure yazi installation # {{{
+  ansible.builtin.set_fact:
+    methods:
+      - source
+    version: v26.1.22
+    git:
+      repo: https://github.com/sxyazi/yazi.git
+    pkgname: yazi
+    pkg_depends:
+      - fd
+      - ripgrep
+      - fzf
+      - zoxide
+    build_depends:
+      RedHat:
+        - ImageMagick
+        - ffmpeg-free
+        - file
+        - jq
+        - oniguruma
+        - oniguruma-devel
+        - p7zip-plugins
+        - poppler
+        - wl-clipboard
+        - "@c-development"
+        - "@development-tools"
+      Darwin:
+        - ffmpeg
+        - file
+        - imagemagick
+        - jq
+        - oniguruma
+        - p7zip
+        - poppler
+# }}}
+- name: Configure yazi install
   when:
-    - __yazi_configured is undefined or
-      not __yazi_configured
+    - "'yazi' not in __configured"
   block:
-    - name: Configure yazi installation
+    - name: Set yazi install method
+      when:
+        - yazi_imethod is undefined
       ansible.builtin.set_fact:
-        yazi_git_repo: https://github.com/sxyazi/yazi.git
-        yazi_version: v26.1.22
-        yazi_pkgname: yazi
-        yazi_pkg_depends:
-          - fd
-          - ripgrep
-          - fzf
-          - zoxide
-        yazi_build_depends:
-          RedHat:
-            - ImageMagick
-            - ffmpeg-free
-            - file
-            - jq
-            - oniguruma
-            - oniguruma-devel
-            - p7zip-plugins
-            - poppler
-            - wl-clipboard
-            - "@c-development"
-            - "@development-tools"
-          Darwin:
-            - ffmpeg
-            - file
-            - imagemagick
-            - jq
-            - oniguruma
-            - p7zip
-            - poppler
     - name: Configure yazi source install
       ansible.builtin.set_fact:
         yazi_src_install:
@@ -60,8 +67,6 @@
       ansible.builtin.set_fact:
         __yazi_configured: true
 
-- name: Add yazi-fm
-  block:
     - name: Append yazi-fm pkg_deps
       loop: "{{ yazi_pkg_depends }}"
       loop_control: