From b70fd757c55ea8ed78b782fad1637a315028df06 Mon Sep 17 00:00:00 2001 From: caem Date: Fri, 24 Jan 2025 13:04:46 +0100 Subject: [PATCH] dlfkjsd --- modules/home/caem/core/zsh/conf.d/ps1.zsh | 22 +++++++--------------- modules/home/caem/core/zsh/default.nix | 8 ++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/home/caem/core/zsh/conf.d/ps1.zsh b/modules/home/caem/core/zsh/conf.d/ps1.zsh index 4dc0e79..e1407ca 100644 --- a/modules/home/caem/core/zsh/conf.d/ps1.zsh +++ b/modules/home/caem/core/zsh/conf.d/ps1.zsh @@ -1,14 +1,11 @@ #!/usr/bin/env zsh -# TODO: Add vcs -# stt colors -local c0=$'\e[0m' -local c31=$'\e[31m' -local c33=$'\e[33m' -local c34=$'\e[34m' -local c35=$'\e[35m' -local c38=$'\e[38m' -# end colors +local c0='%{\e[0m%}' +local c31='%{\e[31m%}' +local c33='%{\e[33m%}' +local c34='%{\e[34m%}' +local c35='%{\e[35m%}' +local c38='%{\e[38m%}' local nix_shell_ps1_t=" $c34{$c33󱄅 shell$c34}$c0" local path_no_ghostty="$(echo "$PATH" | sed -e 's/:\/nix\/store\/.*-ghostty-.*\/bin://g')" @@ -19,11 +16,6 @@ elif [[ "$path_no_ghostty" == *"/nix/store"* ]]; then local nix_shell_ps1="$nix_shell_ps1_t" fi - -setopt prompt_subst -autoload -Uz vcs_info -precmd () { vcs_info } zstyle ':vcs_info:*' formats " ${c34}${c0}${c31}(%b)${c0}" - -export PS1="${c38}[${c35}%3~${c0}$vcs_info_msg_0_${nix_shell_ps1}${c38}]${c0}# " +export PS1="${c38}[${c35}%3~${c0}${vcs_info_msg_0_}${nix_shell_ps1}${c38}]${c0}# " diff --git a/modules/home/caem/core/zsh/default.nix b/modules/home/caem/core/zsh/default.nix index 1f57f19..050591f 100644 --- a/modules/home/caem/core/zsh/default.nix +++ b/modules/home/caem/core/zsh/default.nix @@ -11,6 +11,8 @@ fastfetch tre-command btop + zsh-completions + nix-zsh-completions ]; programs.bat = { @@ -51,6 +53,12 @@ tree = "tre"; }; + initExtraFirst = '' + setopt prompt_subst + autoload -Uz vcs_info + precmd () { vcs_info } + ''; + initExtra = '' alias -g -- -h='-h 2>&1 | bat --language=help --style=plain' alias -g -- --help='--help 2>&1 | bat --language=help --style=plain'