@@ -1,6 +1,6 @@

 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}["

 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"

-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}"

+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}%{$reset_color%}"

 ZSH_THEME_GIT_PROMPT_CLEAN=""

 #Customized git status, oh-my-zsh currently does not allow render dirty status before branch

@@ -12,4 +12,4 @@ git_custom_status() {

 }

-PROMPT='%~$(git_custom_status) ❯ %b'

+PROMPT='%~$(git_custom_status) > %b'

@@ -1,3 +1,8 @@

+export TERM=xterm-256color

+[ -n "$TMUX" ] && export TERM=screen-256color

+

+[[ $TERM != screen* ]] && (tmux -q has-session && exec tmux attach-session || exec tmux new-session)

+

 # Path to your oh-my-zsh configuration.

 export ZSH=$HOME/.oh-my-zsh

@@ -25,7 +30,9 @@ plugins=(git git-flow cap gem zsh-syntax-highlighting)

 source /etc/profile

 source $ZSH/oh-my-zsh.sh

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

+setopt extended_glob

 unsetopt nomatch

 unsetopt correctall

@@ -55,29 +62,20 @@ ZSH_HIGHLIGHT_STYLES+=(

   assign                        'none'

 )

-#bindkey "\e[H" beginning-of-line

-#bindkey "\e[F" end-of-line

-bindkey "\e[1;5D" backward-word

-bindkey "\e[1;5C" forward-word

+bindkey "
" beginning-of-line

+bindkey "" end-of-line

 bindkey "^[OD" backward-word

 bindkey "^[OC" forward-word

+bindkey "" gosmacs-transpose-chars 

 alias noh="unsetopt sharehistory"

-#unsetopt auto_name_dirs # rvm_rvmrc_cwd fix

-#[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"  # This loads RVM into a shell session.

-#unset RUBYOPT

-#cd . # to rvm reload

-

-

 alias nogit="disable_git_prompt_info; compdef -d git"

-alias pacman="pacman-color"

 alias cal="cal -m"

 alias du="du -hs"

 alias df="df -h"

 alias grep="grep --colour -i"

 alias vi="vim -u ~/.vimrc"

-alias xterm="LANG=sk_SK.utf8 xterm"

 alias rtorrent="rtorrent -o http_capath=/etc/ssl/certs"

 alias m="cd /media/data/"

 alias toclip="xclip -selection clipboard"

@@ -87,10 +85,12 @@ alias rm="rm -v"

 alias mv="mv -v"

 alias cp="cp -v"

 alias y="yaourt -Syu --aur"

+alias n="ncmpcpp"

+alias chromium="chromium --disk-cache-dir=/home/cinan/.config/chromium/Cache"

 export EDITOR="vim"

-export TERM=xterm-256color

-export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=lcd'

+#export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=lcd'

+export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dawt.RenderingHint=lcd'

 #--laf javax.swing.plaf.metal.MetalLookAndFeel

 #--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel

@@ -98,5 +98,5 @@ export HISTFILE=~/.zsh_history

 export HISTSIZE=10000

 export SAVEHIST=10000

-export PATH=$PATH:/home/cinan/.gem/ruby/1.9.1/bin

-export GEM_HOME=$GEM_HOME:/home/cinan/.gem/ruby/1.9.1 

\ No newline at end of file

+export PATH=$PATH:$HOME/.rvm/bin:$HOME/system/bin

+