diff --git a/hosts/common/configs/user/console/yazi/default.nix b/hosts/common/configs/user/console/yazi/default.nix
index 64b1908..5a34cd5 100644
--- a/hosts/common/configs/user/console/yazi/default.nix
+++ b/hosts/common/configs/user/console/yazi/default.nix
@@ -6,10 +6,13 @@
   config,
   lib,
   pkgs,
+  inputs,
+  system,
   ...
 }:
 let
   hmConfig = config.home-manager.users.${user};
+  selfPkgs = inputs.self.packages.${system};
 in
 {
   home-manager.users.${user} = {
@@ -123,6 +126,16 @@ in
               run = "plugin smart-enter";
               desc = "Enter the child directory, or open the file";
             }
+            {
+              on = ";";
+              run = "plugin custom-shell -- auto --interactive";
+              desc = "Run a shell command";
+            }
+            {
+              on = ":";
+              run = "plugin custom-shell -- auto --interactive --block";
+              desc = "Run a shell command (block until finishes)";
+            }
             {
               on = "!";
               run = "shell \"$SHELL\" --block";
@@ -179,6 +192,8 @@ in
             mount
             mediainfo
             ;
+
+          custom-shell = selfPkgs.yazi-plugin-custom-shell;
         };
       };
 
diff --git a/packages/darktable/hald-clut/default.nix b/packages/darktable/hald-clut/default.nix
index efc8b0b..c74734e 100644
--- a/packages/darktable/hald-clut/default.nix
+++ b/packages/darktable/hald-clut/default.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake --version=branch=master darktable-hald-clut
 pkgs.stdenv.mkDerivation rec {
-  pname = "darktable-hald-clut";
+  pname = "hald-clut";
   version = "0-unstable-2019-03-21";
 
   src = pkgs.fetchFromGitHub {
     owner = "cedeber";
-    repo = "hald-clut";
+    repo = pname;
     rev = "3b3180f82d4dcea1e6e8c5648473539a910d7f49";
     hash = "sha256-R8vyYmcsfk49QsSV3v0QblXcO6U0oIfDyxbHPLwSMdo=";
   };
diff --git a/packages/darktable/lua-scripts/default.nix b/packages/darktable/lua-scripts/default.nix
index 91f8061..a6dadb7 100644
--- a/packages/darktable/lua-scripts/default.nix
+++ b/packages/darktable/lua-scripts/default.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake --version=branch=master darktable-lua-scripts
 pkgs.stdenv.mkDerivation rec {
-  pname = "darktable-lua-scripts";
+  pname = "lua-scripts";
   version = "release-2.0.0-unstable-2025-06-01";
 
   src = pkgs.fetchFromGitHub {
     owner = "darktable-org";
-    repo = "lua-scripts";
+    repo = pname;
     rev = "453d744b6938f1bab652bae9745731bfe413d90b";
     hash = "sha256-gTbp7cExUnh4CVviaiYZ1eqVhlXwzX/DHKIFgWJe+UE=";
   };
diff --git a/packages/default.nix b/packages/default.nix
index 68a4fe7..a6304a7 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -62,6 +62,8 @@
 
   ssh-known-hosts-github = import ./ssh/known-hosts/github { inherit pkgs inputs system; };
 
+  yazi-plugin-custom-shell = import ./yazi/plugins/custom-shell { inherit pkgs; };
+
   # SAS
   ssh-known-hosts-sas-artifact = import ./ssh/known-hosts/sas/artifact {
     inherit pkgs inputs system;
diff --git a/packages/obsidian/plugins/better-word-count/default.nix b/packages/obsidian/plugins/better-word-count/default.nix
index e07cad1..31191a9 100644
--- a/packages/obsidian/plugins/better-word-count/default.nix
+++ b/packages/obsidian/plugins/better-word-count/default.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-better-word-count
 pkgs.buildNpmPackage rec {
-  pname = "obsidian-plugin-better-word-count";
+  pname = "better-word-count";
   version = "0.10.1";
 
   src = pkgs.fetchFromGitHub {
     owner = "lukeleppan";
-    repo = "better-word-count";
+    repo = pname;
     rev = version;
     hash = "sha256-+z31nYnCrHjuV4ICVO+cKBM5q/zYA7Ju+J+6eU7t9Bo=";
   };
diff --git a/packages/obsidian/plugins/dataview/default.nix b/packages/obsidian/plugins/dataview/default.nix
index 5046b15..6f7a5aa 100644
--- a/packages/obsidian/plugins/dataview/default.nix
+++ b/packages/obsidian/plugins/dataview/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-dataview
 pkgs.buildNpmPackage rec {
-  pname = "obsidian-plugin-dataview";
+  pname = "dataview";
   version = "0.5.70";
 
   src = pkgs.fetchFromGitHub {
diff --git a/packages/obsidian/plugins/kanban/default.nix b/packages/obsidian/plugins/kanban/default.nix
index c5ef9e0..5e59b26 100644
--- a/packages/obsidian/plugins/kanban/default.nix
+++ b/packages/obsidian/plugins/kanban/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-kanban
 pkgs.stdenv.mkDerivation rec {
-  pname = "obsidian-plugin-kanban";
+  pname = "kanban";
   version = "2.0.51";
 
   src = pkgs.fetchFromGitHub {
diff --git a/packages/obsidian/plugins/languagetool/default.nix b/packages/obsidian/plugins/languagetool/default.nix
index d0264cc..0ba3c8e 100644
--- a/packages/obsidian/plugins/languagetool/default.nix
+++ b/packages/obsidian/plugins/languagetool/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-languagetool
 pkgs.stdenv.mkDerivation rec {
-  pname = "obsidian-plugin-languagetool";
+  pname = "languagetool";
   version = "0.3.7";
 
   src = pkgs.fetchFromGitHub {
diff --git a/packages/obsidian/plugins/linter/default.nix b/packages/obsidian/plugins/linter/default.nix
index c2b51b1..bb1b8bd 100644
--- a/packages/obsidian/plugins/linter/default.nix
+++ b/packages/obsidian/plugins/linter/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-linter
 pkgs.buildNpmPackage rec {
-  pname = "obsidian-plugin-linter";
+  pname = "linter";
   version = "1.29.2";
 
   src = pkgs.fetchFromGitHub {
diff --git a/packages/obsidian/plugins/map-view/default.nix b/packages/obsidian/plugins/map-view/default.nix
index 41f1c51..9728da1 100644
--- a/packages/obsidian/plugins/map-view/default.nix
+++ b/packages/obsidian/plugins/map-view/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-map-view
 pkgs.buildNpmPackage rec {
-  pname = "obsidian-plugin-map-view";
+  pname = "map-view";
   version = "5.5.0";
 
   src = pkgs.fetchFromGitHub {
diff --git a/packages/obsidian/plugins/minimal-settings/default.nix b/packages/obsidian/plugins/minimal-settings/default.nix
index 66d2765..602e969 100644
--- a/packages/obsidian/plugins/minimal-settings/default.nix
+++ b/packages/obsidian/plugins/minimal-settings/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-minimal-settings
 pkgs.buildNpmPackage rec {
-  pname = "obsidian-plugin-minimal-settings";
+  pname = "minimal-settings";
   version = "8.1.1";
 
   src = pkgs.fetchFromGitHub {
diff --git a/packages/obsidian/plugins/outliner/default.nix b/packages/obsidian/plugins/outliner/default.nix
index f9a938a..5799570 100644
--- a/packages/obsidian/plugins/outliner/default.nix
+++ b/packages/obsidian/plugins/outliner/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-outliner
 pkgs.buildNpmPackage rec {
-  pname = "obsidian-plugin-outliner";
+  pname = "outliner";
   version = "4.9.0";
 
   src = pkgs.fetchFromGitHub {
diff --git a/packages/obsidian/plugins/style-settings/default.nix b/packages/obsidian/plugins/style-settings/default.nix
index 390c915..a6fa8b7 100644
--- a/packages/obsidian/plugins/style-settings/default.nix
+++ b/packages/obsidian/plugins/style-settings/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-style-settings --src-attr unpatchedSrc
 pkgs.stdenv.mkDerivation rec {
-  pname = "obsidian-plugin-style-settings";
+  pname = "style-settings";
   version = "1.0.9";
 
   unpatchedSrc = pkgs.fetchFromGitHub {
diff --git a/packages/obsidian/plugins/tasks/default.nix b/packages/obsidian/plugins/tasks/default.nix
index cf14d8d..2c09f69 100644
--- a/packages/obsidian/plugins/tasks/default.nix
+++ b/packages/obsidian/plugins/tasks/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-tasks
 pkgs.stdenv.mkDerivation rec {
-  pname = "obsidian-plugin-tasks";
+  pname = "tasks";
   version = "7.19.1";
 
   src = pkgs.fetchFromGitHub {
diff --git a/packages/obsidian/plugins/url-into-selection/default.nix b/packages/obsidian/plugins/url-into-selection/default.nix
index d046fe6..71a87d5 100644
--- a/packages/obsidian/plugins/url-into-selection/default.nix
+++ b/packages/obsidian/plugins/url-into-selection/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-plugin-url-into-selection
 pkgs.buildNpmPackage rec {
-  pname = "obsidian-plugin-url-into-selection";
+  pname = "url-into-selection";
   version = "1.7.0";
 
   src = pkgs.fetchFromGitHub {
diff --git a/packages/obsidian/themes/minimal/default.nix b/packages/obsidian/themes/minimal/default.nix
index 6fa0de2..7da7394 100644
--- a/packages/obsidian/themes/minimal/default.nix
+++ b/packages/obsidian/themes/minimal/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 # AUTO-UPDATE: nix-update --flake obsidian-theme-minimal
 pkgs.buildNpmPackage rec {
-  pname = "obsidian-theme-minimal";
+  pname = "minimal";
   version = "8.0.1";
 
   src = pkgs.fetchFromGitHub {
diff --git a/packages/yazi/plugins/custom-shell/default.nix b/packages/yazi/plugins/custom-shell/default.nix
new file mode 100644
index 0000000..265d82c
--- /dev/null
+++ b/packages/yazi/plugins/custom-shell/default.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+# AUTO-UPDATE: nix-update --flake --version=branch=main yazi-plugin-custom-shell
+pkgs.stdenv.mkDerivation rec {
+  pname = "custom-shell";
+  version = "0-unstable-2025-06-07";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "AnirudhG07";
+    repo = "custom-shell.yazi";
+    rev = "b04213d2f4ca6079bef37491be07860baa8264b9";
+    hash = "sha256-hJVFZvcHgcjmcwUUGs1Q668KjeLSCEVuAhAD1A8ZM90=";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp $src/main.lua $out
+  '';
+}