Skip to content

Добавлен алиас; форматирование #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ulbee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Добавлен алиас; форматирование #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .zshrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ fpath+='/opt/homebrew/share/zsh/site-functions'
source $(brew --prefix)/opt/antidote/share/antidote/antidote.zsh
antidote load

source <(cod init $$ zsh)
# source <(cod init $$ zsh)

[[ $TERM_PROGRAM == 'iTerm.app' ]] && source ~/.iterm2_shell_integration.zsh

Expand Down Expand Up @@ -170,6 +170,7 @@ current_vcs() {
alias co='$CURRENT_VCS checkout'
alias pu='$CURRENT_VCS push'
alias br='$CURRENT_VCS branch'
alias sq='$CURRENT_VCS squash'
Copy link
Owner

@veged veged Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

по сути нужно оставить только эту строчку в диффе — остальное случайно закоммитилось

case "$CURRENT_VCS" in
git)
alias p='git pull main'
Expand All @@ -185,7 +186,7 @@ current_vcs() {

ZSH_PROMPT_TOP_LEFT() { echo "%{$([ ${+functions[iterm2_prompt_mark]} -eq 1 ] && iterm2_prompt_mark)%}%F{yellow}%~%f"}
ZSH_PROMPT_TOP_RIGHT() { echo $CURRENT_VCS_BRANCH }
ZSH_PROMPT_BOTTOM_LEFT() { echo "%F{%(?.green.red)}%(!. .➤)%f " }
ZSH_PROMPT_BOTTOM_LEFT() { echo "%F{%(?.green.red)}%(!. .󰜴)%f " }
ZSH_PROMPT_BOTTOM_RIGHT() { echo '' }
export ZSH_THEME_GIT_PROMPT_PREFIX='%B '
export ZSH_THEME_GIT_PROMPT_SUFFIX='%b%f'
Expand Down Expand Up @@ -222,7 +223,7 @@ export FZF_DEFAULT_BASE_OPTS=" \
--ansi \
--min-height=9 \
--border='rounded' --border-label='' --preview-window='border-rounded' \
--prompt='➤' --marker='' --pointer='◆' --separator='─' --scrollbar='❚'"
--prompt='󰜴 ' --marker='' --pointer='◆' --separator='─' --scrollbar='❚'"

_fzf_compgen_path() {
# eza --icons=always --color=always -1ad --absolute "$1"
Expand Down Expand Up @@ -386,7 +387,7 @@ zstyle ':fzf-tab:*' accept-line enter

eval "$(zoxide init zsh)"

source $HOME/.config/broot/launcher/bash/br
# source $HOME/.config/broot/launcher/bash/br

# Dark and light modes

Expand Down