diff --git a/modules/home/apps/cli-apps/fish/default.nix b/modules/home/apps/cli-apps/fish/default.nix
index b9a49bb..604a777 100644
--- a/modules/home/apps/cli-apps/fish/default.nix
+++ b/modules/home/apps/cli-apps/fish/default.nix
@@ -25,7 +25,6 @@ in {
           enable = true;
           shellInit = "
 	zoxide init fish | source
-	starship init fish | source
 	direnv hook fish | source
 	source ~/.config/op/plugins.sh
 	";
diff --git a/modules/home/apps/cli-apps/starship/default.nix b/modules/home/apps/cli-apps/starship/default.nix
index ae8e67a..a5b1b33 100644
--- a/modules/home/apps/cli-apps/starship/default.nix
+++ b/modules/home/apps/cli-apps/starship/default.nix
@@ -13,54 +13,62 @@ in {
     enable = mkBoolOpt true "Whether or not to enable starship shell";
   };
 
-  config = mkIf cfg.enable {
-    programs.starship = {
-      enable = true;
-      enableTransience = true;
-      settings = {
-        character = {
-          error_symbol = "[ ](bold red)";
-        };
-        time = {
-          disabled = false;
-          time_format = "%T";
-          utc_time_offset = "+1";
-        };
-        username = {
-          style_user = "#00de00";
-          style_root = "red";
-          format = "[$user]($style) ";
-          disabled = false;
-          show_always = true;
-        };
-        hostname = {
-          ssh_only = false;
-          format = "@ [$hostname](bold yellow) ";
-          disabled = false;
-        };
-        directory = {
-          home_symbol = "󰋞 ~";
-          read_only_style = "197";
-          read_only = "  ";
-          format = "at [$path]($style)[$read_only]($read_only_style) ";
-        };
-        git_metrics = {
-          disabled = false;
-          added_style = "bold blue";
-          format = "[+$added]($added_style)/[-$deleted]($deleted_style) ";
-        };
-        git_status = {
-          format = "([$all_status$ahead_behind]($style) )";
-          ahead = "[↑$count](bold green)";
-          behind = "[↓$count](bold red)";
-          diverged = "[↕↓$ahead_count↑$behind_count](red)";
-          deleted = "[✘$count](red) ";
-          modified = "[!$count](yellow) ";
-          staged = "[+$count](green) ";
-          renamed = "[➜$count](green) ";
-          untracked = "[?$count](blue) ";
+  config =
+    mkIf cfg.enable {
+      programs = {
+        fish.shellInit = "
+
+	starship init fish | source
+      ";
+
+        starship = {
+          enable = true;
+          enableTransience = true;
+          settings = {
+            character = {
+              error_symbol = "[ ](bold red)";
+            };
+            time = {
+              disabled = false;
+              time_format = "%T";
+              utc_time_offset = "+1";
+            };
+            username = {
+              style_user = "#00de00";
+              style_root = "red";
+              format = "[$user]($style) ";
+              disabled = false;
+              show_always = true;
+            };
+            hostname = {
+              ssh_only = false;
+              format = "@ [$hostname](bold yellow) ";
+              disabled = false;
+            };
+            directory = {
+              home_symbol = "󰋞 ~";
+              read_only_style = "197";
+              read_only = "  ";
+              format = "at [$path]($style)[$read_only]($read_only_style) ";
+            };
+            git_metrics = {
+              disabled = false;
+              added_style = "bold blue";
+              format = "[+$added]($added_style)/[-$deleted]($deleted_style) ";
+            };
+            git_status = {
+              format = "([$all_status$ahead_behind]($style) )";
+              ahead = "[↑$count](bold green)";
+              behind = "[↓$count](bold red)";
+              diverged = "[↕↓$ahead_count↑$behind_count](red)";
+              deleted = "[✘$count](red) ";
+              modified = "[!$count](yellow) ";
+              staged = "[+$count](green) ";
+              renamed = "[➜$count](green) ";
+              untracked = "[?$count](blue) ";
+            };
+          };
         };
       };
     };
-  };
 }