diff --git a/.config/setup/01-install-packages.sh b/.config/setup/01-install-packages.sh
index d90af44..be0e298 100755
--- a/.config/setup/01-install-packages.sh
+++ b/.config/setup/01-install-packages.sh
@@ -60,7 +60,6 @@ sway-backgrounds \
 swayidle \
 swaylock \
 syncthing \
-tmux \
 udisks2 \
 unar \
 unrar-free \
diff --git a/.config/sway/config b/.config/sway/config
index be4b838..7d04f90 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -67,7 +67,7 @@ input type:touchpad {
 #
     # Start a terminal
     bindsym $launch+Return exec $term
-    bindsym $launch+t exec $term
+    bindsym $launch+t exec $term zellij attach --create main
 
     # Start Emacs
     bindsym $launch+e exec emacs
diff --git a/.config/zellij/layouts/sway.kdl b/.config/zellij/layouts/sway.kdl
new file mode 100644
index 0000000..b75d3f6
--- /dev/null
+++ b/.config/zellij/layouts/sway.kdl
@@ -0,0 +1,7 @@
+layout {
+     pane {
+        name "sway"
+        command "sway"
+        args "--unsupported-gpu"
+    }
+}
diff --git a/.profile b/.profile
index 2c4cc59..00fea03 100644
--- a/.profile
+++ b/.profile
@@ -37,5 +37,5 @@ export PYTHON_KEYRING_BACKEND="keyring.backends.null.Keyring"
 export XDG_CURRENT_DESKTOP="sway"
 . "$HOME/.cargo/env"
 
-# If running from tty1 start sway inside a tmux session
-[ "$(tty)" = "/dev/tty1" ] && exec tmux new-session "sway --unsupported-gpu"
+# If running from tty1 start sway inside a zellij session
+[ "$(tty)" = "/dev/tty1" ] && exec zellij --layout sway --session sway