From bcc03c12406972fc223bf7b18019ff794ab0e148 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 1 Aug 2022 21:17:58 +0000 Subject: [PATCH] formatting --- home/private_bin/executable_lock | 3 --- lib/fzf.zsh | 3 +-- lib/prompt.sh | 16 ++++++++++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/home/private_bin/executable_lock b/home/private_bin/executable_lock index fc6644f..f424b85 100644 --- a/home/private_bin/executable_lock +++ b/home/private_bin/executable_lock @@ -58,7 +58,6 @@ sleep 0.1 i3lock \ -n \ --screen 1 \ - \ --color $bg_color \ --inside-color ffffff00 \ --ring-color $green \ @@ -71,12 +70,10 @@ i3lock \ --keyhl-color $cyan \ --bshl-color $red \ --wrong-color $red \ - \ --ind-pos x+w-5-r:y+h-10-r \ --ring-width 25 \ --radius 100 \ --verif-text "" \ - \ --greeter-text "$(make_figlet)" \ --greeter-font "${font}" \ --greeter-size $font_size \ diff --git a/lib/fzf.zsh b/lib/fzf.zsh index 69c1d96..df93bb9 100755 --- a/lib/fzf.zsh +++ b/lib/fzf.zsh @@ -20,7 +20,6 @@ FZF_COLORS=" --color=marker:#F8BD96,fg+:#F2CDCD,prompt:#DDB6F2,hl+:#F28FAD " - FZF_LAYOUT=" --height=40% --border=rounded @@ -60,7 +59,7 @@ export FZF_ALT_C_OPTS=" " # [[ -v FZF_CTRL_T_COMMAND ]] && && export FZF_CTRL_T_COMMAND=${FZF_DEFAULT_COMMAND} -[[ -z "$FZF_CTRL_T_COMMAND" ]] && export FZF_CTRL_T_COMMAND="${FZF_DEFAULT_COMMAND}" +[[ -z $FZF_CTRL_T_COMMAND ]] && export FZF_CTRL_T_COMMAND="${FZF_DEFAULT_COMMAND}" # fix spacing on fzf-tab to show max options zstyle ':fzf-tab:*' fzf-pad 4 diff --git a/lib/prompt.sh b/lib/prompt.sh index 99ab82a..8f1eda4 100755 --- a/lib/prompt.sh +++ b/lib/prompt.sh @@ -5,8 +5,16 @@ if is-executable sheldon; then eval "$(sheldon -q --config-file ~/.config/sheldon/plugins.toml source)" fi -# TODO: make decent fall back shell - -is-executable starship && eval "$(starship init zsh)" - is-executable zoxide && eval eval "$(zoxide init zsh --cmd cd)" + +if is-executable starship; then + eval "$(starship init zsh)" +else + autoload -Uz vcs_info + precmd() { vcs_info } + + zstyle ':vcs_info:git:*' formats '%b ' + + setopt PROMPT_SUBST + PROMPT='%F{green}%*%f %F{blue}%~%f %F{red}${vcs_info_msg_0_}%f$ ' +fi