commit 7784eb76786433eb96a3700c692ccea6577c5105
parent 0ec0ce613e46d17e064a768107d37398a2b9bdbf
Author: Anders Damsgaard Christensen <adc@geo.au.dk>
Date: Sun, 18 Nov 2012 21:41:38 +0100
Merge branch 'master' of https://github.com/anders-dc/dotfiles
Diffstat:
5 files changed, 21 insertions(+), 122 deletions(-)
diff --git a/.Xresources b/.Xresources
@@ -1,96 +0,0 @@
-! Xcursor --------------------------------------------------------------------
-Xcursor.theme: Vanilla-DMZ-AA
-Xcursor.size: 22
-
-! terminal colors ------------------------------------------------------------
-xterm*background: black
-xterm*foreground: white
-
-! xterm ----------------------------------------------------------------------
-xterm*geometry: 80x25
-xterm*faceName: terminus:bold:pixelsize=11
-!!xterm*font: -*-dina-medium-r-*-*-16-*-*-*-*-*-*-*
-xterm*dynamicColors: true
-!xterm*utf8: 1
-
-xterm*utf8: 1
-!!xterm*metaSendsEscape: true
-!!xterm*eightBitInput: false
-!!xterm*eightBitControl: false
-!!xterm*eightBitOutput: true
-
-!xterm*utf8: 2
-xterm*eightBitInput: true
-
-xterm*saveLines: 512
-xterm*scrollKey: true
-xterm*scrollTtyOutput: false
-!xterm*scrollBar: true
-mxterm*rightScrollBar: true
-xterm*jumpScroll: true
-xterm*multiScroll: true
-xterm*toolBar: false
-
-! xpdf -----------------------------------------------------------------------
-xpdf*enableFreetype: yes
-xpdf*antialias: yes
-xpdf*foreground: black
-xpdf*background: white
-xpdf*matteColor: gray
-xpdf*urlCommand: /usr/bin/chromium %s
-
-! rxvt-unicode ---------------------------------------------------------------
-URxvt.transparent: true
-! URxvt.shading: 0 to 99 darkens, 101 to 200 lightens
-URxvt.shading: 20
-! scrollbar style - rxvt (default), plain (most compact), next, or xterm
-!URxvt.scrollstyle: rxvt
-URxvt.internalBorder: 1
-!URxvt.loginShell: true
-URxvt.scrollBar: off
-URxvt.font: 7x13euro
-! tabs and clickable URLs
-!URxvt.perl-ext-common: default,tabbed,matcher
-URxvt.perl-ext-common: matcher
-URxvt.urlLauncher: /usr/bin/chromium
-URxvt.matcher.button: 1
-! tab colors
-!URxvt.tabbed.tabbar-fg: 2
-!URxvt.tabbed.tabbar-bg: 0
-!URxvt.tabbed.tab-fg: 3
-!URxvt.tabbed.tab-bg: 0
-! colors
-URxvt.foreground: White
-URxvt.background: Black
-URxvt.saveLines: 1024
-URxvt.meta8: True
-urxvt*termName: rxvt
-
-! xscreensaver ---------------------------------------------------------------
-!font settings
-xscreensaver.Dialog.headingFont: -*-dina-bold-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.Dialog.bodyFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.Dialog.labelFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.Dialog.unameFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.Dialog.buttonFont: -*-dina-bold-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.Dialog.dateFont: -*-dina-medium-r-*-*-12-*-*-*-*-*-*-*
-xscreensaver.passwd.passwdFont: -*-dina-bold-r-*-*-12-*-*-*-*-*-*-*
-!general dialog box (affects main hostname, username, password text)
-xscreensaver.Dialog.foreground: #ffffff
-xscreensaver.Dialog.background: #111111
-xscreensaver.Dialog.topShadowColor: #111111
-xscreensaver.Dialog.bottomShadowColor: #111111
-xscreensaver.Dialog.Button.foreground: #666666
-xscreensaver.Dialog.Button.background: #ffffff
-!username/password input box and date text colour
-xscreensaver.Dialog.text.foreground: #666666
-xscreensaver.Dialog.text.background: #ffffff
-xscreensaver.Dialog.internalBorderWidth:24
-xscreensaver.Dialog.borderWidth: 20
-xscreensaver.Dialog.shadowThickness: 2
-!timeout bar (background is actually determined by Dialog.text.background)
-xscreensaver.passwd.thermometer.foreground: #ff0000
-xscreensaver.passwd.thermometer.background: #000000
-xscreensaver.passwd.thermometer.width: 8
-!datestamp format--see the strftime(3) manual page for details
-xscreensaver.dateFormat: %I:%M%P %a %b %d, %Y
diff --git a/.bashrc b/.bashrc
@@ -75,27 +75,22 @@ if [ `hostname` == "adc-stationary" ]; then
# CUDA
export PATH=/usr/bin:$PATH
export LD_LIBRARY_PATH=/usr/lib64:/usr/lib:$LD_LIBRARY_PATH
+
+ # ESyS-Particle
+ export PATH=/usr/local/bin:$PATH
+ export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+ export LIBRARY_PATH=/usr/local/lib:$LIBRARY_PATH
+ export PYTHONPATH=/usr/local/lib/python2.7/dist-packages:$PYTHONPATH
+
# Julia
#export PATH=/Users/adc/install/julia:$PATH
- # Growl
- growl() { echo -e $'\e]9;'${1}'\007' ; return ; }
fi
-# Transparent xterm background
-#[ -n "$WINDOWID" ] && transset-df -i $WINDOWID >/dev/null
-
-complete -cf sudo
-
-#export LANG=en_DK.UTF-8
-#if [ `hostname` != "adc-stationary" ]; then
- # Locales
- #export LANG=en_DK.UTF-8
-
- # The ls command will sort dotfiles first, followed by uppercase and lowercase filenames
- #export LC_ALL=
- #export LC_COLLATE="C"
-#fi
-if [ `hostname` == "master" ] || [ `hostname` == "node*" ]; then
+if [ `hostname` == "master" ] ||
+ [ `hostname` == "node02" ] ||
+ [ `hostname` == "node03" ] ||
+ [ `hostname` == "node04" ] ||
+ [ `hostname` == "node05" ] ; then
# PGI compiler
PGI=/opt/pgi; export PG
diff --git a/.xinitrc b/.xinitrc
@@ -20,20 +20,20 @@ xcalib ~/doc/colorprofile.icc
# Make sure this is before the 'exec' command or it won't be executed.
[ -f ~/.xprofile ] && . ~/.xprofile
-[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+[[ -f ~/.Xdefaults ]] && xrdb -merge ~/.Xdefaults
# screen powersave
xset +dpms # Energy Star features on
xset dpms 300 600 900 # standby -> suspend -> off (seconds)
# Set dim LCD brightness
-xbacklight -set 30 &
+#xbacklight -set 30 &
# Notification deamon
dunst &
# Automatically suspend system after 20 mins of inactivity
-xautolock -time 20 -locker "sudo pm-suspend" &
+#xautolock -time 20 -locker "sudo pm-suspend" &
#DEFAULT_SESSION=awesome
DEFAULT_SESSION=i3
diff --git a/.xprofile b/.xprofile
@@ -1,7 +1,7 @@
#export LC_ALL="en_DK.UTF-8"
-export LANG=en_DK.UTF-8
-export LC_ALL=
-export LC_COLLATE="C"
-export LC_CTYPE="en_US.UTF-8"
+#export LANG=en_DK.UTF-8
+#export LC_ALL=
+#export LC_COLLATE="C"
+#export LC_CTYPE="en_US.UTF-8"
-#[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+export TERMINAL=urxvt
diff --git a/create_symlinks.sh b/create_symlinks.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Home folder dotfiles
-for F in .bashrc .vimrc .tmux.conf .xpdfrc .signature; do
+for F in .bashrc .vimrc .tmux.conf .xpdfrc .signature .Xdefaults .Xmodmap .xinitrc .xprofile; do
SOURCE=$PWD/$F
TARGET=~/$F