Regenerated

2026-03-30 14:05:23 +00:00
parent bcb0e3d870
commit 82cf6c4374
3 changed files with 318 additions and 345 deletions
@@ -1200,27 +1200,18 @@ 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
-let
-  zshSyntaxHighlighter = "${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh";
-in ''
-  # Load colors
-  autoload -U colors; colors
+# Path to syntax highlighting installed by Nix
+ZSH_SYNTAX_HIGHLIGHTING="${HOME}/.nix-profile/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"

-  # Catppuccin colors
-  mocha_blue="#89B4FA"
-  mocha_peach="#FAB387"
-  mocha_lavender="#B4BEFE"
-  mocha_red="#F38BA8"
-  mocha_green="#A6E3A1"
+# Load syntax highlighting if available
+if [ -f "$ZSH_SYNTAX_HIGHLIGHTING" ]; then
+    source "$ZSH_SYNTAX_HIGHLIGHTING"
+fi

-  PROMPT="%F{$mocha_blue}%n%f@%F{$mocha_peach}%m%f %F{$mocha_lavender}%~%f %F{$mocha_red}$%f "
-  RPROMPT="%F{$mocha_green}%T%f"
-
-  # Source syntax highlighting
-  if [ -f "${zshSyntaxHighlighter}" ]; then
-    source "${zshSyntaxHighlighter}"
-  fi
-''
+# Initialize Starship prompt
+if command -v starship >/dev/null 2>&1; then
+    eval "$(starship init zsh)"
+fi
 #+END_SRC

 ** =generated/modules/traveldroid/apps/emacs/emacs.nix=
@@ -1,21 +1,12 @@
-let
-  zshSyntaxHighlighter = "${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh";
-in ''
-  # Load colors
-  autoload -U colors; colors
+# Path to syntax highlighting installed by Nix
+ZSH_SYNTAX_HIGHLIGHTING="${HOME}/.nix-profile/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"

-  # Catppuccin colors
-  mocha_blue="#89B4FA"
-  mocha_peach="#FAB387"
-  mocha_lavender="#B4BEFE"
-  mocha_red="#F38BA8"
-  mocha_green="#A6E3A1"
+# Load syntax highlighting if available
+if [ -f "$ZSH_SYNTAX_HIGHLIGHTING" ]; then
+    source "$ZSH_SYNTAX_HIGHLIGHTING"
+fi

-  PROMPT="%F{$mocha_blue}%n%f@%F{$mocha_peach}%m%f %F{$mocha_lavender}%~%f %F{$mocha_red}$%f "
-  RPROMPT="%F{$mocha_green}%T%f"
-
-  # Source syntax highlighting
-  if [ -f "${zshSyntaxHighlighter}" ]; then
-    source "${zshSyntaxHighlighter}"
-  fi
-''
+# Initialize Starship prompt
+if command -v starship >/dev/null 2>&1; then
+    eval "$(starship init zsh)"
+fi