dustinswan/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merging

Browse source
This commit is contained in:
Dustin Swan 2013-07-18 20:02:36 -05:00
commit 1a077061eb
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
slate.js
View file

@ -23,6 +23,11 @@ var pushUpHalf = slate.operation("push", {
"style" : "bar-resize:screenSizeY/2" "style" : "bar-resize:screenSizeY/2"
}); });
var pushDownHalf = slate.operation("push", {
"direction" : "down",
"style" : "bar-resize:screenSizeY/2"
});
var pushFull = slate.operation("push", { var pushFull = slate.operation("push", {
"direction" : "up", "direction" : "up",
"style" : "bar-resize:screenSizeX" "style" : "bar-resize:screenSizeX"
@ -34,4 +39,5 @@ slate.bind("right:ctrl,alt,cmd", pushRightHalf);
slate.bind("right:ctrl,alt,cmd,shift", pushRightThird); slate.bind("right:ctrl,alt,cmd,shift", pushRightThird);
slate.bind("up:ctrl,alt,cmd", pushUpHalf); slate.bind("up:ctrl,alt,cmd", pushUpHalf);
slate.bind("down:ctrl,alt,cmd", pushDownHalf);
slate.bind("up:shift,ctrl,alt,cmd", pushFull); slate.bind("up:shift,ctrl,alt,cmd", pushFull);

3
tmux.conf
View file

@ -29,6 +29,9 @@ set-option -g status-keys vi
set -g default-terminal "screen-256color" set -g default-terminal "screen-256color"
set -g status on
set -g status-utf8 on
# Powerline # Powerline
# Mac # Mac
source '/usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf' source '/usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf'

7
zshrc
View file

@ -2,10 +2,12 @@
# Mac # Mac
[[ -s /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]] && . /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh [[ -s /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]] && . /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh
# Linux # Linux
[[ -s /usr/share/zsh/site-contrib/powerline.zsh ]] && . /usr/share/zsh/site-contrib/powerline.zsh [[ -s /usr/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]] && . /usr/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh
alias vi=vim alias vi=vim
alias l="ls -l"
alias tmux="tmux -2" alias tmux="tmux -2"
alias dustinswan="ssh dustinswan@dustinswan.org"
export EDITOR=vim export EDITOR=vim
export BROWSER=open export BROWSER=open
@ -42,3 +44,6 @@ if [[ -e /usr/share/chruby ]]; then
source /usr/share/chruby/auto.sh source /usr/share/chruby/auto.sh
fi fi
chruby $(cat ~/.ruby-version) chruby $(cat ~/.ruby-version)
# GPG
~/dotfiles/bin/gpg-agent.sh