diff --git a/homes/x86_64-linux/rafiq/cli/utilities/misc.nix b/homes/x86_64-linux/rafiq/cli/utilities/misc.nix
index 3bff1f3..e725c39 100644
--- a/homes/x86_64-linux/rafiq/cli/utilities/misc.nix
+++ b/homes/x86_64-linux/rafiq/cli/utilities/misc.nix
@@ -12,22 +12,6 @@
       enable = true;
       nix-direnv.enable = true;
     };
-    starship = {
-      enable = true;
-      settings = {
-        add_newline = false;
-        format = ''
-          $directory$character
-        '';
-        right_format = ''
-          $all
-        '';
-        git_branch.format = "[$symbol$branch(:$remote_branch)]($style) ";
-        shlvl.disabled = false;
-        hostname.disabled = true;
-        username.disabled = true;
-      };
-    };
   };
   home = {
     shellAliases = {
diff --git a/homes/x86_64-linux/rafiq/cli/utilities/starship.nix b/homes/x86_64-linux/rafiq/cli/utilities/starship.nix
new file mode 100644
index 0000000..3226d2f
--- /dev/null
+++ b/homes/x86_64-linux/rafiq/cli/utilities/starship.nix
@@ -0,0 +1,27 @@
+{ lib, ... }:
+let
+  inherit (lib.strings) concatStrings;
+in
+{
+  programs.starship = {
+    enable = true;
+    settings = {
+      add_newline = false;
+      format = concatStrings [
+        # First Line
+        ## Left Prompt
+        "$hostname$directory"
+        "$fill"
+        ## Right Prompt
+        "$all"
+        # Second Line
+        ## Left Prompt
+        "$character"
+      ];
+      git_branch.format = "[$symbol$branch(:$remote_branch)]($style) ";
+      shlvl.disabled = false;
+      username.disabled = true;
+      fill.symbol = " ";
+    };
+  };
+}