von/vdotfiles
1
0
Fork 0
Code Activity

zsh: more emacs related tweaks

Browse source
This commit is contained in:
Von Random 2022-08-23 16:13:04 +03:00
parent 639b04d45e
commit 4d85fbdca7
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
zsh/functions.zsh → zsh/aliases.zsh
View file

@ -26,10 +26,8 @@ tmux() { command tmux -2 $@ }
atmux() { tmux attach || tmux } atmux() { tmux attach || tmux }
sush() { command sudo -Es } sush() { command sudo -Es }
emd() { command emacs --daemon &>/dev/null &! } ema() { command emacsclient -c $@ }
ema() { command emacsclient -a '' "$@"} em() { command emacsclient -t $@ }
emg() { ema -c $@ }
em() { ema -t $@ }
tig() { termcompat tig $@ } tig() { termcompat tig $@ }
gsi() { tig status } gsi() { tig status }
@ -53,7 +51,6 @@ else
gdf() { gdiff $@ } gdf() { gdiff $@ }
fi fi
unalias ls ld ll 2>/dev/null
if [[ -x $(whence -p exa) ]]; then if [[ -x $(whence -p exa) ]]; then
ls() { command exa --group-directories-first $@ } ls() { command exa --group-directories-first $@ }
ll() { ls -alg $@ } ll() { ls -alg $@ }

2
zsh/init.zsh
View file

@ -8,7 +8,7 @@
confdir=$(dirname $0) confdir=$(dirname $0)
conflist=( conflist=(
settings.zsh settings.zsh
functions.zsh aliases.zsh
prompt-powerline.zsh prompt-powerline.zsh
) )

2
zsh/prompt-powerline.zsh
View file

@ -114,7 +114,7 @@ precmd.prompt.git() {
esac esac
done <<< $raw_status done <<< $raw_status
for i in git_unstaged git_staged git_untracked git_unmerged; do for i in git_unstaged git_untracked git_unmerged git_staged; do
(( count[$i] )) && precmd.prompt.add "$count[$i]$prompt_symbols[$i]" $prompt_colors[$i] (( count[$i] )) && precmd.prompt.add "$count[$i]$prompt_symbols[$i]" $prompt_colors[$i]
done done
} }

3
zsh/settings.zsh
View file

@ -12,6 +12,7 @@ export PAGER=less
export EDITOR=vim export EDITOR=vim
export TIME_STYLE=long-iso export TIME_STYLE=long-iso
export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock" export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock"
export ALTERNATE_EDITOR=
bindkey -e bindkey -e
bindkey $terminfo[kdch1] delete-char bindkey $terminfo[kdch1] delete-char
@ -38,3 +39,5 @@ zstyle ':completion:*' rehash true
zstyle ':completion:*:kill:*:processes' command 'ps --forest -A -o pid,user,cmd' zstyle ':completion:*:kill:*:processes' command 'ps --forest -A -o pid,user,cmd'
zstyle ':completion:*:processes-names' command 'ps axho command' zstyle ':completion:*:processes-names' command 'ps axho command'
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
unalias ld ls ll &>/dev/null