Compare commits

...

2 Commits

6 changed files with 68 additions and 1712 deletions

6
.gitignore vendored
View File

@ -21,10 +21,14 @@ zsh/*
!zsh/scripts.zsh
!zsh/aliases.zsh
!zsh/completions/.keep
!zsh/.p10k.zsh
!zsh/ssh-menu
!zsh/get-dump
# starship
!starship
starship/*
!starship/config.toml
# tmux
!tmux
tmux/*

52
starship/config.toml Normal file
View File

@ -0,0 +1,52 @@
add_newline = false
format = """\
$hostname\
[$directory](cyan)\
$git_branch\
$git_commit\
$git_state\
$git_status\
$character\
"""
right_format = """\
$golang\
$lua\
$nodejs\
$python\
$rust\
"""
[character]
success_symbol = '[>](bold green)'
error_symbol = '[>](bold red)'
[directory]
truncation_length = 1
truncate_to_repo = false
fish_style_pwd_dir_length = 1
[git_commit]
tag_symbol = ''
[git_branch]
symbol = ''
[git_status]
format = '[$all_status$ahead_behind]($style)'
ahead = '[↑${count}](green) '
diverged = '[↑${ahead_count}↓${behind_count}](red) '
behind = '[↓${count}](green) '
modified = '[!${count}](yellow) '
untracked = '[?${count}](blue) '
staged = '[+${count}](yellow) '
stashed = '[*${count}](green) '
deleted = '[x${count}](red) '
renamed = '[r${count}](yellow) '
[python]
format = 'via [${symbol}${pyenv_prefix}(${version} )(\($virtualenv\) )]($style)'
python_binary = 'python'
pyenv_version_name = false
detect_files = [ '.python-version' ]

File diff suppressed because it is too large Load Diff

View File

@ -7,9 +7,6 @@ getantidote/use-omz # handle OMZ dependencies
ohmyzsh/ohmyzsh path:lib # load OMZ's library
ohmyzsh/ohmyzsh path:plugins/git
# theme
romkatv/powerlevel10k
# popular fish-like plugins
zsh-users/zsh-autosuggestions

View File

@ -37,6 +37,10 @@ export PATH="$XDG_DATA_HOME/neovim/bin:$PATH"
export PYENV_ROOT="$XDG_DATA_HOME/.pyenv"
command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
# pyenv-virtualenv
# leave python promt to starship
export PYENV_VIRTUALENV_DISABLE_PROMPT=1
# poetry
export POETRY_HOME="$XDG_DATA_HOME/poetry"
command -v poetry >/dev/null || export PATH="$POETRY_HOME/bin:$PATH"
@ -50,3 +54,6 @@ export USER_GID=$(id -g)
# name
export NAME="Matej Janežič"
# starship nest config into a folder, default is ~/.config/startship.toml
export STARSHIP_CONFIG="$XDG_CONFIG_HOME/starship/config.toml"

View File

@ -2,13 +2,6 @@
export HISTFILE="$XDG_STATE_HOME/zsh/history"
export HISTSIZE=100
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.config/zsh/.zshrc.
# Initialization code that may require console input (password prompts, [y/n]
# confirmations, etc.) must go above this block; everything else may go below.
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
## pre plugin load
# nvm
export NVM_COMPLETION=true
@ -22,8 +15,9 @@ antidote load
unsetopt autocd
# pyenv
eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
eval "$(pyenv init - zsh)"
# https://github.com/pyenv/pyenv-virtualenv/issues/259
eval "$(pyenv virtualenv-init - zsh | sed s/precmd/chpwd/g)"
# ggman
eval "$(ggman shellrc)"
@ -41,5 +35,4 @@ zstyle ':completion:*' cache-path $XDG_CACHE_HOME/zsh/zcompcache
# opam configuration
# [[ ! -r /Users/janezicmatej/.opam/opam-init/init.zsh ]] || source /Users/janezicmatej/.opam/opam-init/init.zsh > /dev/null 2> /dev/null
# To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh.
[[ ! -f ~/.config/zsh/.p10k.zsh ]] || source ~/.config/zsh/.p10k.zsh
eval "$(starship init zsh)"