From 305c891d7d648d0d182dd91b124ccead18b57bc1 Mon Sep 17 00:00:00 2001 From: materus Date: Sun, 31 Mar 2024 19:03:36 +0200 Subject: [PATCH] home-profile: zsh move colors check from zshenv --- configurations/profile/home/shell/zsh.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configurations/profile/home/shell/zsh.nix b/configurations/profile/home/shell/zsh.nix index 916375c..395659a 100644 --- a/configurations/profile/home/shell/zsh.nix +++ b/configurations/profile/home/shell/zsh.nix @@ -71,11 +71,6 @@ in envExtra = '' - - if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then - __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-1}"; else - __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-0}"; - fi ${makeEnv "__MATERUS_HM_ZSH" "1"} ${makeEnv "__MATERUS_HM_ZSH_PROMPT" cfg.prompt} ${makeEnv "__MATERUS_HM_ZSH_PRIVATE" "0"} @@ -83,10 +78,15 @@ in initExtraFirst = '' + ${makeIfVar "__MATERUS_HM_ZSH_PROMPT" "p10k" '' if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" fi + if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then + __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-1}"; else + __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-0}"; + fi if [[ -f "${extraPlugins.powerlevel10k.fullPath}" ]]; then source "${extraPlugins.powerlevel10k.fullPath}" fi