Skip to content

Commit ae01ebe

Browse files
committed
Migrating to new mbp 13: Update dotfiles
1 parent 1e7b0ae commit ae01ebe

File tree

8 files changed

+96
-15
lines changed

8 files changed

+96
-15
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.vim/bundle
2+
.vim/swapfiles

.vim/vimrc

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,13 @@ Plugin 'kien/ctrlp.vim'
1313
Plugin 'wincent/command-t'
1414
Plugin 'scrooloose/nerdtree'
1515
Plugin 'bling/vim-airline'
16-
Plugin 'thoughtbot/vim-rspec'
17-
Plugin 'kchmck/vim-coffee-script'
1816
Plugin 'mattn/webapi-vim'
1917
Plugin 'mattn/gist-vim'
20-
Plugin 'vim-ruby/vim-ruby'
2118
Plugin 'majutsushi/tagbar'
2219
Plugin 'mattn/emmet-vim'
23-
Plugin 'kmdsbng/vim-ruby-eval'
2420
Plugin 'ervandew/screen'
25-
Plugin 'slim-template/vim-slim'
2621
Plugin 'altercation/vim-colors-solarized'
22+
Plugin 'kristijanhusak/vim-hybrid-material'
2723
Plugin 'scrooloose/syntastic'
2824
Plugin 'tpope/vim-fugitive'
2925

@@ -64,10 +60,14 @@ filetype on " Enable filetype detection
6460
filetype indent on " Enable filetype-specific indenting
6561
filetype plugin on " Enable filetype-specific plugins
6662

63+
" Color Schemes
64+
6765
" Solarized theme for vim
6866
syntax enable
69-
set background=light
70-
colorscheme solarized
67+
" set background=light
68+
" colorscheme solarized
69+
" set background=dark
70+
" colorscheme hybrid_material
7171

7272
" Syntastic
7373
set statusline+=%#warningmsg#
@@ -80,8 +80,8 @@ let g:syntastic_check_on_open = 0
8080
let g:syntastic_check_on_wq = 0
8181
let g:syntastic_check_on_w = 1
8282

83-
" Keep swap files in tmp dir
84-
set dir=~/tmp
83+
" Swap files goes into its own directory
84+
set directory=$HOME/.vim/swapfiles//
8585

8686
" Default shell is zsh
8787
set shell=/usr/bin/zsh
@@ -139,7 +139,7 @@ set backspace=2
139139
nmap <F8> :TagbarToggle<CR>
140140
141141
" Minimal width of the current window
142-
let &winwidth = 100
142+
let &winwidth = 80
143143

144144
" Emmet vim settings
145145
let g:user_emmet_install_global = 0

gitconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[user]
2-
3-
name = Ilya Konyukhov
2+
3+
name = Ilya Konyukhov
44
[color]
55
ui = true
66
[alias]

profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
2-
export PATH="$PATH:/Applications/Postgres.app/Contents/Versions/9.4/bin" # Mac OS X specific (Postgres.app)
2+
# export PATH="$PATH:/Applications/Postgres.app/Contents/Versions/9.4/bin" # Mac OS X specific (Postgres.app)
33

44
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
55

tmux-startup.sh

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/zsh
2+
3+
PROJECT=$1
4+
HOMEDIR=$2
5+
6+
tmux new-session -d -c $HOMEDIR -s $PROJECT
7+
tmux new-window -c $HOMEDIR -n vim -t 0
8+
tmux new-window -c $HOMEDIR -n servers -t 1
9+
tmux new-window -c $HOMEDIR -n servers -t 2
10+
tmux new-window -c $HOMEDIR -n shell -t 3
11+
tmux new-window -c $HOMEDIR -n logs -t 4
12+
tmux select-window -t 0
13+
tmux -CC attach-session -t $PROJECT
File renamed without changes.

zsh-config/themes/reggae.zsh-theme

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# the idea of this theme is to contain a lot of info in a small string, by
2+
# compressing some parts and colorcoding, which bring useful visual cues,
3+
# while limiting the amount of colors and such to keep it easy on the eyes.
4+
# When a command exited >0, the timestamp will be in red and the exit code
5+
# will be on the right edge.
6+
# The exit code visual cues will only display once.
7+
# (i.e. they will be reset, even if you hit enter a few times on empty command prompts)
8+
typeset -A host_repr
9+
# translate hostnames into shortened, colorcoded strings
10+
host_repr=('dieter-ws-a7n8x-arch' "%{$fg_bold[green]%}ws" 'dieter-p4sci-arch' "%{$fg_bold[blue]%}p4")
11+
# local time, color coded by last return code
12+
time_enabled="%(?.%{$fg[red]%}.%{$fg[red]%})%*%{$reset_color%}"
13+
time_disabled="%{$fg[red]%}%*%{$reset_color%}"
14+
time=$time_enabled
15+
# user part, color coded by privileges
16+
local user="%(!.%{$fg[blue]%}.%{$fg[blue]%})%n%{$reset_color%}"
17+
# Hostname part. compressed and colorcoded per host_repr array
18+
# if not found, regular hostname in default color
19+
local host="@${host_repr[$HOST]:-$HOST}%{$reset_color%}"
20+
# Compacted $PWD
21+
local pwd="%{$fg[yellow]%}%c%{$reset_color%}"
22+
PROMPT='${time} ${pwd} $(git_prompt_info)'
23+
# i would prefer 1 icon that shows the "most drastic" deviation from HEAD,
24+
# but lets see how this works out
25+
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
26+
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
27+
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}] %{$fg[yellow]%}%{$fg[green]%}%{$reset_color%}"
28+
ZSH_THEME_GIT_PROMPT_CLEAN="] %{$fg[green]%}"
29+
# elaborate exitcode on the right when >0
30+
return_code_enabled="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
31+
return_code_disabled=
32+
return_code=$return_code_enabled
33+
RPS1='${return_code}'
34+
function accept-line-or-clear-warning () {
35+
if [[ -z $BUFFER ]]; then
36+
time=$time_disabled
37+
return_code=$return_code_disabled
38+
else
39+
time=$time_enabled
40+
return_code=$return_code_enabled
41+
fi
42+
zle accept-line
43+
}
44+
zle -N accept-line-or-clear-warning
45+
bindkey '^M' accept-line-or-clear-warning

zshrc

+23-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ export ZSH=$HOME/.oh-my-zsh
55
# Look in ~/.oh-my-zsh/themes/
66
# Optionally, if you set this to "random", it'll load a random theme each
77
# time that oh-my-zsh is loaded.
8-
# ZSH_THEME="pygmalion-runfor"
9-
ZSH_THEME="powerlevel9k/powerlevel9k"
8+
# ZSH_THEME="pygmalion"
9+
ZSH_CUSTOM=$HOME/dotfiles/zsh-config
10+
ZSH_THEME="themes/reggae"
11+
# ZSH_THEME="powerlevel9k/powerlevel9k"
1012

1113
# Uncomment the following line to use case-sensitive completion.
1214
# CASE_SENSITIVE="true"
@@ -92,9 +94,28 @@ fi
9294

9395
source "$HOME/.profile"
9496

97+
export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home
98+
9599
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
96100

97101
# https://github.com/bhilburn/powerlevel9k/ plugin configuration
98102
# POWERLEVEL9K_PROMPT_ON_NEWLINE=true
99103
DEFAULT_COLOR=white
100104
DEFAULT_COLOR_INVERTED=black
105+
export PATH="/usr/local/opt/node/bin:$PATH"
106+
# export PATH="/usr/local/opt/curl/bin:$PATH"
107+
export PATH="/usr/local/opt/icu4c/bin:$PATH"
108+
export PATH="/usr/local/opt/icu4c/sbin:$PATH"
109+
export PATH="/usr/local/opt/icu4c/sbin:$PATH"
110+
111+
PATH="/Users/i.konyuhov/perl5/bin${PATH:+:${PATH}}"; export PATH;
112+
PERL5LIB="/Users/i.konyuhov/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
113+
PERL_LOCAL_LIB_ROOT="/Users/i.konyuhov/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
114+
PERL_MB_OPT="--install_base \"/Users/i.konyuhov/perl5\""; export PERL_MB_OPT;
115+
PERL_MM_OPT="INSTALL_BASE=/Users/i.konyuhov/perl5"; export PERL_MM_OPT;
116+
export GOPATH=$HOME/go
117+
export GOBIN=$GOPATH/bin
118+
export PATH="$PATH:$GOBIN:/usr/local/go/bin"
119+
120+
# Sublime text
121+
export EDITOR='subl -w'

0 commit comments

Comments
 (0)