Permalink
Browse files

Merge branch 'master' of https://github.com/am/dotfiles

Conflicts:
	.oh-my-zsh/alias.zsh
  • Loading branch information...
2 parents 5edb8fa + 3084fe3 commit dc214bc5744516c4306a139c5ad3ca852cf85f94 @am committed Sep 13, 2013
Showing with 20 additions and 8 deletions.
  1. +6 −2 .oh-my-zsh/alias.zsh
  2. +13 −5 .slate
  3. +1 −1 .zshrc
View
@@ -4,6 +4,10 @@
# util
alias rs='. ~/.zshrc'
-
+# services
alias cb='cerberus -p 4000 -d wuaki_devel -L -F'
-alias cbt='cerberus -p 5000 -d wuaki_test -L -F'
+alias cbt='cerberus -p 5000 -d wuaki_test -L -F'
+
+# display folder tree
+alias tree="ls -R | grep \":$\" | sed -e 's/:$//' -e 's/[^-][^\/]*\//--/g' -e 's/^/ /' -e 's/-/|/'"
+
View
18 .slate
@@ -11,12 +11,16 @@ alias resize_fullscreen move screenOriginX;screenOriginY screenSizeX;screenSizeY
alias resize_fullscreen_padding move screenOriginX+(screenSizeX/10);screenOriginY+(screenSizeY/10) screenSizeX-(screenSizeX/5);screenSizeY-(screenSizeY/5)
alias resize_halfscreen_top move screenOriginX;screenOriginY screenSizeX;screenSizeY/2
+alias resize_halfscreen_v_2 move screenOriginX;screenOriginY screenSizeX/2;screenSizeY
+alias resize_halfscreen_v_3 move screenOriginX;screenOriginY screenSizeX/3;screenSizeY
+alias resize_halfscreen_v_4 move screenOriginX;screenOriginY screenSizeX/4;screenSizeY
+
# center windows around axis
-bind pad8:ctrl,alt ${axis_center_window_top}
-bind pad2:ctrl,alt ${axis_center_window_bottom}
-bind pad6:ctrl,alt ${axis_center_window_right}
-bind pad4:ctrl,alt ${axis_center_window_left}
-bind pad5:ctrl,alt ${center_window}
+bind t:a,ctrl,alt ${axis_center_window_top}
+bind b:a,ctrl,alt ${axis_center_window_bottom}
+bind r:a,ctrl,alt ${axis_center_window_right}
+bind l:a,ctrl,alt ${axis_center_window_left}
+bind c:a,ctrl,alt ${center_window}
# push windows
bind pad8:ctrl,shift push up
@@ -29,5 +33,9 @@ bind return:ctrl,alt ${resize_fullscreen}
bind return:ctrl,alt,cmd ${resize_fullscreen_padding}
bind return:shift,ctrl ${resize_halfscreen_top}
+bind 2:r,ctrl,alt ${resize_halfscreen_v_2}
+bind 3:r,ctrl,alt ${resize_halfscreen_v_3}
+bind 4:r,ctrl,alt ${resize_halfscreen_v_4}
+
# Grid
bind esc:ctrl grid padding:2 2560x1440:10,6 1920x1080:10,6 1680x1050:8,4
View
2 .zshrc
@@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
# Look in ~/.oh-my-zsh/themes/
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
-ZSH_THEME="ys"
+ZSH_THEME="sunrise"
# Example aliases
alias zshconfig="st ~/.zshrc"

0 comments on commit dc214bc

Please sign in to comment.