diff --git a/tasks/config/yazi.yml b/tasks/config/yazi.yml
deleted file mode 100644
index 29511de..0000000
--- a/tasks/config/yazi.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# vim: set filetype=yaml.ansible
----
-- name: Set yazi vars
-  ansible.builtin.set_fact:
-    yazi:
-      pkgs: "{{ pkgconfig.yazi.pkgs }}"
-      deps: "{{ pkgconfig.yazi.depends[ansible_os_family] }}"
-      pkg_deps: "{{ pkgconfig.yazi.pkg_depends }}"
diff --git a/tasks/pkgs/alacritty.yml b/tasks/pkgs/alacritty.yml
index 4fb57e2..40c0549 100644
--- a/tasks/pkgs/alacritty.yml
+++ b/tasks/pkgs/alacritty.yml
@@ -35,7 +35,7 @@
               version: "{{ alacritty_version }}"
               bin_output: "target/release/alacritty"
               bin_name: "alacritty"
-              install_prefix: "/usr/local"
+              install_prefix: "{{ install_prefix }}"
               install_files:
                 extra/logo/alacritty-term.svg: share/pixmaps/Alacritty.svg
               desktop_files:
diff --git a/tasks/pkgs/yazi.yml b/tasks/pkgs/yazi.yml
index 69e8426..aac6ae8 100644
--- a/tasks/pkgs/yazi.yml
+++ b/tasks/pkgs/yazi.yml
@@ -1,25 +1,77 @@
 # vim: set filetype=yaml.ansible :
 ---
+- name: Configure yazi-fm
+  when:
+    - __yazi_configured is undefined or
+      not __yazi_configured
+  block:
+    - name: Configure yazi installation
+      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:
+          cargo_build_flags:
+            - --release --locked
+          name: "{{ yazi_pkgname }}"
+          repo: "{{ yazi_git_repo }}"
+          version: "{{ yazi_version }}"
+          bin_output: "target/release/yazi"
+          bin_name: "yazi"
+          install_prefix: "{{ install_prefix }}"
+          install_files:
+            target/release/ya: bin/ya
+          files_list:
+            - bin/yazi
+            - bin/ya
+
+    - name: Set _yazi_configured
+      when:
+        - __yazi_configured is undefined or
+          not __yazi_configured
+      ansible.builtin.set_fact:
+        __yazi_configured: true
+
 - name: Add yazi-fm
   block:
-    - name: Load yazi-fm config
-      ansible.builtin.include_tasks:
-        file: config/yazi.yml
-
     - name: Append yazi-fm pkg_deps
-      loop: "{{ yazi.pkg_deps }}"
+      loop: "{{ yazi_pkg_depends }}"
       loop_control:
         loop_var: yazi_pkg_dep
       vars:
         pkg: "{{ yazi_pkg_dep }}"
       ansible.builtin.include_tasks:
-        file: "pkgs/{{ yazi_pkg_dep }}.yml"
+        file: "helpers/addpkg.yml"
 
-    - name: Append yazi to pkg_cargo
+    - name: Append yazi to pkg_cargo_build
       ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + yazi.deps }}"
-        pkg_cargo: "{{ pkg_cargo + yazi.pkgs }}"
-
-    - name: Set yazi-fm_configured
-      ansible.builtin.set_fact:
-        yazi_fm_configured: true
+        pkg_sys: "{{ pkg_sys + yazi_build_depends[ansible_os_family] }}"
+        pkg_cargo_build: "{{ pkg_cargo + yazi_src_install }}"
diff --git a/vars/pkgs/yazi.yml b/vars/pkgs/yazi.yml
deleted file mode 100644
index 6a7f5a3..0000000
--- a/vars/pkgs/yazi.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-yazi:
-  pkgs:
-    - name: yazi-build
-      vers: 25.12.29
-      locked: true
-    - name: yazi-fm
-      vers: 25.12.29
-      locked: true
-    - name: yazi-cli
-      vers: 25.12.29
-      locked: true
-  pkg_depends:
-    - fd
-    - ripgrep
-    - fzf
-    - zoxide
-  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