Working on reshuffling

This commit is contained in:
2026-03-19 07:03:28 +00:00
parent 6656be88fb
commit 86392f59a0
2 changed files with 20 additions and 54 deletions
+10 -27
View File
@@ -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"
'';
};
};
+10 -27
View File
@@ -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"
'';
};
};