diff --git a/home/home.nix b/home/home.nix
index 02e2714..4f895f8 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -1035,6 +1035,22 @@ end
       $env.config = {
         show_banner: false
       }
+
+      def start_zellij [] {
+        if 'ZELLIJ' not-in ($env | columns) {
+          if 'ZELLIJ_AUTO_ATTACH' in ($env | columns) and $env.ZELLIJ_AUTO_ATTACH == 'true' {
+            zellij attach -c
+          } else {
+            zellij
+          }
+       
+          if 'ZELLIJ_AUTO_EXIT' in ($env | columns) and $env.ZELLIJ_AUTO_EXIT == 'true' {
+            exit
+          }
+        }
+      }
+      
+      start_zellij
       '';
     };
     environmentVariables = {
diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix
index 82dc379..b0078e7 100644
--- a/pkgs/base-packages.nix
+++ b/pkgs/base-packages.nix
@@ -9,6 +9,7 @@
     smartmontools
     git
     tmux
+    zellij
     dutree
     cachix
     unzip