add configs for fonts and git, update zshrc and xdefaults

4 files changed, 111 insertions, 13 deletions

diff --git a/.Xdefaults b/.Xdefaults
index e8e2eb0..4bbe068 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -10,7 +10,7 @@
 !  ▓▓▓▓▓▓▓▓▓▓
 ! ░▓ author ▓ xero <x@xero.nu>
 ! ░▓ code   ▓ http://code.xero.nu/dotfiles
-! ░▓ mirror ▓ http://github.com/xero/dotfiles
+! ░▓ mirror ▓ http://git.io/.files
 ! ░▓▓▓▓▓▓▓▓▓▓
 ! ░░░░░░░░░░
 !
@@ -19,7 +19,6 @@ urxvt*font: xft:gohufont:size=11:antialias=true
 urxvt*boldFont: xft:gohufont:size=11:antialias=true
 
 ! █▓▒░ interface
-urxvt.saveLines: 4095
 urxvt*scrollBar: false
 urxvt*transparent: true
 urxvt*shading: 15
@@ -49,5 +48,10 @@ urxvt*color8: #666666
 
 ! █▓▒░ clipboard
 urxvt.keysym.Shift-Control-V: perl:clipboard:paste
-urxvt.iso14755: false
+urxvt.iso14755: False
 urxvt.perl-ext-common: default,clipboard
+
+! █▓▒░ misc
+urxvt.saveLines: 4095
+urxvt.iso14755: false
+urxvt*iconFile: /home/xero/.icons/AwOkenWhite/clear/128x128/apps/terminal3.png
\ No newline at end of file
diff --git a/.fonts.conf b/.fonts.conf
new file mode 100644
index 0000000..83c07ec
--- /dev/null
+++ b/.fonts.conf
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <match target="font">
+  <edit mode="assign" name="hinting" >
+   <bool>true</bool>
+  </edit>
+ </match>
+ <match target="font" >
+  <edit mode="assign" name="autohint" >
+   <bool>true</bool>
+  </edit>
+ </match>
+ <match target="font">
+  <edit mode="assign" name="hintstyle" >
+  <const>hintslight</const>
+  </edit>
+ </match>
+ <match target="font">
+  <edit mode="assign" name="rgba" >
+   <const>rgb</const>
+  </edit>
+ </match>
+ <match target="font">
+  <edit mode="assign" name="antialias" >
+   <bool>true</bool>
+  </edit>
+ </match>
+ <match target="font">
+   <edit mode="assign" name="lcdfilter">
+   <const>lcddefault</const>
+   </edit>
+ </match>
+ <selectfont>
+  <acceptfont>
+   <pattern>
+    <patelt name="family"><string>Gohufont</string></patelt>
+   </pattern>
+  </acceptfont>
+ </selectfont> 
+</fontconfig>
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..2d863d1
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,9 @@
+[user]
+	name = xero
+	email = x@xero.nu
+[credential]
+	helper = cache
+[alias]
+	graph = log --graph --color --pretty=format:"%C(yellow)%H%C(green)%d%C(reset)%n%x20%cd%n%x20%cn%x20(%ce)%n%x20%s%n"
+[color]
+	ui = auto
diff --git a/.zshrc b/.zshrc
index 95a073a..3ed7ab4 100644
--- a/.zshrc
+++ b/.zshrc
@@ -10,7 +10,7 @@
 #  ▓▓▓▓▓▓▓▓▓▓
 # ░▓ author ▓ xero <x@xero.nu>
 # ░▓ code   ▓ http://code.xero.nu/dotfiles
-# ░▓ mirror ▓ http://github.com/xero/dotfiles
+# ░▓ mirror ▓ http://git.io/.files
 # ░▓▓▓▓▓▓▓▓▓▓
 # ░░░░░░░░░░
 #
@@ -25,12 +25,9 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 if [[ -n $SSH_CONNECTION ]]; then
 	export EDITOR='nano'
 else
-	export EDITOR='sublime'
+	export EDITOR='sublime_text'
 fi
 
-#█▓▒░ ssh
-export SSH_KEY_PATH="~/.ssh/id_rsa"
-
 #█▓▒░ aliases
 alias workscreen='xrandr --output HDMI1 --left-of LVDS1 --mode 1366x768'
 alias ls='ls --color=auto'
@@ -39,15 +36,62 @@ alias "cd.."="cd ../"
 alias rock="ncmpcpp"
 alias genplaylist="cd ~/music;find . -name '*.mp3' -o -name '*.flac'|sed -e 's%^./%%g' > ~/.mpd/playlists/all.m3u;mpd ~/.mpd/mpd.conf;mpc clear;mpc load all.m3u;mpc update"
 alias matrix="cmatrix -b -s"
-alias pipes="bash ~/fun/pipes.sh"
-alias pipesx="bash ~/fun/pipesx.sh"
-alias rain="bash ~/fun/rain.sh"
+alias pipes="bash ~/code/fun/pipes.sh"
+alias pipesx="bash ~/code/fun/pipesx.sh"
+alias rain="bash ~/code/fun/rain.sh"
 alias sai="sudo apt-get install"
-alias screenfetch="~/fun/screenfetch"
+alias screenfetch="~/code/fun/screenfetch"
 alias invert="xcalib -i -a"
 alias mixer="alsamixer"
 alias disks="palimpsest"
+alias photoshop="playonlinux --run photoshop_portable"
+alias tempwatch="while :; do sensors|while read x; do printf '% .23s\n' "$x"; done; sleep 1 && clear; done;"
+alias dbtunnel="ssh xero@myadmin.loyal-tree.com -L 10080:127.0.0.1:80"
+alias term='urxvtc -hold -e '
+alias fixcursor='xsetroot -cursor_name left_ptr'
+alias hashcompare='bash ~/code/sys/hash-compare.sh '
+
+#█▓▒░ ssh
+export SSH_KEY_PATH="~/.ssh/id_rsa"
+
+#█▓▒░ autocompletion systems
+autoload -Uz compinit
+compinit
+
+zstyle ':completion:*' auto-description 'specify: %d'
+zstyle ':completion:*' completer _expand _complete _correct _approximate
+zstyle ':completion:*' format 'Completing %d'
+zstyle ':completion:*' group-name ''
+zstyle ':completion:*' menu select=2 eval "$(dircolors -b)"
+zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
+zstyle ':completion:*' list-colors ''
+zstyle ':completion:*' list-prompt %SAt %p: hit TAB for more, or the character to insert%s
+zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*'
+zstyle ':completion:*' menu select=long
+zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
+zstyle ':completion:*' use-compctl false
+zstyle ':completion:*' verbose true
+
+zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
+zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
+
+#█▓▒░ allow functions in the prompt
+setopt PROMPT_SUBST
 
+#█▓▒░ autoload zsh functions
+fpath=(~/.zsh/functions $fpath)
+autoload -U ~/.zsh/functions/*(:t)
+ 
+#█▓▒░ enable auto-execution of functions
+typeset -ga preexec_functions
+typeset -ga precmd_functions
+typeset -ga chpwd_functions
+ 
+#█▓▒░ append git functions needed for prompt.
+preexec_functions+='preexec_update_git_vars'
+precmd_functions+='precmd_update_git_vars'
+chpwd_functions+='chpwd_update_git_vars'
+ 
 #█▓▒░ custom prompts
 
 #█▓▒░dual line
@@ -64,4 +108,4 @@ PROMPT="%F{white}        ▟▙    %F{red}%~%F{white}
 
 #█▓▒░ minial
 grey="%{^[[01;30m%}"
-PROMPT='%F{cyan}[%F{white}%~%F{cyan}]── -%f '
+PROMPT='%F{cyan}[%F{white}%~%F{cyan}]$(prompt_git_info)── -%f '