summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-07-17 10:54:22 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-07-17 10:54:22 -0400
commit1e21630f10a42654f999b76ed8337abd960c5ab9 (patch)
treeba1cbc996d52094993d905b360dcb34736b2b974
parentd7f60aebf173b6bddc92b319f773e6286cd96b42 (diff)
parent48ead3cdd19afcf42f119f72c3f3d73b67cc3210 (diff)
Merge branch 'work-fc17'
-rw-r--r--.crontab2
-rw-r--r--.emacs.d/custom.el20
-rw-r--r--.irbrc1
-rw-r--r--.profile4
4 files changed, 15 insertions, 12 deletions
diff --git a/.crontab b/.crontab
index c2d8351..ca405cf 100644
--- a/.crontab
+++ b/.crontab
@@ -1,3 +1,3 @@
# m h dom mon dow command
-*/5 * * * * cd $HOME && make -
+*/5 * * * * cd $HOME && make
*/5 * * * * offlineimap-runner 2 -u quiet
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index 4caf4c5..0d4cf4a 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -1,16 +1,16 @@
(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(ruby-deep-arglist nil)
- '(ruby-deep-indent-paren nil)
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
'(erc-nick "lukeshu")
'(mdmua-maildir "~/Maildir")
+ '(ruby-deep-arglist nil)
+ '(ruby-deep-indent-paren nil)
'(scroll-bar-mode nil))
(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
)
diff --git a/.irbrc b/.irbrc
new file mode 100644
index 0000000..7596d96
--- /dev/null
+++ b/.irbrc
@@ -0,0 +1 @@
+require 'rubygems' unless defined? Gem # only needed in 1.8
diff --git a/.profile b/.profile
index 6f9f102..d05ae5e 100644
--- a/.profile
+++ b/.profile
@@ -50,7 +50,9 @@ if [ -x "`which alsactl 2>/dev/null`" ]; then
fi
# X11
-export XAUTHORITY=$HOME/.Xauthority
+if [ -z "$XAUTHORITY" ]; then
+ export XAUTHORITY=$HOME/.Xauthority
+fi
# Start background programs ##########################################
if [ -f "$HOME/.login-daemons" ]; then