Regenerated

Droidnix/README.org

@@ -622,22 +622,24 @@ let
 in
 {
   #################################
-  # Enable Starship system-wide
+  # Install Starship system-wide
   #################################
   environment.systemPackages = [ pkgs.starship ];
 
   #################################
   # Home Manager user configuration
   #################################
-  _module.args.hmUsers = {
+  home-manager.users = {
     ${username} = {
       programs.starship = {
         enable = true;
       };
 
-      # Copy the starship.toml from assets to ~/.config/starship.toml
       home.file = {
-        ".config/starship.toml" = { source = starshipConfSrc; };
+        ".config/starship.toml" = {
+          source = starshipConfSrc;
+          force = true;
+        };
       };
     };
   };
@@ -1175,6 +1177,9 @@ in
 
     # Load optional per-user generated zshrc if it exists
     [ -f "${generatedZsh}" ] && source "${generatedZsh}"
+
+    # Initialize Starship prompt
+    eval "$(starship init zsh)"
   '';
 }
 #+END_SRC
@@ -1182,32 +1187,27 @@ in
 ** =generated/.config/zsh/.zshrc
 This sets up the zsh in the terminal
 #+BEGIN_SRC bash :tangle generated/.config/zsh/.zshrc :noweb yes :mkdirp yes :eval never
-# Catppuccin Mocha colors
+let
-local mocha_base="#1E1E2E"
+  zshSyntaxHighlighter = "${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh";
-local mocha_surface0="#313244"
+in ''
-local mocha_text="#CDD6F4"
+  # Load colors
-local mocha_lavender="#B4BEFE"
+  autoload -U colors; colors
-local mocha_blue="#89B4FA"
-local mocha_sapphire="#74C7EC"
-local mocha_teal="#94D2D5"
-local mocha_green="#A6E3A1"
-local mocha_yellow="#F9E2AF"
-local mocha_peach="#FAB387"
-local mocha_maroon="#EBA0AC"
-local mocha_red="#F38BA8"
-local mocha_mauve="#CBA6F7"
-local mocha_pink="#F5E2C7"
-local mocha_flamingo="#F2CDCD"
-local mocha_rosewater="#F5E0DC"
 
-# Prompt
+  # Catppuccin colors
-PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
+  mocha_blue="#89B4FA"
-RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
+  mocha_peach="#FAB387"
+  mocha_lavender="#B4BEFE"
+  mocha_red="#F38BA8"
+  mocha_green="#A6E3A1"
 
-# Source zsh-syntax-highlighting if present
+  PROMPT="%F{$mocha_blue}%n%f@%F{$mocha_peach}%m%f %F{$mocha_lavender}%~%f %F{$mocha_red}$%f "
-if [ -f ${files."zsh-syntax-highlighting".src} ]; then
+  RPROMPT="%F{$mocha_green}%T%f"
-source ${files."zsh-syntax-highlighting".src}
+
-fi
+  # Source syntax highlighting
+  if [ -f "${zshSyntaxHighlighter}" ]; then
+    source "${zshSyntaxHighlighter}"
+  fi
+''
 #+END_SRC
 
 ** =generated/modules/traveldroid/apps/emacs/emacs.nix=

Droidnix/generated/.config/zsh/.zshrc

@@ -1,26 +1,21 @@
-# Catppuccin Mocha colors
+let
-local mocha_base="#1E1E2E"
+  zshSyntaxHighlighter = "${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh";
-local mocha_surface0="#313244"
+in ''
-local mocha_text="#CDD6F4"
+  # Load colors
-local mocha_lavender="#B4BEFE"
+  autoload -U colors; colors
-local mocha_blue="#89B4FA"
-local mocha_sapphire="#74C7EC"
-local mocha_teal="#94D2D5"
-local mocha_green="#A6E3A1"
-local mocha_yellow="#F9E2AF"
-local mocha_peach="#FAB387"
-local mocha_maroon="#EBA0AC"
-local mocha_red="#F38BA8"
-local mocha_mauve="#CBA6F7"
-local mocha_pink="#F5E2C7"
-local mocha_flamingo="#F2CDCD"
-local mocha_rosewater="#F5E0DC"
 
-# Prompt
+  # Catppuccin colors
-PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
+  mocha_blue="#89B4FA"
-RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
+  mocha_peach="#FAB387"
+  mocha_lavender="#B4BEFE"
+  mocha_red="#F38BA8"
+  mocha_green="#A6E3A1"
 
-# Source zsh-syntax-highlighting if present
+  PROMPT="%F{$mocha_blue}%n%f@%F{$mocha_peach}%m%f %F{$mocha_lavender}%~%f %F{$mocha_red}$%f "
-if [ -f ${files."zsh-syntax-highlighting".src} ]; then
+  RPROMPT="%F{$mocha_green}%T%f"
-source ${files."zsh-syntax-highlighting".src}
+
-fi
+  # Source syntax highlighting
+  if [ -f "${zshSyntaxHighlighter}" ]; then
+    source "${zshSyntaxHighlighter}"
+  fi
+''

Droidnix/generated/modules/traveldroid/apps/starship.nix

@@ -9,22 +9,24 @@ let
 in
 {
   #################################
-  # Enable Starship system-wide
+  # Install Starship system-wide
   #################################
   environment.systemPackages = [ pkgs.starship ];
 
   #################################
   # Home Manager user configuration
   #################################
-  _module.args.hmUsers = {
+  home-manager.users = {
     ${username} = {
       programs.starship = {
         enable = true;
       };
 
-      # Copy the starship.toml from assets to ~/.config/starship.toml
       home.file = {
-        ".config/starship.toml" = { source = starshipConfSrc; };
+        ".config/starship.toml" = {
+          source = starshipConfSrc;
+          force = true;
+        };
       };
     };
   };

Droidnix/generated/modules/traveldroid/apps/zsh.nix

@@ -31,5 +31,8 @@ in
 
     # Load optional per-user generated zshrc if it exists
     [ -f "${generatedZsh}" ] && source "${generatedZsh}"
+
+    # Initialize Starship prompt
+    eval "$(starship init zsh)"
   '';
 }