lotsa changes I will probably roll back, wezterm and nvim added
This commit is contained in:
parent
4d85fbdca7
commit
8a05339c71
14 changed files with 220 additions and 68 deletions
|
@ -13,6 +13,13 @@ termcompat() {
|
|||
TERM=$term command $@
|
||||
}
|
||||
|
||||
fsf() {
|
||||
typeset host prompt="SSH Remote > "
|
||||
host=$(cut -d\ -f1 $HOME/.ssh/known_hosts | sort -u | fzf --prompt=$prompt) || return 1
|
||||
|
||||
termcompat ssh $host $@
|
||||
}
|
||||
|
||||
beep() { printf $'\007' }
|
||||
fixterm() { printf $'c' }
|
||||
|
||||
|
@ -26,9 +33,6 @@ tmux() { command tmux -2 $@ }
|
|||
atmux() { tmux attach || tmux }
|
||||
sush() { command sudo -Es }
|
||||
|
||||
ema() { command emacsclient -c $@ }
|
||||
em() { command emacsclient -t $@ }
|
||||
|
||||
tig() { termcompat tig $@ }
|
||||
gsi() { tig status }
|
||||
gci() { command git commit $@ }
|
||||
|
@ -45,6 +49,7 @@ greset() {
|
|||
/usr/bin/git clean -fd
|
||||
/usr/bin/git reset --hard
|
||||
}
|
||||
|
||||
if [[ -x $(whence -p diff-so-fancy) ]]; then
|
||||
gdf() { gdiff $@ | command diff-so-fancy | command less --tabs=4 -RSFX }
|
||||
else
|
|
@ -8,8 +8,8 @@
|
|||
confdir=$(dirname $0)
|
||||
conflist=(
|
||||
settings.zsh
|
||||
aliases.zsh
|
||||
prompt-powerline.zsh
|
||||
functions.zsh
|
||||
)
|
||||
|
||||
for config in $conflist; do
|
||||
|
|
|
@ -17,19 +17,35 @@ typeset -A prompt_symbols=(
|
|||
git_unmerged '*'
|
||||
bang $'\n\U01f525'
|
||||
)
|
||||
# gruvbox
|
||||
#typeset -A prompt_colors=(
|
||||
# fg '#ebdbb2'
|
||||
# user '#458588'
|
||||
# root '#cc241d'
|
||||
# ssh '#d65d0e'
|
||||
# host '#504945'
|
||||
# cwd '#3c3836'
|
||||
# ro '#d65d0e'
|
||||
# git_branch '#504945'
|
||||
# git_unstaged '#d65d0e'
|
||||
# git_staged '#458588'
|
||||
# git_untracked '#cc241d'
|
||||
# git_unmerged '#689d6a'
|
||||
#)
|
||||
# 256 color
|
||||
typeset -A prompt_colors=(
|
||||
fg '#ebdbb2'
|
||||
user '#458588'
|
||||
root '#cc241d'
|
||||
ssh '#d65d0e'
|
||||
host '#504945'
|
||||
cwd '#3c3836'
|
||||
ro '#d65d0e'
|
||||
git_branch '#504945'
|
||||
git_unstaged '#d65d0e'
|
||||
git_staged '#458588'
|
||||
git_untracked '#cc241d'
|
||||
git_unmerged '#689d6a'
|
||||
fg 253
|
||||
user 24
|
||||
root 124
|
||||
ssh 66
|
||||
host 238
|
||||
cwd 236
|
||||
ro 88
|
||||
git_branch 238
|
||||
git_unstaged 166
|
||||
git_untracked 124
|
||||
git_unmerged 171
|
||||
git_staged 54
|
||||
)
|
||||
|
||||
precmd.prompt.init() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue