diff --git a/Droidnix/README.org b/Droidnix/README.org
index 940fa6f32..adc5a4b1e 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1306,24 +1306,23 @@ This file sets up starship prompt
 { lib, ... }:
 
 let
-  # Absolute path to the Starship config in the flake
   starshipAssets = ../../../assets/system/conf/starship.toml;
-
-  # Read the TOML file (or import if you need structured content)
   starshipConfig = lib.importTOML starshipAssets;
 
-  # Toggle for enabling Starship
   enableStarship = true;
 in
 {
-  # Declare an option so this module is configurable
+  # Option to enable Starship
   options.enableStarship = lib.mkEnableOption "Enable Starship prompt";
 
-  # All runtime config goes under `config`
+  # Config applied only if enabled
   config = lib.mkIf enableStarship {
-    programs.starship = {
-      enable = true;
-      settings = starshipConfig;
+    # Home Manager users block avoids undefined `programs`
+    home-manager.users.henrov = {
+      programs.starship = {
+        enable = true;
+        settings = starshipConfig;
+      };
     };
   };
 }
diff --git a/Droidnix/generated/modules/terminals/starship.nix b/Droidnix/generated/modules/terminals/starship.nix
index c49846fb0..767cf22c1 100644
--- a/Droidnix/generated/modules/terminals/starship.nix
+++ b/Droidnix/generated/modules/terminals/starship.nix
@@ -1,24 +1,23 @@
 { lib, ... }:
 
 let
-  # Absolute path to the Starship config in the flake
   starshipAssets = ../../../assets/system/conf/starship.toml;
-
-  # Read the TOML file (or import if you need structured content)
   starshipConfig = lib.importTOML starshipAssets;
 
-  # Toggle for enabling Starship
   enableStarship = true;
 in
 {
-  # Declare an option so this module is configurable
+  # Option to enable Starship
   options.enableStarship = lib.mkEnableOption "Enable Starship prompt";
 
-  # All runtime config goes under `config`
+  # Config applied only if enabled
   config = lib.mkIf enableStarship {
-    programs.starship = {
-      enable = true;
-      settings = starshipConfig;
+    # Home Manager users block avoids undefined `programs`
+    home-manager.users.henrov = {
+      programs.starship = {
+        enable = true;
+        settings = starshipConfig;
+      };
     };
   };
 }