From 86392f59a089c381d715ae047568ee4c9d2d186c Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Thu, 19 Mar 2026 07:03:28 +0000
Subject: [PATCH] Working on reshuffling

---
 Droidnix/README.org                          | 37 ++++++--------------
 Droidnix/generated/modules/terminals/zsh.nix | 37 ++++++--------------
 2 files changed, 20 insertions(+), 54 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 85e2397aa..5609ab31a 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1311,16 +1311,18 @@ in
 ** =generated/modules/terminals/zsh.nix=
 This sets up the zsh terminal
 #+BEGIN_SRC nix :tangle generated/modules/terminals/zsh.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, ... }:
+{ pkgs, lib, ... }:
 
+let
+  username = "henrov"; # vervang door je echte gebruikersnaam
+in
 {
-  # Dendritic flake configuration for Zsh
-  mySystem = {
-    terminals.zsh = {
+  # Home Manager gebruiker
+  home-manager.users.${username} = {
+    programs.zsh = {
       enable = true;
       enableCompletion = true;
 
-      # Oh-My-Zsh configuration
       ohMyZsh = {
         enable = true;
         plugins = [
@@ -1332,11 +1334,11 @@ This sets up the zsh terminal
           "zsh-completions"
           "zsh-history-substring-search"
         ];
-        theme = "catppuccin-mocha"; # fallback / reference
+        theme = "catppuccin-mocha";
       };
 
-      # Optional initContent for advanced theming / plugin sourcing
-      initContent = ''
+      # Optioneel: init content
+      initExtra = ''
         # Example prompt colors for Catppuccin Mocha
         local mocha_base="#1E1E2E"
         local mocha_surface0="#313244"
@@ -1355,27 +1357,8 @@ This sets up the zsh terminal
         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%})"
-
-        # Set custom theme
-        ZSH_THEME="catppuccin-mocha"
       '';
     };
   };
diff --git a/Droidnix/generated/modules/terminals/zsh.nix b/Droidnix/generated/modules/terminals/zsh.nix
index 9ee9a4ec8..72d13095e 100644
--- a/Droidnix/generated/modules/terminals/zsh.nix
+++ b/Droidnix/generated/modules/terminals/zsh.nix
@@ -1,13 +1,15 @@
-{ lib, config, ... }:
+{ pkgs, lib, ... }:
 
+let
+  username = "henrov"; # vervang door je echte gebruikersnaam
+in
 {
-  # Dendritic flake configuration for Zsh
-  mySystem = {
-    terminals.zsh = {
+  # Home Manager gebruiker
+  home-manager.users.${username} = {
+    programs.zsh = {
       enable = true;
       enableCompletion = true;
 
-      # Oh-My-Zsh configuration
       ohMyZsh = {
         enable = true;
         plugins = [
@@ -19,11 +21,11 @@
           "zsh-completions"
           "zsh-history-substring-search"
         ];
-        theme = "catppuccin-mocha"; # fallback / reference
+        theme = "catppuccin-mocha";
       };
 
-      # Optional initContent for advanced theming / plugin sourcing
-      initContent = ''
+      # Optioneel: init content
+      initExtra = ''
         # Example prompt colors for Catppuccin Mocha
         local mocha_base="#1E1E2E"
         local mocha_surface0="#313244"
@@ -42,27 +44,8 @@
         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%})"
-
-        # Set custom theme
-        ZSH_THEME="catppuccin-mocha"
       '';
     };
   };