diff --git a/home/.chezmoiignore.tmpl b/home/.chezmoiignore.tmpl
index 64cf7fa..f2bbd96 100644
--- a/home/.chezmoiignore.tmpl
+++ b/home/.chezmoiignore.tmpl
@@ -1,6 +1,8 @@
 {{- if not .features.shell }}
 .config/fish
+.config/starship.toml
 {{- end }}
+
 {{- if not .features.git }}
 .config/git
 {{- end }}
diff --git a/home/private_dot_config/fish/conf.d/staship.fish b/home/private_dot_config/fish/conf.d/staship.fish
new file mode 100644
index 0000000..b6b830c
--- /dev/null
+++ b/home/private_dot_config/fish/conf.d/staship.fish
@@ -0,0 +1,5 @@
+# Disable the default Fish greeting message
+set fish_greeting ""
+
+# Initialize Starship
+starship init fish | source
diff --git a/home/private_dot_config/fish/conf.d/.gitkeep b/home/private_dot_config/starship.toml
similarity index 100%
rename from home/private_dot_config/fish/conf.d/.gitkeep
rename to home/private_dot_config/starship.toml
diff --git a/setup-script/roles/shell/tasks/main.yaml b/setup-script/roles/shell/tasks/main.yaml
index cf35312..469b07d 100644
--- a/setup-script/roles/shell/tasks/main.yaml
+++ b/setup-script/roles/shell/tasks/main.yaml
@@ -1,7 +1,10 @@
-- name: Install Fish shell on Arch
+- name: Install Fish shell and Starship on Arch
   become: true
   ansible.builtin.pacman:
-    name: fish
+    name:
+      - fish
+      - starship
+      - ttf-nerd-fonts-symbols  # Required for Starship
   when: chezmoi.osRelease.id == "arch"
 
 - name: Find Fish shell binary