Skip to content

Commit

Permalink
Update configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
amacgregor committed Sep 10, 2018
1 parent a8c0c4e commit 3158414
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 37 deletions.
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7
35 changes: 6 additions & 29 deletions allanmacgregor.zsh-theme
Original file line number Diff line number Diff line change
Expand Up @@ -161,21 +161,21 @@ prompt_git_status() {
precmd_update_git_vars
if [ -n "$__CURRENT_GIT_STATUS" ]; then
# Show the git Icon indicator
prompt_segment white black "${icons[VCS_GIT_ICON]}"
prompt_segment 255 black "${icons[VCS_GIT_ICON]}"
if [ "$GIT_CHANGED" -ne "0" ]; then
prompt_segment black yellow "${icons[VCS_CHANGED_ICON]} $GIT_CHANGED"
prompt_segment yellow 255 "${icons[VCS_CHANGED_ICON]} $GIT_CHANGED"
fi
if [ "$GIT_AHEAD" -ne "0" ]; then
prompt_segment black 025 "${icons[VCS_OUTGOING_CHANGES_ICON]}$GIT_AHEAD"
prompt_segment 027 255 "${icons[VCS_OUTGOING_CHANGES_ICON]}$GIT_AHEAD"
fi
if [ "$GIT_BEHIND" -ne "0" ]; then
prompt_segment black 016 "${icons[VCS_INCOMING_CHANGES_ICON]}$GIT_BEHIND"
prompt_segment magenta 255 "${icons[VCS_INCOMING_CHANGES_ICON]}$GIT_BEHIND"
fi
if [ "$GIT_STAGED" -ne "0" ]; then
prompt_segment black green "${icons[VCS_STAGED_ICON]} $GIT_STAGED"
prompt_segment green 255 "${icons[VCS_STAGED_ICON]} $GIT_STAGED"
fi
if [ "$GIT_UNTRACKED" -ne "0" ]; then
prompt_segment black red "${icons[VCS_UNTRACKED_ICON]} $GIT_UNTRACKED"
prompt_segment 009 255 "${icons[VCS_UNTRACKED_ICON]} $GIT_UNTRACKED"
fi
fi
}
Expand Down Expand Up @@ -256,29 +256,6 @@ prompt_status() {
[[ -n "$symbols" ]] && prompt_segment black default "$symbols"
}

## Main prompt
build_prompt() {
RETVAL=$?
prompt_status
prompt_pyenv
prompt_virtualenv
prompt_dir
prompt_git
prompt_hg
prompt_end
}

build_right_prompt() {
prompt_git_status
prompt_elixir
prompt_status
#prompt_context
prompt_right_end
}

PROMPT='%{%f%b%k%}$(build_prompt) '
RPROMPT='%{%f%b%k%}$(build_right_prompt)'

prompt_elixir() {
if [ -f "$PWD/mix.exs" ]; then
prompt_segment 098 white "`echo ${icons[ELIXIR_ICON]} $ELIXIR_VERSION`"
Expand Down
5 changes: 2 additions & 3 deletions tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ set -g default-terminal 'screen-256color'
##########################################
# load powerline
##########################################
source "/Users/amacgregor/Projects/Github/powerline/powerline/bindings/tmux/powerline.conf"
source "/Users/amacgregor/Projects/Github/powerline/powerline/bindings/tmux/powerline_tmux_2.1_plus.conf"
source "/Volumes/Workspace/Utilities/powerline/powerline/bindings/tmux/powerline.conf"

##########################################
# act like vim
Expand Down Expand Up @@ -36,7 +35,7 @@ bind r source-file ~/.tmux.conf

# Enable mouse mode (tmux 2.1 and above)
set -g mouse on
bind -t vi-copy MouseDragEnd1Pane copy-selection -x
#bind -t vi-copy MouseDragEnd1Pane copy-selection -x
set -g prefix2 C-s

# start window numbers at 1 to match keyboard order with tmux window order
Expand Down
1 change: 1 addition & 0 deletions vim/bundle/vim
Submodule vim added at 17f8ee
1 change: 1 addition & 0 deletions vim/bundle/vim-keysound
Submodule vim-keysound added at b28ccf
1 change: 1 addition & 0 deletions vim/bundle/vim-sound
Submodule vim-sound added at b53d2c
1 change: 1 addition & 0 deletions vim/bundle/vim-typing-sound
Submodule vim-typing-sound added at 5ddda4
14 changes: 10 additions & 4 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Plugin 'Shougo/neocomplete.vim'
Plugin 'tpope/vim-dispatch'
Plugin 'jceb/vim-orgmode'
Plugin 'tpope/vim-speeddating'
Plugin 'calorie/vim-typing-sound'

" Generic Programming Support
Plugin 'jakedouglas/exuberant-ctags'
Expand All @@ -58,7 +59,7 @@ Plugin 'tpope/vim-fugitive'
"Plugin 'jaxbot/github-issues.vim'

" PHP Support
Plugin 'phpvim/phpcd.vim'
"Plugin 'phpvim/phpcd.vim'
Plugin 'tobyS/pdv'

" Erlang Support
Expand Down Expand Up @@ -104,6 +105,7 @@ Plugin 'ajh17/Spacegray.vim'
Plugin 'atelierbram/Base2Tone-vim'
Plugin 'colepeters/spacemacs-theme.vim'
Plugin 'dylanaraps/wal.vim'
Plugin 'challenger-deep-theme/vim', { 'as': 'challenger-deep' }

" Plugin 'tiagofumo/vim-nerdtree-syntax-highlight'

Expand Down Expand Up @@ -149,9 +151,13 @@ set t_Co=256
" set termguicolors
" endif

let base16colorspace=256 " Access colors present in 256 colorspace
colorscheme spacegray
"colorscheme wal
let g:vim_typing_sound = 0 " sound off
let g:vim_typing_sound_command = 'afplay' " or 'afplay'
let g:vim_typing_sound_path = '/Volumes/Workspace/Utilities/Sound/9744__horn__typewriter.wav' " set your sound path

"let base16colorspace=256 " Access colors present in 256 colorspace
colorscheme challenger_deep
let g:challenger_deep_termcolors = 256

let g:spacegray_underline_search = 1
let g:spacegray_italicize_comments = 1
Expand Down
1 change: 0 additions & 1 deletion zsh_files/aliases.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ alias history-stat="history | awk '{print \$2}' | sort | uniq -c | sort -n -r |
alias please='sudo $(fc -ln -1)'



##########################################
# Deprecated
##########################################
Expand Down
11 changes: 11 additions & 0 deletions zsh_files/functions.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,14 @@ man() {
LESS_TERMCAP_us=$'\e[1;32m' \
man "$@"
}

initialize-draft() {
loc_dir=$(slugify "$1")
mkdir $loc_dir
cd $loc_dir
slugify "$1" | xargs -I % touch v1_%.md
}

name-tab() {
echo -ne "\e]1;$1\a"
}
6 changes: 6 additions & 0 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,18 @@ eval "$(rbenv init -)"
# Color Scheme for Ruby // Requires Base16 Shell
#$HOME/.config/base16-shell/base16-tomorrow.dark.sh

# Kiex Elixir version manager setup
test -s "~/.kiex/scripts/kiex" && source "~/.kiex/scripts/kiex"

# Elixir Version information
ELIXIR_VERSION=$(elixir -v | grep -o 'Elixir \d.\d.\d' | grep -o '\d.\d.\d')

# Tmuxifier Autocomplete
eval "$(tmuxifier init -)"

# Add Path to local installs
export PATH=$PATH:/Volumes/Workspace/bin

##########################################
# Experimental
##########################################
Expand Down

0 comments on commit 3158414

Please sign in to comment.