diff options
| l--------- | .Xdefaults | 1 | ||||
| l--------- | .arduino | 1 | ||||
| l--------- | .bash_login | 1 | ||||
| l--------- | .bash_logout | 1 | ||||
| l--------- | .bashrc | 1 | ||||
| l--------- | .bazaar | 1 | ||||
| -rw-r--r-- | .bootstrap.min.sh | 7 | ||||
| l--------- | .conkeror.mozdev.org | 1 | ||||
| l--------- | .conkerorrc | 1 | ||||
| l--------- | .cpan | 1 | ||||
| l--------- | .emacs.d | 1 | ||||
| l--------- | .gconf | 1 | ||||
| l--------- | .gconfd | 1 | ||||
| l--------- | .hgrc | 1 | ||||
| -rw-r--r-- | .kde/.gitignore | 1 | ||||
| l--------- | .kde/share/apps | 1 | ||||
| l--------- | .kde/share/config | 1 | ||||
| l--------- | .kde4 | 1 | ||||
| l--------- | .linphonerc | 1 | ||||
| -rw-r--r-- | .local/lib/xdg.sh | 23 | ||||
| l--------- | .maildirproc | 1 | ||||
| l--------- | .mplayer | 1 | ||||
| l--------- | .nanorc | 1 | ||||
| l--------- | .offlineimaprc | 1 | ||||
| -rw-r--r-- | .profile | 51 | ||||
| l--------- | .purple | 1 | ||||
| l--------- | .subversion | 1 | ||||
| l--------- | .wmii | 1 | ||||
| l--------- | .xinitrc | 1 | ||||
| l--------- | .xserverrc | 1 | ||||
| l--------- | .xsession | 1 |
31 files changed, 59 insertions, 50 deletions
diff --git a/.Xdefaults b/.Xdefaults deleted file mode 120000 index 7588317..0000000 --- a/.Xdefaults +++ /dev/null @@ -1 +0,0 @@ -.config/X11/defaults
\ No newline at end of file diff --git a/.arduino b/.arduino deleted file mode 120000 index a7ade0f..0000000 --- a/.arduino +++ /dev/null @@ -1 +0,0 @@ -.config/arduino/
\ No newline at end of file diff --git a/.bash_login b/.bash_login deleted file mode 120000 index 31231da..0000000 --- a/.bash_login +++ /dev/null @@ -1 +0,0 @@ -.config/bash/login.sh
\ No newline at end of file diff --git a/.bash_logout b/.bash_logout deleted file mode 120000 index d8117ff..0000000 --- a/.bash_logout +++ /dev/null @@ -1 +0,0 @@ -.config/bash/logout.sh
\ No newline at end of file diff --git a/.bashrc b/.bashrc deleted file mode 120000 index 18faac1..0000000 --- a/.bashrc +++ /dev/null @@ -1 +0,0 @@ -.config/bash/rc.sh
\ No newline at end of file diff --git a/.bazaar b/.bazaar deleted file mode 120000 index 71ca147..0000000 --- a/.bazaar +++ /dev/null @@ -1 +0,0 @@ -.config/bazaar/
\ No newline at end of file diff --git a/.bootstrap.min.sh b/.bootstrap.min.sh deleted file mode 100644 index eed85b5..0000000 --- a/.bootstrap.min.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -files='.bashrc .bash_aliases .gitconfig .profile' -for file in $files; do - rm -f $file - wget http://gitorious.org/lukeshu-dotfiles/lukeshu-dotfiles/blobs/raw/master/$file; -done diff --git a/.conkeror.mozdev.org b/.conkeror.mozdev.org deleted file mode 120000 index 49c36a2..0000000 --- a/.conkeror.mozdev.org +++ /dev/null @@ -1 +0,0 @@ -.mozilla/
\ No newline at end of file diff --git a/.conkerorrc b/.conkerorrc deleted file mode 120000 index 6a56807..0000000 --- a/.conkerorrc +++ /dev/null @@ -1 +0,0 @@ -.config/conkerorrc
\ No newline at end of file @@ -1 +0,0 @@ -.config/cpan/
\ No newline at end of file diff --git a/.emacs.d b/.emacs.d deleted file mode 120000 index d45c316..0000000 --- a/.emacs.d +++ /dev/null @@ -1 +0,0 @@ -.config/emacs/
\ No newline at end of file @@ -1 +0,0 @@ -.config/gconf
\ No newline at end of file diff --git a/.gconfd b/.gconfd deleted file mode 120000 index 33f7f91..0000000 --- a/.gconfd +++ /dev/null @@ -1 +0,0 @@ -.cache/gconfd
\ No newline at end of file @@ -1 +0,0 @@ -.config/hgrc
\ No newline at end of file diff --git a/.kde/.gitignore b/.kde/.gitignore deleted file mode 100644 index 3e3f239..0000000 --- a/.kde/.gitignore +++ /dev/null @@ -1 +0,0 @@ -socket-*
\ No newline at end of file diff --git a/.kde/share/apps b/.kde/share/apps deleted file mode 120000 index 231b1b5..0000000 --- a/.kde/share/apps +++ /dev/null @@ -1 +0,0 @@ -../../.config/
\ No newline at end of file diff --git a/.kde/share/config b/.kde/share/config deleted file mode 120000 index 231b1b5..0000000 --- a/.kde/share/config +++ /dev/null @@ -1 +0,0 @@ -../../.config/
\ No newline at end of file @@ -1 +0,0 @@ -.kde/
\ No newline at end of file diff --git a/.linphonerc b/.linphonerc deleted file mode 120000 index aa45b66..0000000 --- a/.linphonerc +++ /dev/null @@ -1 +0,0 @@ -.config/linphonerc
\ No newline at end of file diff --git a/.local/lib/xdg.sh b/.local/lib/xdg.sh new file mode 100644 index 0000000..44aeee2 --- /dev/null +++ b/.local/lib/xdg.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# This should be readable by /bin/sh, but I'm going to assume bash. + +# Sets up XDG environmental variables, so programs using them don't have to +# worry about checking if they are set. +# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html + +[[ -n $XDG_DATA_HOME ]] || export XDG_DATA_HOME="$HOME/.local/share" +[[ -n $XDG_CONFIG_HOME ]] || export XDG_CONFIG_HOME="$HOME/.config" +[[ -n $XDG_DATA_DIRS ]] || export XDG_DATA_DIRS="/usr/local/share/:/usr/share/" +[[ -n $XDG_CONFIG_IRS ]] || export XDG_CONFIG_DIRS="/etc/xdg" +[[ -n $XDG_CACHE_HOME ]] || export XDG_CACHE_HOME="$HOME/.cache" + +# Check if XDG_RUNTIME_DIR is set, but has a bogus setting +if [[ -n $XDG_RUNTIME_DIR ]] && [[ ! -d $XDG_RUNTIME_DIR ]]; then + unset XDG_RUNTIME_DIR +fi + +# Set XDG_RUNTIME_DIR if we can +if [[ -z $XDG_RUNTIME_DIR ]] && [[ -n $TMPDIR ]]; then + export XDG_RUNTIME_DIR="$TMPDIR/xdg-runtime" + install -dm0700 "$XDG_RUNTIME_DIR" +fi diff --git a/.maildirproc b/.maildirproc deleted file mode 120000 index f29b6d2..0000000 --- a/.maildirproc +++ /dev/null @@ -1 +0,0 @@ -.config/maildirproc/
\ No newline at end of file diff --git a/.mplayer b/.mplayer deleted file mode 120000 index 577c445..0000000 --- a/.mplayer +++ /dev/null @@ -1 +0,0 @@ -.config/mplayer/
\ No newline at end of file diff --git a/.nanorc b/.nanorc deleted file mode 120000 index 52dfc45..0000000 --- a/.nanorc +++ /dev/null @@ -1 +0,0 @@ -.config/nanorc
\ No newline at end of file diff --git a/.offlineimaprc b/.offlineimaprc deleted file mode 120000 index 85b605c..0000000 --- a/.offlineimaprc +++ /dev/null @@ -1 +0,0 @@ -.config/offlineimaprc
\ No newline at end of file @@ -13,24 +13,45 @@ umask 022 ## Paths ############################################################# # Unix -bins=($HOME/bin $HOME/.local.`uname -m`/bin $HOME/.local/bin $HOME/.prefix.`uname -m`/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin) -for dir in "${bins[@]}"; do - if [ -d "$dir" ]; then - export PATH="$dir:$PATH" +prefixes=( + "$HOME" + "$HOME/.local.`uname -m`" + "$HOME/.local/bin" + "$HOME/.prefix.`uname -m`" + "$HOME/.prefix" + "$HOME"/.gem/ruby/* +) +for prefix in "${prefixes[@]}"; do + if [[ -d "$prefix/bin" ]]; then + export PATH="$prefix/bin:$PATH" fi done # Ruby -for dir in $HOME/.prefix/lib; do - if [ -d "$dir" ]; then +for dir in "$HOME"/.prefix/lib; do + if [[ -d "$dir" ]]; then export RUBYLIB="$dir" fi done +unset prefixes dir prefix + +# TMPDIR ############################################################# + +if [[ ! -d "$HOME/tmp" ]]; then + tmp="$(mktemp --tmpdir -d "$USER-tmpdir.XXXXXXXXXXXXXXXXXXX")" + ln -sf "$tmp" "$HOME/tmp" + unset tmp +fi +export TMPDIR="$HOME/tmp" + +# XDG ################################################################ + +. "$HOME/.local/lib/xdg.sh" # Settings ########################################################### # Text editor -if [ -f "$HOME/.selected_editor" ]; then +if [[ -f "$HOME/.selected_editor" ]]; then . "$HOME/.selected_editor" export SELECTED_EDITOR export ALTERNATE_EDITOR @@ -39,14 +60,14 @@ if [ -f "$HOME/.selected_editor" ]; then fi # GPG -if [ -z "$GPGKEY" ] && [ -f "${HOME}/.gnupg/gpg.conf" ]; then +if [[ -z $GPGKEY ]] && [[ -f "${HOME}/.gnupg/gpg.conf" ]]; then export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"` fi -if [ -z "$(pgrep -u `whoami` gpg-agent)" ]; then - mkdir -p ${XDG_RUNTIME_DIR}/sessions +if [[ -z "$(pgrep -u `whoami` gpg-agent)" ]] && [[ -n $XDG_RUNTIME_DIR ]] && type gpg-agent &>/dev/null; then + mkdir -p "${XDG_RUNTIME_DIR}/sessions" gpg-agent --daemon --write-env-file "${XDG_RUNTIME_DIR}/sessions/gpg" &>/dev/null fi -if [ -f "${XDG_RUNTIME_DIR}/sessions/gpg" ]; then +if [[ -f "${XDG_RUNTIME_DIR}/sessions/gpg" ]]; then . "${XDG_RUNTIME_DIR}/sessions/gpg" export GPG_AGENT_INFO #export SSH_AUTH_SOCK @@ -57,18 +78,18 @@ _JAVA_OPTIONS='' _JAVA_OPTIONS+=' -Dawt.useSystemAAFontSettings=on' _JAVA_OPTIONS+=' -Dswing.aatext=true' _JAVA_OPTIONS+=' -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' -if [ -n "$TMPDIR" ]; then +if [[ -n $TMPDIR ]]; then _JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR" fi export _JAVA_OPTIONS # X11 -if [ -z "$XAUTHORITY" ]; then +if [[ -z $XAUTHORITY ]]; then export XAUTHORITY=$HOME/.Xauthority fi # D-Bus -if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then +if [[ -z $DBUS_SESSION_BUS_ADDRESS ]] && type dbus-launch &>/dev/null; then # I want a separate instance for each login #dbus-launch > "${HOME}/.cache/sessions/dbus" #. "${HOME}/.cache/sessions/dbus" @@ -79,6 +100,6 @@ if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then fi # Load any box-specific stuff -if [ -f "$HOME/.profile.local" ]; then +if [[ -f "$HOME/.profile.local" ]]; then . "$HOME/.profile.local" fi diff --git a/.purple b/.purple deleted file mode 120000 index c08b730..0000000 --- a/.purple +++ /dev/null @@ -1 +0,0 @@ -.config/purple/
\ No newline at end of file diff --git a/.subversion b/.subversion deleted file mode 120000 index 4e66627..0000000 --- a/.subversion +++ /dev/null @@ -1 +0,0 @@ -.config/subversion/
\ No newline at end of file @@ -1 +0,0 @@ -.config/wmii/
\ No newline at end of file diff --git a/.xinitrc b/.xinitrc deleted file mode 120000 index c0f7e1c..0000000 --- a/.xinitrc +++ /dev/null @@ -1 +0,0 @@ -.config/X11/clientrc
\ No newline at end of file diff --git a/.xserverrc b/.xserverrc deleted file mode 120000 index f46e3e3..0000000 --- a/.xserverrc +++ /dev/null @@ -1 +0,0 @@ -.config/X11/serverrc
\ No newline at end of file diff --git a/.xsession b/.xsession deleted file mode 120000 index ee16887..0000000 --- a/.xsession +++ /dev/null @@ -1 +0,0 @@ -.config/X11/login
\ No newline at end of file |