mirror of
https://github.com/NaomiAmethyst/dots.git
synced 2025-08-05 16:48:38 +00:00
woah, I cannot believe I forgot to add these changes. They are the modified zshrc and install.pl that should have been part of the last change
This commit is contained in:
David Majnemer
parent
ba2f3cfb85
commit
1187b7cd88
2 changed files with 11 additions and 416 deletions
|
|
@ -47,6 +47,10 @@ my %links = (
|
|||
|
||||
inputrc => '.inputrc',
|
||||
|
||||
bash => '.bash',
|
||||
bashrc => '.bashrc',
|
||||
bash_profile => '.bash_profile',
|
||||
|
||||
zsh => '.zsh',
|
||||
zshrc => '.zshrc',
|
||||
|
||||
|
|
|
|||
423
zshrc
423
zshrc
|
|
@ -16,422 +16,6 @@ fi
|
|||
autoload -U edit-command-line
|
||||
zle -N edit-command-line
|
||||
|
||||
# only alphanumeric chars for moving around
|
||||
WORDCHARS=''
|
||||
|
||||
# disable core dumps
|
||||
limit coredumpsize 0
|
||||
|
||||
# clear on exit
|
||||
trap clear 0
|
||||
|
||||
# shell options
|
||||
setopt AUTO_CD # directoy command does cd
|
||||
setopt CORRECT # correct spelling of commands
|
||||
setopt AUTO_PUSHD # cd uses directory stack
|
||||
setopt CHASE_DOTS # resolve .. in cd
|
||||
setopt CHASE_LINKS # resolve symbolic links in cd
|
||||
setopt CDABLE_VARS # cd var works if $var is a directory
|
||||
setopt PUSHD_SILENT # make pushd quiet
|
||||
setopt ALWAYS_TO_END # goto end of word on completion
|
||||
setopt EXTENDED_GLOB # use zsh globbing extensions
|
||||
setopt SH_WORD_SPLIT # split non-array variables
|
||||
setopt BASH_AUTO_LIST # list completions on second tab
|
||||
setopt LIST_ROWS_FIRST # list completions across
|
||||
setopt COMPLETE_IN_WORD # completion works inside words
|
||||
setopt MAGIC_EQUAL_SUBST # special expansion after all =
|
||||
|
||||
unsetopt BEEP # stop beeping!
|
||||
unsetopt LIST_BEEP # seriously, stop beeping!
|
||||
|
||||
unsetopt NO_MATCH # dont error on no glob matches
|
||||
|
||||
# history
|
||||
export HISTSIZE=1000
|
||||
export SAVEHIST=1000
|
||||
export HISTFILE="${HOME}/.zsh/.history"
|
||||
|
||||
setopt SHARE_HISTORY
|
||||
setopt HIST_IGNORE_SPACE
|
||||
setopt HIST_REDUCE_BLANKS
|
||||
setopt INC_APPEND_HISTORY
|
||||
setopt HIST_IGNORE_ALL_DUPS
|
||||
|
||||
unsetopt HIST_BEEP
|
||||
unsetopt EXTENDED_HISTORY
|
||||
|
||||
# colors
|
||||
for dircolors in gdircolors dircolors ; do
|
||||
if (which $dircolors &> /dev/null) ; then
|
||||
eval $($dircolors -b $([ -f /etc/DIR_COLORS ] && echo "/etc/DIR_COLORS")) && break
|
||||
fi
|
||||
done
|
||||
|
||||
# terminal fallback stuff
|
||||
function fix_term
|
||||
{
|
||||
if (infocmp $1 &> /dev/null) ; then
|
||||
echo $1
|
||||
else
|
||||
case $1 in
|
||||
rxvt|xterm?*|kterm|putty)
|
||||
fix_term xterm
|
||||
;;
|
||||
*rxvt?*|Eterm|aterm)
|
||||
fix_term rxvt
|
||||
;;
|
||||
mlterm)
|
||||
fix_term kterm
|
||||
;;
|
||||
screen?*)
|
||||
fix_term screen
|
||||
;;
|
||||
putty?*)
|
||||
fix_term putty
|
||||
;;
|
||||
*)
|
||||
echo "vt100"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
|
||||
# sorta hacky, but I cannot find a better way to do this :/
|
||||
function fix_terminfo_db
|
||||
{
|
||||
if [[ `which infocmp` = "$1/bin/infocmp" ]] ; then
|
||||
export TERMINFO="$1/share/terminfo"
|
||||
fi
|
||||
}
|
||||
|
||||
( which lesspipe &> /dev/null ) && eval $(lesspipe)
|
||||
export LESS='-iR'
|
||||
|
||||
export PAGER
|
||||
for PAGER in less more pg ; do
|
||||
(which $PAGER &> /dev/null) && break
|
||||
done
|
||||
|
||||
export EDITOR
|
||||
for EDITOR in vim elvis vile nvi vi ; do
|
||||
(which $EDITOR &> /dev/null) && break
|
||||
done
|
||||
|
||||
# aliases
|
||||
alias cd..='cd ..'
|
||||
|
||||
# handles per OS aliases, fixes a few terms
|
||||
case `uname -s` in
|
||||
Linux|CYGWIN*)
|
||||
alias ls="ls -h --color=auto"
|
||||
alias grep='grep -d skip --color=auto'
|
||||
;;
|
||||
FreeBSD|Darwin|DragonFly)
|
||||
export LSCOLORS=ExGxFxDxCxDxDxHbaDacec
|
||||
alias ls="ls -Gh"
|
||||
alias grep='grep -d skip --color=auto'
|
||||
;;
|
||||
Interix)
|
||||
alias ls="ls --color"
|
||||
|
||||
fix_terminfo_db "/usr/local"
|
||||
;;
|
||||
SunOS)
|
||||
if (which gls &> /dev/null) ; then
|
||||
alias ls="gls -h --color=auto"
|
||||
else
|
||||
alias ls="ls -h"
|
||||
fi
|
||||
|
||||
if (which ggrep &> /dev/null) ; then
|
||||
alias grep='ggrep -d skip --color=auto'
|
||||
fi
|
||||
|
||||
for locate in glocate slocate ; do
|
||||
(which $locate &> /dev/null) && alias locate=$locate
|
||||
done
|
||||
|
||||
fix_terminfo_db "/opt/csw"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
export TERM=$(fix_term $TERM)
|
||||
|
||||
if [[ $TERM == *256* ]] && (infocmp screen-256color-bce &> /dev/null) ; then
|
||||
export SCREEN_COLOR="-256color"
|
||||
fi
|
||||
|
||||
alias df='df -h'
|
||||
alias du='du -h'
|
||||
|
||||
alias ping='ping -c4'
|
||||
|
||||
alias cp='nocorrect cp'
|
||||
alias mv='nocorrect mv'
|
||||
alias rm='nocorrect rm -ir'
|
||||
alias mkdir='nocorrect mkdir'
|
||||
|
||||
alias :q='exit'
|
||||
alias :wq='exit'
|
||||
|
||||
( type -p time &> /dev/null ) && alias time='command time'
|
||||
|
||||
# keybindings
|
||||
bindkey -d
|
||||
bindkey -e
|
||||
|
||||
bindkey ' ' magic-space
|
||||
|
||||
bindkey -M emacs '\ee' edit-command-line
|
||||
|
||||
case $TERM in
|
||||
screen|xterm*|putty)
|
||||
bindkey '\e[H' beginning-of-line
|
||||
bindkey '\e[F' end-of-line
|
||||
bindkey '\eOH' beginning-of-line
|
||||
bindkey '\eOF' end-of-line
|
||||
bindkey '\e[1~' beginning-of-line
|
||||
bindkey '\e[4~' end-of-line
|
||||
bindkey '\e[7~' beginning-of-line
|
||||
bindkey '\e[8~' end-of-line
|
||||
bindkey '\e[3~' delete-char
|
||||
bindkey '\e[1;5C' emacs-forward-word
|
||||
bindkey '\e[1;5D' emacs-backward-word
|
||||
bindkey '\e[5C' emacs-forward-word
|
||||
bindkey '\e[5D' emacs-backward-word
|
||||
bindkey '\eOC' emacs-forward-word
|
||||
bindkey '\eOD' emacs-backward-word
|
||||
bindkey '\eOc' emacs-forward-word
|
||||
bindkey '\eOd' emacs-backward-word
|
||||
bindkey '\e[c' emacs-forward-word
|
||||
bindkey '\e[d' emacs-backward-word
|
||||
;;
|
||||
mlterm|kterm)
|
||||
bindkey '\e[H' beginning-of-line
|
||||
bindkey '\e[F' end-of-line
|
||||
bindkey '\e[1~' beginning-of-line
|
||||
bindkey '\e[4~' end-of-line
|
||||
bindkey '\e[1;5C' emacs-forward-word
|
||||
bindkey '\e[1;5D' emacs-backward-word
|
||||
bindkey '\e[3~' delete-char
|
||||
;;
|
||||
linux|vt100)
|
||||
bindkey '\e[1~' beginning-of-line
|
||||
bindkey '\e[4~' end-of-line
|
||||
bindkey '\e[3~' delete-char
|
||||
;;
|
||||
*rxvt*|Eterm|aterm)
|
||||
bindkey '\e[c' emacs-forward-word
|
||||
bindkey '\e[d' emacs-backward-word
|
||||
bindkey '\eOc' emacs-forward-word
|
||||
bindkey '\eOd' emacs-backward-word
|
||||
bindkey '\e[3~' delete-char
|
||||
bindkey '\e[7~' beginning-of-line
|
||||
bindkey '\e[8~' end-of-line
|
||||
;;
|
||||
cons*)
|
||||
bindkey '\e[H' beginning-of-line
|
||||
bindkey '\e[F' end-of-line
|
||||
bindkey '^?' delete-char
|
||||
;;
|
||||
interix)
|
||||
bindkey '\e[H' beginning-of-line
|
||||
bindkey '\e[U' end-of-line
|
||||
bindkey '^?' delete-char
|
||||
;;
|
||||
cygwin*)
|
||||
bindkey '\e[1~' beginning-of-line
|
||||
bindkey '\e[4~' end-of-line
|
||||
;;
|
||||
esac
|
||||
|
||||
# prompt
|
||||
if [[ -z ${SSH_TTY} ]] ; then
|
||||
PROMPT=$'%{\e[01;32m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
|
||||
RPROMPT=$'%1(j.%{\e[00;36m%}[%j].)%{\e[01;33m%}[%t]%{\e[00;00m%}'
|
||||
else
|
||||
PROMPT=$'%{\e[01;36m%}%n %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
|
||||
RPROMPT=$'%{\e[01;33m%}%m %{\e[01;32m%}%~%{\e[00;00m%}'
|
||||
fi
|
||||
|
||||
# terminal titles
|
||||
precmd()
|
||||
{
|
||||
local termtitle
|
||||
|
||||
termtitle=$(print -P "%n@%m")
|
||||
title zsh "$termtitle"
|
||||
}
|
||||
|
||||
preexec()
|
||||
{
|
||||
# With bits from http://zshwiki.org/home/examples/hardstatus
|
||||
# emulate -L zsh
|
||||
local -a cmd; cmd=(${(z)1}) # Re-parse the command line
|
||||
local termtitle
|
||||
|
||||
# Prepend this string to the title.
|
||||
# termtitle=$(print -P "%(!.-=*[ROOT]*=- | .)%n@%m:")
|
||||
termtitle=$(print -P "%n@%m:")
|
||||
|
||||
case $cmd[1] in
|
||||
fg)
|
||||
if (( $#cmd == 1 )); then
|
||||
# No arguments, must find the current job
|
||||
# Old approach: cmd=(builtin jobs -l %+)
|
||||
# weakness: shows a load of bs
|
||||
title ${jobtexts[${(k)jobstates[(R)*+*]}]%% *} "$termtitle ${jobtexts[${(k)jobstates[(R)*+*]}]}"
|
||||
elif (( $#cmd == 2 )); then
|
||||
# Replace the command name, ignore extra args.
|
||||
# Old approach: cmd=(builtin jobs -l ${(Q)cmd[2]})
|
||||
# weakness: shows all matching jobs on the title, not just one
|
||||
title "${jobtexts[${cmd[2]#%}]%% *}" "$termtitle $jobtexts[${cmd[2]#%}]"
|
||||
else
|
||||
title "${cmd[2,-1]#%}" "$termtitle ${cmd[2,-1]#%}"
|
||||
fi
|
||||
;;
|
||||
%*)
|
||||
title "${jobtexts[${cmd[1]#%}]% *}" "$termtitle $jobtexts[${cmd[1]#%}]"
|
||||
;;
|
||||
*=*)
|
||||
shift cmd
|
||||
;&
|
||||
exec|sudo)
|
||||
shift cmd
|
||||
# If the command is 'exec', drop that, because
|
||||
# we'd rather just see the command that is being
|
||||
# exec'd. Note the ;& to fall through the next entry.
|
||||
;&
|
||||
*)
|
||||
title $cmd[1]:t "$termtitle $cmd[*]" # Starting a new job.
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
function title
|
||||
{
|
||||
case $TERM in
|
||||
screen*)
|
||||
# Use these two for GNU Screen:
|
||||
print -nR $'\ek'$1$'\e'"\\"
|
||||
shift
|
||||
print -nR $'\e_screen \005 | '$*$'\e'"\\"
|
||||
;;
|
||||
xterm*|*rxvt*|cygwin|interix|Eterm|mlterm|kterm|aterm|putty*)
|
||||
# Use this one instead for everybody else:
|
||||
shift
|
||||
print -nR $'\e]0;'$@$'\a'
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# completion menu
|
||||
zstyle ':completion:*' menu select=1
|
||||
|
||||
# neat-o new features
|
||||
zstyle ':completion:*' completer _expand _complete _prefix _correct _match _approximate
|
||||
|
||||
# don't complete commands that we do not have
|
||||
zstyle ':completion:*:functions' ignored-patterns '_*'
|
||||
|
||||
# group matches
|
||||
zstyle ':completion:*' group-name ''
|
||||
zstyle ':completion:*:matches' group 'yes'
|
||||
|
||||
# colors on completions
|
||||
zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
|
||||
|
||||
# users are all useless, ignore them always
|
||||
zstyle -e ':completion:*' users "reply=( root '${USERNAME}' )"
|
||||
|
||||
# caching good
|
||||
zstyle ':completion:*' use-cache on
|
||||
zstyle ':completion:*' cache-path "${HOME}/.zsh/.${HOST}-cache"
|
||||
|
||||
# descriptions
|
||||
zstyle ':completion:*:messages' format $'%{\e[01;35m%} -- %d -- %{\e[00;00m%}'
|
||||
zstyle ':completion:*:warnings' format $'%{\e[01;31m%} -- No Matches Found -- %{\e[00;00m%}'
|
||||
zstyle ':completion:*:descriptions' format $'%{\e[01;33m%} -- %d -- %{\e[00;00m%}'
|
||||
|
||||
# job numbers
|
||||
zstyle ':completion:*:jobs' numbers true
|
||||
|
||||
# kill/killall menu and general process listing
|
||||
zstyle ':completion:*:*:kill:*' menu yes select
|
||||
zstyle ':completion:*:*:kill:*' sort false
|
||||
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=31;31'
|
||||
|
||||
zstyle ':completion:*:*:killall:*' menu yes select
|
||||
|
||||
case `uname -s` in
|
||||
Linux)
|
||||
zstyle ':completion:*:processes-names' command 'ps -e --no-headers -o args'
|
||||
;;
|
||||
FreeBSD|Interix|OpenBSD|SunOS)
|
||||
zstyle ':completion:*:processes-names' command 'ps -e -o args | awk "NR != 1"'
|
||||
;;
|
||||
Darwin)
|
||||
if [[ $(sw_vers -productVersion) > 10.4 ]] ; then
|
||||
zstyle ':completion:*:processes-names' command 'ps -e -o command | awk "NR != 1"'
|
||||
else
|
||||
zstyle ':completion:*:processes-names' command 'ps -A -o command | awk "NR != 1"'
|
||||
fi
|
||||
;;
|
||||
CYGWIN*)
|
||||
zstyle ':completion:*:processes-names' command 'ps -e -s | awk "NR != 1"'
|
||||
;;
|
||||
esac
|
||||
|
||||
case `uname -s` in
|
||||
Linux)
|
||||
zstyle ':completion:*:*:kill:*:processes' command 'ps --forest -U '${USERNAME}' -o pid,args | sed "/ps --forest -U '${USERNAME}' -o pid,args/d"'
|
||||
;;
|
||||
Interix)
|
||||
zstyle ':completion:*:*:kill:*:processes' command 'ps -i -U '${USERNAME}' -o pid,args | sed "/ps -i -U '${USERNAME}' -o pid,args/d"'
|
||||
;;
|
||||
CYGWIN*)
|
||||
zstyle ':completion:*:*:kill:*:processes' command 'ps -u '${USERNAME}' -s | sed "/ps -u '${USERNAME}' -s/d"'
|
||||
;;
|
||||
SunOS|FreeBSD|OpenBSD)
|
||||
zstyle ':completion:*:*:kill:*:processes' command 'ps -U '${USERNAME}' -o pid,args | sed "/ps -U '${USERNAME}' -o pid,args/d"'
|
||||
;;
|
||||
Darwin)
|
||||
zstyle ':completion:*:*:kill:*:processes' command 'ps -U '${USERNAME}' -o pid,command | sed "/ps -U '${USERNAME}' -o pid/d"'
|
||||
;;
|
||||
esac
|
||||
|
||||
case `uname -s` in
|
||||
Interix|SunOS|FreeBSD|Linux)
|
||||
zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o comm"
|
||||
;;
|
||||
CYGWIN*)
|
||||
zstyle ':completion:*:*:killall:*:processes-names' command "ps -u '${USERNAME}' -s"
|
||||
;;
|
||||
Darwin)
|
||||
if [[ $(sw_vers -productVersion) > 10.4 ]] ; then
|
||||
zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o comm"
|
||||
else
|
||||
zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o command"
|
||||
fi
|
||||
;;
|
||||
OpenBSD)
|
||||
zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o command"
|
||||
;;
|
||||
esac
|
||||
|
||||
# case insensitivity, partial matching, substitution
|
||||
zstyle ':completion:*' matcher-list 'm:{A-Z}={a-z}' 'm:{a-z}={A-Z}' 'r:|[-._]=* r:|=*' 'l:|=* r:|=*' '+l:|=*'
|
||||
|
||||
# compctl should die
|
||||
zstyle ':completion:*' use-compctl false
|
||||
|
||||
# dont suggest the first parameter again
|
||||
zstyle ':completion:*:ls:*' ignore-line yes
|
||||
zstyle ':completion:*:rm:*' ignore-line yes
|
||||
zstyle ':completion:*:scp:*' ignore-line yes
|
||||
zstyle ':completion:*:diff:*' ignore-line yes
|
||||
|
||||
# Keep track of other people accessing the box
|
||||
watch=( all )
|
||||
export LOGCHECK=30
|
||||
|
|
@ -450,6 +34,13 @@ if [[ -d "${HOME}/work" ]] ; then
|
|||
done
|
||||
fi
|
||||
|
||||
# common shell utils
|
||||
if [[ -d "${HOME}/.commonsh" ]] ; then
|
||||
for file in "${HOME}"/.commonsh/*(N.x:t) ; do
|
||||
source "${HOME}/.commonsh/${file}"
|
||||
done
|
||||
fi
|
||||
|
||||
# extras
|
||||
if [[ -d "${HOME}/.zsh" ]] ; then
|
||||
for file in "${HOME}"/.zsh/*(N.x:t) ; do
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue