From ddcab845d2c6e2d23bf81ef99591f5e36b7ac5a3 Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Wed, 11 Mar 2026 14:25:25 +0100
Subject: [PATCH] working on zsh

---
 .../applications/terminal_shell/zsh.nix       | 102 +++++++++---------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/Droidnix/generated/system/applications/terminal_shell/zsh.nix b/Droidnix/generated/system/applications/terminal_shell/zsh.nix
index fde9ca9bc..7ff7871f4 100644
--- a/Droidnix/generated/system/applications/terminal_shell/zsh.nix
+++ b/Droidnix/generated/system/applications/terminal_shell/zsh.nix
@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 
 {
   # --- NixOS Configuration ---
@@ -14,53 +19,10 @@
       enable = true;
       enableCompletion = true;
 
-      # Use oh-my-zsh only for themes (optional)
+      # Enable oh-my-zsh
       oh-my-zsh = {
         enable = true;
-        theme = "agnoster"; # Fallback
-        customThemes = {
-          catppuccin-mocha = ''
-                      # Catppuccin Mocha colors
-                      local mocha_base="#1E1E2E"
-                      local mocha_surface0="#313244"
-                      local mocha_text="#CDD6F4"
-                      local mocha_lavender="#B4BEFE"
-                      local mocha_blue="#89B4FA"
-                      local mocha_sapphire="#74C7EC"
-                      local mocha_teal="#94E2D5"
-                      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="#F5C2E7"
-                      local mocha_flamingo="#F2CDCD"
-                      local mocha_rosewater="#F5E0DC"
-
-                      # Prompt
-                      PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
-                      RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
-
-                      # Git prompt
-                      ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[$mocha_yellow]%}(%{$reset_color%}"
-                      ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[$mocha_yellow]%})%{$reset_color%}"
-                      ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[$mocha_red]%}✗%{$reset_color%}"
-                      ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[$mocha_green]%}✓%{$reset_color%}"
-                      ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[$mocha_blue]%}⇡%{$reset_color%}"
-                      ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[$mocha_blue]%}⇣%{$reset_color%}"
-                      ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[$mocha_pink]%}?%{$reset_color%}"
-                      ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[$mocha_sapphire]%}+%{$reset_color%}"
-                      ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg[$mocha_red]%}!%{$reset_color%}"
-
-                      # Virtualenv/pyenv
-                      ZSH_THEME_VIRTUAL_ENV_PREFIX="(%{$fg[$mocha_teal]%}"
-                      ZSH_THEME_VIRTUAL_ENV_SUFFIX="%{$reset_color%})"
-
-                      # Right prompt with Git status
-                      RPROMPT='$(git_prompt_info) %{$fg[$mocha_green]%}%T%{$reset_color%}'
-                    '';
-                  };
+        theme = "agnoster"; # Fallback, overridden below
       };
 
       # Declare all plugins via Nixpkgs for reproducibility
@@ -69,14 +31,58 @@
         zsh-syntax-highlighting
         zsh-completions
         zsh-history-substring-search
-        zsh-you-should-use  # Optional: Suggests aliases
+        zsh-you-should-use
       ];
 
-      # Source plugins that need explicit activation
+      # Source plugins and set custom theme
       initExtra = ''
+        # Source plugins
         source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
         source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
         source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
+
+        # Catppuccin Mocha theme for oh-my-zsh
+        # Colors
+        local mocha_base="#1E1E2E"
+        local mocha_surface0="#313244"
+        local mocha_text="#CDD6F4"
+        local mocha_lavender="#B4BEFE"
+        local mocha_blue="#89B4FA"
+        local mocha_sapphire="#74C7EC"
+        local mocha_teal="#94E2D5"
+        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="#F5C2E7"
+        local mocha_flamingo="#F2CDCD"
+        local mocha_rosewater="#F5E0DC"
+
+        # Prompt
+        PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
+        RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
+
+        # Git prompt
+        ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[$mocha_yellow]%}(%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[$mocha_yellow]%})%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[$mocha_red]%}✗%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[$mocha_green]%}✓%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[$mocha_blue]%}⇡%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[$mocha_blue]%}⇣%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[$mocha_pink]%}?%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[$mocha_sapphire]%}+%{$reset_color%}"
+        ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg[$mocha_red]%}!%{$reset_color%}"
+
+        # Virtualenv/pyenv
+        ZSH_THEME_VIRTUAL_ENV_PREFIX="(%{$fg[$mocha_teal]%}"
+        ZSH_THEME_VIRTUAL_ENV_SUFFIX="%{$reset_color%})"
+
+        # Right prompt with Git status
+        RPROMPT='$(git_prompt_info) %{$fg[$mocha_green]%}%T%{$reset_color%}'
+
+        # Set the custom theme
         ZSH_THEME="catppuccin-mocha"
       '';
     };