changeset 469:75004cb610b7

Merged branches
author unexist
date Sun, 24 Dec 2017 19:57:02 +0100
parents 7cbdfbba462b (current diff) 531641fb9c83 (diff)
children d770846d5fec
files .zshalias .zshrc
diffstat 2 files changed, 28 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.tmux.conf	Sun Dec 24 19:56:31 2017 +0100
+++ b/.tmux.conf	Sun Dec 24 19:57:02 2017 +0100
@@ -27,11 +27,10 @@
 bind -n C-right next-window
 bind -n C-left previous-window
 
-# Spercial
+# Special
 bind s new-window -n "su" su
 bind i new-window -n "irb" irb
 bind j new-window -d -n "jd" jd.sh
-bind v new-window -d -n "vbox" VirtualBox
 bind m new-window -n "ncmpcpp" "setw monitor-activity off; exec ncmpcpp"
 bind w new-window -n "wicd" "setw monitor-activity off; exec wicd-curses"
 bind x new-window -n "xvfb" "setw monitor-activity off; exec ruby /home/unexist/projects/subtle/test/xserver.rb"
--- a/.zshrc	Sun Dec 24 19:56:31 2017 +0100
+++ b/.zshrc	Sun Dec 24 19:57:02 2017 +0100
@@ -127,8 +127,8 @@
 
 function pp
 {
-  for i in *.(mkv|avi|wmv|mp[1-9]); do
-    mplayer -vo x11 -nosound -zoom -fs "$i"
+  for i in *.(mov|mkv|avi|wmv|mp[1-9]); do
+    DISPLAY=:0 mplayer -vo x11 -nosound -zoom -fs "$i"
 
     echo -n "Keep? (Y/n) "
     read keep
@@ -139,6 +139,18 @@
   done
 }
 
+function convico
+{
+  convert "$1" -resize $2 ${2}x${2}.png
+}
+
+function t
+{
+  if ! [ -z "$TMUX" ]; then
+    tmux new-window -c $PWD
+  fi
+}
+
 # Prompt
 if [ "$USER" = "root" ] ; then
   PS1=%1~$'%{\e[36;1m%}%(1j.%%%j.)%{\e[30;1m%} ➤ %{\e[0m%}'
@@ -173,6 +185,10 @@
   export PATH=/opt/android-sdk/platform-tools:/opt/android-sdk/tools:/opt/android-sdk/build-tools/20.0.0:$PATH
 fi
 
+if [ -e /opt/android-sdk/tools ] ; then
+  export PATH=/opt/android-sdk/tools:$PATH
+fi
+
 # Sencha stuff
 export PATH=/home/unexist/bin/Sencha/Cmd/3.0.0.250:$PATH
 export SENCHA_CMD_3_0_0="/home/unexist/bin/Sencha/Cmd/3.0.0.250"
@@ -218,6 +234,15 @@
   source $HOME/.keychain/$HOST-sh
 fi
 
+# Pebble
+if [ -e $HOME/projects/pebble/PebbleSDK-2.0-BETA3 ] ; then
+  export PATH=/home/unexist/projects/pebble/PebbleSDK-2.0-BETA3/bin:$PATH
+fi
+
+if [ -e /home/unexist/projects/arm-cs-tools/bin ] ; then
+  export PATH=/home/unexist/projects/arm-cs-tools/bin:$PATH
+fi
+
 # RVM
 if [ -s "$HOME/.rvm/scripts/rvm" ] ; then
   source "$HOME/.rvm/scripts/rvm"