diff --git a/home/base/server/zellij/README.md b/home/base/desktop/zellij/README.md
similarity index 100%
rename from home/base/server/zellij/README.md
rename to home/base/desktop/zellij/README.md
diff --git a/home/base/server/zellij/config.kdl b/home/base/desktop/zellij/config.kdl
similarity index 100%
rename from home/base/server/zellij/config.kdl
rename to home/base/desktop/zellij/config.kdl
diff --git a/home/base/desktop/zellij/default.nix b/home/base/desktop/zellij/default.nix
new file mode 100644
index 00000000..dca97631
--- /dev/null
+++ b/home/base/desktop/zellij/default.nix
@@ -0,0 +1,32 @@
+let
+  shellAliases = {
+    "zj" = "zellij";
+  };
+in {
+  programs.zellij = {
+    enable = true;
+  };
+  # auto start zellij in nushell
+  programs.nushell.extraConfig = ''
+    # auto start zellij
+    if not "ZELLIJ" in $env {
+      if "ZELLIJ_AUTO_ATTACH" in $env and $env.ZELLIJ_AUTO_ATTACH == "true" {
+        ^zellij attach -c
+      } else {
+        ^zellij
+      }
+
+      # Auto exit the shell session when zellij exit
+      $env.ZELLIJ_AUTO_EXIT = "false" # disable auto exit
+      if "ZELLIJ_AUTO_EXIT" in $env and $env.ZELLIJ_AUTO_EXIT == "true" {
+        exit
+      }
+    }
+  '';
+
+  # only works in bash/zsh, not nushell
+  home.shellAliases = shellAliases;
+  programs.nushell.shellAliases = shellAliases;
+
+  xdg.configFile."zellij/config.kdl".source = ./config.kdl;
+}
diff --git a/home/base/server/zellij/default.nix b/home/base/server/zellij/default.nix
index 45b743cb..3b6df2cb 100644
--- a/home/base/server/zellij/default.nix
+++ b/home/base/server/zellij/default.nix
@@ -6,27 +6,7 @@ in {
   programs.zellij = {
     enable = true;
   };
-  # auto start zellij in nushell
-  programs.nushell.extraConfig = ''
-    # auto start zellij
-    if not "ZELLIJ" in $env {
-      if "ZELLIJ_AUTO_ATTACH" in $env and $env.ZELLIJ_AUTO_ATTACH == "true" {
-        ^zellij attach -c
-      } else {
-        ^zellij
-      }
-
-      # Auto exit the shell session when zellij exit
-      $env.ZELLIJ_AUTO_EXIT = "true" # enable auto exit
-      if "ZELLIJ_AUTO_EXIT" in $env and $env.ZELLIJ_AUTO_EXIT == "true" {
-        exit
-      }
-    }
-  '';
-
   # only works in bash/zsh, not nushell
   home.shellAliases = shellAliases;
   programs.nushell.shellAliases = shellAliases;
-
-  xdg.configFile."zellij/config.kdl".source = ./config.kdl;
 }