diff --git a/zshenv b/zshenv deleted file mode 100644 index c43e09e..0000000 --- a/zshenv +++ /dev/null @@ -1,25 +0,0 @@ -# ignore globals because of bug -# http://ubuntuforums.org/showthread.php?t=240782 - -setopt noglobalrcs - -# copied from globals -if [[ -z "$PATH" || "$PATH" == "/bin:/usr/bin" ]] -then - export PATH="/usr/local/bin:/usr/bin:/bin:/usr/games" -fi - -# own environment adjustments -export PATH=$PATH:$HOME/bin - -export EDITOR="/usr/bin/vim" -export PAGER="/usr/bin/less" - -# add texlive path, so no confilicts with install-info - -PATH=/usr/local/texlive/2008/bin/i386-linux:$PATH; export PATH -MANPATH=/usr/local/texlive/2008/texmf/doc/man:$MANPATH; export MANPATH -INFOPATH=/usr/local/texlive/2008/texmf/doc/info:$INFOPATH; export INFOPATH - -fpath=($fpath $HOME/.zsh/func) -typeset -U fpath diff --git a/zshrc b/zshrc index e04b697..d99ae12 100644 --- a/zshrc +++ b/zshrc @@ -1,61 +1,3 @@ -# copied from globals, that will be ignored - -if [[ "$TERM" != emacs ]]; then -[[ -z "$terminfo[kdch1]" ]] || bindkey -M emacs "$terminfo[kdch1]" delete-char -[[ -z "$terminfo[khome]" ]] || bindkey -M emacs "$terminfo[khome]" beginning-of-line -[[ -z "$terminfo[kend]" ]] || bindkey -M emacs "$terminfo[kend]" end-of-line -[[ -z "$terminfo[kich1]" ]] || bindkey -M emacs "$terminfo[kich1]" overwrite-mode -[[ -z "$terminfo[kdch1]" ]] || bindkey -M vicmd "$terminfo[kdch1]" vi-delete-char -[[ -z "$terminfo[khome]" ]] || bindkey -M vicmd "$terminfo[khome]" vi-beginning-of-line -[[ -z "$terminfo[kend]" ]] || bindkey -M vicmd "$terminfo[kend]" vi-end-of-line -[[ -z "$terminfo[kich1]" ]] || bindkey -M vicmd "$terminfo[kich1]" overwrite-mode - -[[ -z "$terminfo[cuu1]" ]] || bindkey -M viins "$terminfo[cuu1]" vi-up-line-or-history -[[ -z "$terminfo[cuf1]" ]] || bindkey -M viins "$terminfo[cuf1]" vi-forward-char -[[ -z "$terminfo[kcuu1]" ]] || bindkey -M viins "$terminfo[kcuu1]" vi-up-line-or-history -[[ -z "$terminfo[kcud1]" ]] || bindkey -M viins "$terminfo[kcud1]" vi-down-line-or-history -[[ -z "$terminfo[kcuf1]" ]] || bindkey -M viins "$terminfo[kcuf1]" vi-forward-char -[[ -z "$terminfo[kcub1]" ]] || bindkey -M viins "$terminfo[kcub1]" vi-backward-char - -# ncurses fogyatekos -#[[ "$terminfo[kcuu1]" == "O"* ]] && bindkey -M viins "${terminfo[kcuu1]/O/[}" vi-up-line-or-history -[[ "$terminfo[kcud1]" == "O"* ]] && bindkey -M viins "${terminfo[kcud1]/O/[}" vi-down-line-or-history -[[ "$terminfo[kcuf1]" == "O"* ]] && bindkey -M viins "${terminfo[kcuf1]/O/[}" vi-forward-char -[[ "$terminfo[kcub1]" == "O"* ]] && bindkey -M viins "${terminfo[kcub1]/O/[}" vi-backward-char -[[ "$terminfo[khome]" == "O"* ]] && bindkey -M viins "${terminfo[khome]/O/[}" beginning-of-line -[[ "$terminfo[kend]" == "O"* ]] && bindkey -M viins "${terminfo[kend]/O/[}" end-of-line -[[ "$terminfo[khome]" == "O"* ]] && bindkey -M emacs "${terminfo[khome]/O/[}" beginning-of-line -[[ "$terminfo[kend]" == "O"* ]] && bindkey -M emacs "${terminfo[kend]/O/[}" end-of-line -fi - -zstyle ':completion:*:sudo:*' command-path /usr/local/sbin /usr/local/bin \ - /usr/sbin /usr/bin /sbin /bin /usr/X11R6/bin - -autoload run-help - -# If you don't want compinit called here, place the line -# skip_global_compinit=1 -# in your $ZDOTDIR/.zshenv or $ZDOTDIR/.zprofice -if [[ -z "$skip_global_compinit" ]]; then - autoload -U compinit - compinit -fi - -zstyle ':completion:*:sudo:*' command-path /usr/local/sbin /usr/local/bin \ - /usr/sbin /usr/bin /sbin /bin /usr/X11R6/bin - -unalias run-help -autoload run-help - -# If you don't want compinit called here, place the line -# skip_global_compinit=1 -# in your $ZDOTDIR/.zshenv or $ZDOTDIR/.zprofice -if [[ -z "$skip_global_compinit" ]]; then - autoload -U compinit - compinit -fi - -################################################################## # my own confs ### check for DIST @@ -229,4 +171,4 @@ autoload -U promptinit promptinit # Use the wunjo prompt theme -prompt wunjo +prompt clint