matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-25 21:19:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup.

Browse Source
This commit is contained in:
David Tomaschik
2019-09-27 15:56:36 -07:00
parent b096fd2a24
commit fcb04c0ae7
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dotfiles/zpreztorc
View File

@@ -30,8 +30,6 @@ zstyle ':prezto:load' pmodule \
'environment' \ 'environment' \
'terminal' \ 'terminal' \
'completion' \ 'completion' \
'git' \
'python' \
'syntax-highlighting' \ 'syntax-highlighting' \
'history-substring-search' 'history-substring-search'
@@ -139,7 +137,7 @@ zstyle ':prezto:module:prompt' theme 'matir'
# zstyle ':prezto:module:python:virtualenv' auto-switch 'yes' # zstyle ':prezto:module:python:virtualenv' auto-switch 'yes'
# Automatically initialize virtualenvwrapper if pre-requisites are met. # Automatically initialize virtualenvwrapper if pre-requisites are met.
zstyle ':prezto:module:python:virtualenv' initialize 'yes' #zstyle ':prezto:module:python:virtualenv' initialize 'yes'
# #
# Screen # Screen
@@ -201,10 +199,10 @@ zstyle ':prezto:module:terminal:multiplexer-title' format '%s'
# #
# Auto start a session when Zsh is launched in a local terminal. # Auto start a session when Zsh is launched in a local terminal.
zstyle ':prezto:module:tmux:auto-start' local 'no' # zstyle ':prezto:module:tmux:auto-start' local 'no'
# Auto start a session when Zsh is launched in a SSH connection. # Auto start a session when Zsh is launched in a SSH connection.
zstyle ':prezto:module:tmux:auto-start' remote 'no' # zstyle ':prezto:module:tmux:auto-start' remote 'no'
# Integrate with iTerm2. # Integrate with iTerm2.
# zstyle ':prezto:module:tmux:iterm' integrate 'yes' # zstyle ':prezto:module:tmux:iterm' integrate 'yes'

15
dotfiles/zshrc
View File

@@ -86,7 +86,16 @@ if [[ $- == *i* ]] ; then
autoload -Uz promptinit && promptinit autoload -Uz promptinit && promptinit
# Prompt # Prompt
prompt matir prompt matir
# Virtualenvwrapper
if test -f /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh ; then
source /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh
fi fi
# Enable grc if we have it
if ls --version 2>&1 >/dev/null ; then
alias ls='ls --color -C'
fi
[[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh
fi # End interactive-only block
# In case ack is named ack-grep # In case ack is named ack-grep
if [ -x /usr/bin/ack-grep ] ; then if [ -x /usr/bin/ack-grep ] ; then
@@ -101,11 +110,5 @@ if command -v most >/dev/null 2>&1; then
export PAGER="most" export PAGER="most"
fi fi
# Enable grc if we have it
if ls --version 2>&1 >/dev/null ; then
alias ls='ls --color -C'
fi
[[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh
# Load any local settings # Load any local settings
if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi

13
dotfiles/zshrc.d/matir_prompt/prompt_matir_setup
View File

@@ -19,19 +19,16 @@ function prompt_matir_setup {
zstyle ':vcs_info:*' unstagedstr '*' zstyle ':vcs_info:*' unstagedstr '*'
zstyle ':vcs_info:git*+set-message:*' hooks git-untracked zstyle ':vcs_info:git*+set-message:*' hooks git-untracked
# Virtualenv formatting
zstyle ':prezto:module:python:info:virtualenv' format ' (py:%v)'
PROMPT='%{$fg[black]%}[%{$fg[yellow]%}%h%{$fg[black]%}] ' # History # PROMPT='%{$fg[black]%}[%{$fg[yellow]%}%h%{$fg[black]%}] ' # History #
PROMPT+='%{%(!.$fg[red].$fg[green])%}%8>..>%n%>>%{$fg[white]%}@' # username@ PROMPT+='%{%(!.$fg[red].$fg[green])%}%8>..>%n%>>%{$fg[white]%}@' # username@
PROMPT+='%{$fg[blue]%}%12>..>%m%>>%{$fg[white]%}:' # hostname PROMPT+='%{$fg[blue]%}%12>..>%m%>>%{$fg[white]%}:' # hostname
PROMPT+='%{$fg[green]%}%32<...<%~%<<' # path PROMPT+='%{$fg[green]%}%32<...<%~%<<' # path
PROMPT+='%{$fg[magenta]%}${python_info[virtualenv]}' # virtualenv PROMPT+='%{$fg[magenta]%}${VIRTUAL_ENV_SHORT}' # virtualenv
PROMPT+='%{$fg[blue]%}${vcs_info_msg_0_}' # VCS info PROMPT+='%{$fg[blue]%}${vcs_info_msg_0_}' # VCS info
PROMPT+='%{$fg[white]%}%#%{$reset_color%} ' # prompt symbol PROMPT+='%{$fg[white]%}%#%{$reset_color%} ' # prompt symbol
# Rprompt setup # Rprompt setup
local show_return="✘ " local show_return='✘ '
RPROMPT='%(?:: %{$fg[red]%}' RPROMPT='%(?:: %{$fg[red]%}'
RPROMPT+=${show_return} RPROMPT+=${show_return}
RPROMPT+='%? ' RPROMPT+='%? '
@@ -49,8 +46,10 @@ zle -N zle-keymap-select
function prompt_matir_precmd { function prompt_matir_precmd {
vcs_info vcs_info
if (( $+functions[python-info] )); then if [ $VIRTUAL_ENV ] ; then
python-info VIRTUAL_ENV_SHORT=" (py:$(basename $VIRTUAL_ENV))"
else
VIRTUAL_ENV_SHORT=""
fi fi
} }