diff --git a/home-manager/modules/common/default.nix b/home-manager/modules/common/default.nix
index 5dee10f..2b05833 100644
--- a/home-manager/modules/common/default.nix
+++ b/home-manager/modules/common/default.nix
@@ -17,25 +17,6 @@
       enableBashIntegration = true;
       tmux.enableShellIntegration = true;
     };
-    starship = {
-      settings = {
-        add_newline = false;
-        format = lib.concatStrings [
-          "$username"
-          "$hostname"
-          "$directory"
-          "$nix_shell"
-          "$python"
-          "$git_branch"
-          "$git_status"
-          "$character"
-        ];
-        python = {
-          format = "[\${symbol}($virtualenv) ]($style)";
-        };
-      };
-      enable = true;
-    };
     vim = {
       enable = true;
       settings = {
diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
index 0d5bd62..5419189 100644
--- a/home-manager/modules/default.nix
+++ b/home-manager/modules/default.nix
@@ -17,6 +17,7 @@
     ./programs/rapid-photo-downloader
     ./programs/signal
     ./programs/ssh
+    ./programs/starship
     ./programs/telegram
     ./programs/tmux
     ./programs/vagrant-wsl
diff --git a/home-manager/modules/programs/starship/default.nix b/home-manager/modules/programs/starship/default.nix
new file mode 100644
index 0000000..52baf6d
--- /dev/null
+++ b/home-manager/modules/programs/starship/default.nix
@@ -0,0 +1,36 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.programs.az-starship;
+in
+{
+  options = {
+    programs.az-starship.enable = lib.mkEnableOption "My configuration for Starship";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.starship = {
+      settings = {
+        add_newline = false;
+        format = lib.concatStrings [
+          "$username"
+          "$hostname"
+          "$directory"
+          "$nix_shell"
+          "$python"
+          "$git_branch"
+          "$git_status"
+          "$character"
+        ];
+        python = {
+          format = "[\${symbol}($virtualenv) ]($style)";
+        };
+      };
+      enable = true;
+    };
+  };
+}
diff --git a/home-manager/profiles/management.nix b/home-manager/profiles/management.nix
index 6dc7036..f4b14a6 100644
--- a/home-manager/profiles/management.nix
+++ b/home-manager/profiles/management.nix
@@ -19,6 +19,7 @@
     az-hunspell.enable = true;
     az-open-port.enable = true;
     az-ssh.enable = true;
+    az-starship.enable = true;
     az-tmux.enable = true;
   };
   systemd.user.startServices = "sd-switch";
diff --git a/home-manager/profiles/work-wsl.nix b/home-manager/profiles/work-wsl.nix
index 9481226..83f7382 100644
--- a/home-manager/profiles/work-wsl.nix
+++ b/home-manager/profiles/work-wsl.nix
@@ -56,6 +56,7 @@
       userEmail = "zweili@contria.com";
     };
     az-hunspell.enable = true;
+    az-starship.enable = true;
     az-tmux.enable = true;
     az-vagrant-wsl.enable = true;
     bash = {