diff --git a/home/profiles/terminal/shell/fish.nix b/home/profiles/terminal/shell/fish.nix
new file mode 100644
index 0000000..4b6fdf7
--- /dev/null
+++ b/home/profiles/terminal/shell/fish.nix
@@ -0,0 +1,8 @@
+{
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      set fish_greeting
+    '';
+  };
+}
diff --git a/home/profiles/terminal/shell/starship.nix b/home/profiles/terminal/shell/starship.nix
new file mode 100644
index 0000000..927ad3a
--- /dev/null
+++ b/home/profiles/terminal/shell/starship.nix
@@ -0,0 +1,5 @@
+{
+  programs.starship = {
+    enable = true;
+  };
+}
diff --git a/home/suites/nixdesk/default.nix b/home/suites/nixdesk/default.nix
index 8eab587..bac3af5 100644
--- a/home/suites/nixdesk/default.nix
+++ b/home/suites/nixdesk/default.nix
@@ -12,6 +12,8 @@
     default
 
     terminal.shell.zsh
+    terminal.shell.fish
+    terminal.shell.starship
 
     terminal.programs.xdg
     terminal.programs.direnv
@@ -36,7 +38,7 @@
     programs.browsers.tor
     programs.browsers.chromium
 
-    terminal.emulator.wezterm
+    # terminal.emulator.wezterm
     terminal.emulator.foot
 
     # desktop
diff --git a/sys/machines/nixdesk/default.nix b/sys/machines/nixdesk/default.nix
index 7712b8a..e646a5a 100644
--- a/sys/machines/nixdesk/default.nix
+++ b/sys/machines/nixdesk/default.nix
@@ -26,6 +26,7 @@
     core.locale
     nix.default
     programs.zsh
+    programs.fish
     core.tools
     core.compat
     core.boot
diff --git a/sys/profiles/core/users.nix b/sys/profiles/core/users.nix
index cc33c70..f9a0f2b 100644
--- a/sys/profiles/core/users.nix
+++ b/sys/profiles/core/users.nix
@@ -2,7 +2,7 @@
   users.users.xun = {
     isNormalUser = true;
     initialPassword = "nixos";
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
     extraGroups = [
       "wheel"
       "input"
diff --git a/sys/profiles/programs/fish.nix b/sys/profiles/programs/fish.nix
new file mode 100644
index 0000000..17ef2bf
--- /dev/null
+++ b/sys/profiles/programs/fish.nix
@@ -0,0 +1,5 @@
+{
+  programs.fish = {
+    enable = true;
+  };
+}