changeset 452:471fde9d46c5

Updated configs
author unexist
date Thu, 26 Dec 2013 19:01:42 +0100
parents f59da7734c99
children 531641fb9c83
files .zshalias .zshrc
diffstat 2 files changed, 40 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.zshalias	Thu Aug 01 18:01:42 2013 +0200
+++ b/.zshalias	Thu Dec 26 19:01:42 2013 +0100
@@ -39,15 +39,18 @@
   # Based on dist
   if [ -e /usr/bin/pacman ] ; then
     alias p="packer --noedit"
+    alias I="sudo pacman -S"
+    alias R="sudo pacman -R"
     alias S="sudo pacman -S"
-    alias R="sudo pacman -R"
   elif [ -e /usr/bin/apt-get ] ; then
     alias p="sudo apt-get"
-    alias S="sudo apt-get install"
+    alias I="sudo apt-get install"
     alias R="sudo apt-get remove"
+    alias S="apt-cache search"
   fi
 fi
 
+
 # Valgrind
 if [ -e /usr/bin/valgrind ] ; then
   alias memcheck="valgrind --tool=memcheck --leak-check=full --suppressions=$HOME/.suppressions"
@@ -55,8 +58,8 @@
 fi
 
 # Calc
-if [ -e /usr/bin/calc ] ; then
-  alias calc='noglob calc'
+if [ -e /usr/bin/concalc ] ; then
+  alias calc='noglob concalc'
 fi
 
 # Mercurial
@@ -69,6 +72,11 @@
   alias svns="svn status|grep -v '^?'"
 fi
 
+# Git
+if [ -e /usr/bin/git ] ; then
+  alias gits="git status"
+fi
+
 # Mpd
 if [ -e /usr/bin/mpc ] ; then
   alias mpc="nocorrect mpc"
@@ -84,6 +92,7 @@
   alias chrome="chrome &>/dev/null &!"
 elif [ -e /usr/bin/chromium ] ; then
   alias chrome="chromium &>/dev/null &!"
+  alias chromeunsec="chromium --disable-web-security &>/dev/null &!"
 elif [ -e /usr/bin/google-chrome ] ; then
   alias chrome="google-chrome &>/dev/null &!"
 elif [ -e /usr/bin/chromium-browser ] ; then
--- a/.zshrc	Thu Aug 01 18:01:42 2013 +0200
+++ b/.zshrc	Thu Dec 26 19:01:42 2013 +0100
@@ -149,8 +149,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
@@ -161,6 +161,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%}'
@@ -193,6 +205,10 @@
   export PATH=/opt/android-sdk/platform-tools:$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"
@@ -238,6 +254,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
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"