From 2958eeef8d11812d768d384f7523be8cf4654ed8 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 07:09:26 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 103 +++++++++---------- Droidnix/generated/modules/terminals/zsh.nix | 103 +++++++++---------- 2 files changed, 102 insertions(+), 104 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index fa62fd9ea..b22c1fbb2 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1311,67 +1311,66 @@ 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 -{ config, pkgs, lib, ... }: +{ lib, pkgs, ... }: let username = "henrov"; in { - # Activeer Home Manager (als NixOS module) - programs.home-manager.enable = true; + # Home Manager configuratie + homeConfigurations = { + ${username} = lib.recursiveUpdate (import { + inherit pkgs lib; + # eventueel: extraModules = [ ... ]; + }) { + home.username = username; + home.homeDirectory = "/home/${username}"; - home-manager.users.${username} = { - programs.zsh = { - enable = true; - enableCompletion = true; - - ohMyZsh = { + programs.zsh = { enable = true; - theme = "catppuccin-mocha"; + enableCompletion = true; - # Plugins in de juiste volgorde - plugins = [ - "git" - "docker" - "direnv" - "zsh-autosuggestions" - "zsh-completions" - "zsh-history-substring-search" - # zsh-syntax-highlighting wordt apart in initExtra gesourced - ]; + ohMyZsh = { + enable = true; + theme = "catppuccin-mocha"; + plugins = [ + "git" + "docker" + "direnv" + "zsh-autosuggestions" + "zsh-completions" + "zsh-history-substring-search" + ]; + }; + + initExtra = '' + # Catppuccin Mocha kleuren + 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='%{$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%}' + + # Zsh-syntax-highlighting sourcen + if [ -f ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then + source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + fi + ''; }; - - # Extra init script om syntax-highlighting correct te laden - initExtra = '' - # Catppuccin Mocha kleuren - 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 configuratie - 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%}' - - # Zsh-syntax-highlighting correct sourcen - if [ -f ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then - source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - fi - - # Zsh-autosuggestions en andere plugins worden automatisch geladen via oh-my-zsh - ''; }; }; } diff --git a/Droidnix/generated/modules/terminals/zsh.nix b/Droidnix/generated/modules/terminals/zsh.nix index 92c6c0aa2..10d58ecda 100644 --- a/Droidnix/generated/modules/terminals/zsh.nix +++ b/Droidnix/generated/modules/terminals/zsh.nix @@ -1,64 +1,63 @@ -{ config, pkgs, lib, ... }: +{ lib, pkgs, ... }: let username = "henrov"; in { - # Activeer Home Manager (als NixOS module) - programs.home-manager.enable = true; + # Home Manager configuratie + homeConfigurations = { + ${username} = lib.recursiveUpdate (import { + inherit pkgs lib; + # eventueel: extraModules = [ ... ]; + }) { + home.username = username; + home.homeDirectory = "/home/${username}"; - home-manager.users.${username} = { - programs.zsh = { - enable = true; - enableCompletion = true; - - ohMyZsh = { + programs.zsh = { enable = true; - theme = "catppuccin-mocha"; + enableCompletion = true; - # Plugins in de juiste volgorde - plugins = [ - "git" - "docker" - "direnv" - "zsh-autosuggestions" - "zsh-completions" - "zsh-history-substring-search" - # zsh-syntax-highlighting wordt apart in initExtra gesourced - ]; + ohMyZsh = { + enable = true; + theme = "catppuccin-mocha"; + plugins = [ + "git" + "docker" + "direnv" + "zsh-autosuggestions" + "zsh-completions" + "zsh-history-substring-search" + ]; + }; + + initExtra = '' + # Catppuccin Mocha kleuren + 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='%{$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%}' + + # Zsh-syntax-highlighting sourcen + if [ -f ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then + source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + fi + ''; }; - - # Extra init script om syntax-highlighting correct te laden - initExtra = '' - # Catppuccin Mocha kleuren - 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 configuratie - 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%}' - - # Zsh-syntax-highlighting correct sourcen - if [ -f ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then - source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - fi - - # Zsh-autosuggestions en andere plugins worden automatisch geladen via oh-my-zsh - ''; }; }; }