Merge ../hp-dv6426us-par into build64-par

1 files changed, 26 insertions, 9 deletions

diff --git a/.profile b/.profile
index 811b4bf..155d886 100644
--- a/.profile
+++ b/.profile
@@ -1,14 +1,14 @@
 # ~/.profile: executed by the command interpreter for login shells.
 # This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
 # exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
 
 # the default umask is set in /etc/profile; for setting the umask
 # for ssh logins, install and configure the libpam-umask package.
 umask 022
 
-# set PATH so it includes user's private bin if it exists
+## Paths #############################################################
+
+# Unix
 bins=`echo $HOME/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin`
 for dir in $bins; do
     if [ -d "$dir" ]; then
@@ -16,19 +16,23 @@ for dir in $bins; do
     fi
 done
 
+# Ruby
 for dir in $HOME/.prefix/lib; do
     if [ -d "$dir" ]; then
 	export RUBYLIB="$dir"
     fi
 done
 
+# Settings ###########################################################
+
+# TMPDIR
 if [ -d "$HOME/tmp" ]; then
     export TMPDIR="$HOME/tmp"
 elif [ -d "$HOME/.prefix/tmp" ]; then
     export TMPDIR="$HOME/.prefix/tmp"
 fi
 
-# set SELECTED_EDITOR, EDITOR, and VISUAL to set the text editor used
+# Text editor
 if [ -f "$HOME/.selected_editor" ]; then
     . "$HOME/.selected_editor"
     export SELECTED_EDITOR
@@ -37,20 +41,33 @@ if [ -f "$HOME/.selected_editor" ]; then
     export VISUAL="${VISUAL:-$SELECTED_EDITOR}"
 fi
 
+# GPG
 export GPGKEY=D4FFBFC9
 
+# Java
+_JAVA_OPTIONS=''
+_JAVA_OPTIONS+=' -Dawt.useSystemAAFontSettings=on'
+_JAVA_OPTIONS+=' -Dswing.aatext=true'
+_JAVA_OPTIONS+=' -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
+export _JAVA_OPTIONS
+
+# ALSA
+if [ -x "`which alsactl 2>/dev/null`" ]; then
+    alsactl --file $HOME/.alsa.save restore &> /dev/null || true
+fi
+
+# X11
+export XAUTHORITY=$HOME/.Xauthority
+
+# Start background programs ##########################################
 if [ -f "$HOME/.login-daemons" ]; then
     . "$HOME/.login-daemons"
 fi
 
-# if running bash
+# BASH ###############################################################
 if [ -n "$BASH_VERSION" ]; then
     # include .bashrc if it exists
     if [ -f "$HOME/.bashrc" ]; then
         . "$HOME/.bashrc"
     fi
 fi
-
-if [ -x "`which alsactl`" ]; then
-    alsactl --file $HOME/.alsa.save restore &> /dev/null || true
-fi