diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index 4df8036..8965b90 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -6,6 +6,9 @@
     ./desktop.nix
   ];
 
+  cli.editor = "nvim";
+  cli.file-browser = "yazi";
+
   home.persistence."/persist/home/rafiq" = {
 	directories = [
 	".ssh"
diff --git a/modules/hm/cli/default.nix b/modules/hm/cli/default.nix
deleted file mode 100644
index 0df0128..0000000
--- a/modules/hm/cli/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{config, lib, osConfig, ... }:
-{
-  imports = [
-  ];
-
-  options.cli =	{
-
-  };
-
-  config = {
-
-  };
-}
diff --git a/modules/home/cli/default.nix b/modules/home/cli/default.nix
new file mode 100644
index 0000000..f7dbe9f
--- /dev/null
+++ b/modules/home/cli/default.nix
@@ -0,0 +1,15 @@
+{config, lib, osConfig, ... }:
+{
+  imports = [
+    ./file-browser/yazi.nix
+  ];
+
+  options.cli =	{
+    editor = lib.pantheon.mkStrOption;
+    file-browser = lib.pantheon.mkStrOption;
+  };
+
+  config = {
+
+  };
+}
diff --git a/modules/home/cli/file-browser/yazi.nix b/modules/home/cli/file-browser/yazi.nix
new file mode 100644
index 0000000..fa6ac20
--- /dev/null
+++ b/modules/home/cli/file-browser/yazi.nix
@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+{
+  config = 
+  lib.mkIf (config.cli.file-browser == "yazi") 
+  {
+    home.shellAliases.FILE-BROWSER = "yazi";
+    programs.yazi = {
+      enable = true;
+      shellWrapperName = "t";
+    };
+  };
+}