diff --git a/systems/BASED.nix b/systems/BASED.nix
index 36503ab..f48453c 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -24,6 +24,7 @@
     wezterm
     wget
     yt-dlp
+    zellij
     zstd
   ];
   programs.partition-manager.enable = lib.mkDefault true;
@@ -42,12 +43,14 @@
   environment.variables = {
     EDITOR = "hx";
     VISUAL = "hx";
+    PAGER = "bat";
     SKIM_DEFAULT_COMMAND = "rg --files";
   };
 
   environment.sessionVariables = {
     EDITOR = "hx";
     VISUAL = "hx";
+    PAGER = "bat";
     SKIM_DEFAULT_COMMAND = "rg --files";
   };
 
diff --git a/users/tao/home.nix b/users/tao/home.nix
index 6fd9a5b..b8141fd 100644
--- a/users/tao/home.nix
+++ b/users/tao/home.nix
@@ -13,6 +13,10 @@
           name = "Tao Tien";
           email = "29749622+taotien@users.noreply.github.com";
         };
+        ui =
+          {
+            default-command = "log";
+          };
       };
     };
 
@@ -39,6 +43,11 @@
       extraConfig = builtins.readFile ./wezterm.lua;
     };
 
+    zellij = {
+      enable = true;
+      settings = { };
+    };
+
     zoxide = {
       enable = true;
       enableNushellIntegration = true;