diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index c5468f1..b754098 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -7,6 +7,7 @@
   cli.shell = "zsh";
   cli.editor = "nvf";
   cli.file-browser = "yazi";
+  cli.multiplexer = "zellij";
   cli.git.name = "Mohammad Rafiq";
   cli.git.email = "rafiq@rrv.sh";
   cli.git.defaultBranch = "prime";
diff --git a/modules/home/cli/default.nix b/modules/home/cli/default.nix
index 45a58f4..5c1347e 100644
--- a/modules/home/cli/default.nix
+++ b/modules/home/cli/default.nix
@@ -8,6 +8,7 @@
     shell = lib.pantheon.mkStrOption;
     editor = lib.pantheon.mkStrOption;
     file-browser = lib.pantheon.mkStrOption;
+    multiplexer = lib.pantheon.mkStrOption;
     git = {
       name = lib.pantheon.mkStrOption;
       email = lib.pantheon.mkStrOption;
diff --git a/modules/home/cli/file-browser/default.nix b/modules/home/cli/file-browser/default.nix
index 77b567e..f206bfe 100644
--- a/modules/home/cli/file-browser/default.nix
+++ b/modules/home/cli/file-browser/default.nix
@@ -1,5 +1,10 @@
+{ config, lib, ... }:
 {
-  imports = [
-    ./yazi.nix
-  ];
+  config = lib.mkIf (config.cli.file-browser == "yazi") {
+    home.sessionVariables.FILE_BROWSER = "yazi";
+    programs.yazi = {
+      enable = true;
+      shellWrapperName = "t";
+    };
+  };
 }
diff --git a/modules/home/cli/file-browser/yazi.nix b/modules/home/cli/file-browser/yazi.nix
deleted file mode 100644
index f206bfe..0000000
--- a/modules/home/cli/file-browser/yazi.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, lib, ... }:
-{
-  config = lib.mkIf (config.cli.file-browser == "yazi") {
-    home.sessionVariables.FILE_BROWSER = "yazi";
-    programs.yazi = {
-      enable = true;
-      shellWrapperName = "t";
-    };
-  };
-}
diff --git a/modules/home/cli/multiplexer/default.nix b/modules/home/cli/multiplexer/default.nix
new file mode 100644
index 0000000..0ef85da
--- /dev/null
+++ b/modules/home/cli/multiplexer/default.nix
@@ -0,0 +1,17 @@
+{ config, lib, ... }:
+{
+  config = lib.mkIf (config.cli.multiplexer == "zellij") {
+    home.sessionVariables.multiplexer = "zellij -c";
+    programs.zellij = {
+      enable = true;
+      attachExistingSession = true;
+      exitShellOnExit = true;
+      settings = {
+        default_layout = "compact";
+        pane_frames = false;
+        show_startup_tips = false;
+        show_release_notes = false;
+      };
+    };
+  };
+}