diff options
| -rw-r--r-- | .bashrc | 7 | ||||
| -rw-r--r-- | .emacs | 33 | ||||
| -rw-r--r-- | .login-daemons | 7 | ||||
| -rw-r--r-- | .profile | 31 | ||||
| -rw-r--r-- | Makefile | 10 |
5 files changed, 61 insertions, 27 deletions
@@ -96,9 +96,6 @@ if [ -f /etc/bash_completion ]; then . /etc/bash_completion fi -if [ "$TERM" != dumb ]; then - export TMPDIR="$HOME/tmp" - daemon emacs --daemon - daemon sysfiles - daemon maildirproc +if [ -f "$HOME/.login-daemons" ]; then + . "$HOME/.login-daemons" fi @@ -28,17 +28,7 @@ (eval-print-last-sexp)))) (setq el-get-sources - '(el-get - package - rainbow-delimiters - php-mode-improved - mmm-mode - dtrt-indent - magit - coffee-mode - folding - apel flim semi wanderlust - (:name scss-mode + '((:name scss-mode :url "git://github.com/antonj/scss-mode.git" :after (lambda () (setq scss-compile-at-save nil))) @@ -76,8 +66,27 @@ (autopair-global-mode 1) (setq autopair-autowrap t))) )) + +(setq lts-el-get-packages + '(el-get + package + rainbow-delimiters + php-mode-improved + mmm-mode + dtrt-indent + magit + coffee-mode + folding + apel flim semi wanderlust + scss-mode + color-theme color-theme-solarized + org-mode + identica-mode + smarttabs + autopair)) + (when (require 'el-get nil t) - (el-get 'sync)) + (el-get 'sync lts-el-get-packages)) (add-hook 'text-mode-hook 'turn-on-auto-fill) (add-hook 'after-make-frame-functions diff --git a/.login-daemons b/.login-daemons new file mode 100644 index 0000000..1d76e9d --- /dev/null +++ b/.login-daemons @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -x "`which daemon`" ]; then + daemon emacs --daemon + daemon sysfiles + daemon maildirproc +fi @@ -9,16 +9,17 @@ umask 022 # set PATH so it includes user's private bin if it exists -if [ -d "$HOME/.prefix/bin" ]; then - export PATH="$HOME/.prefix/bin:$PATH" -fi - -# if running bash -if [ -n "$BASH_VERSION" ]; then - # include .bashrc if it exists - if [ -f "$HOME/.bashrc" ]; then - . "$HOME/.bashrc" +bins=`echo $HOME/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin` +for dir in $bins; do + if [ -d "$dir" ]; then + export PATH="$dir:$PATH" fi +done + +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 @@ -30,6 +31,18 @@ if [ -f "$HOME/.selected_editor" ]; then export VISUAL="${VISUAL:-$SELECTED_EDITOR}" fi +if [ -f "$HOME/.login-daemons" ]; then + . "$HOME/.login-daemons" +fi + +# if running 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 @@ -1,13 +1,15 @@ CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:/ NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(CHECK))))) +ALSACTL=$(firstword $(shell which alsactl) echo) + targets=.nanorc .folders .crontab.cookie .alsa.save all: $(targets) clean: rm -f $(targets) .alsa.save: FORCE - alsactl --file $(HOME)/.alsa.save store || touch '$@' + $(ALSACTL) --file $(HOME)/.alsa.save store || touch '$@' .nanorc: .nanorc.in $(NANO_SHARE) cat '$<' > '$@' @@ -20,6 +22,12 @@ clean: cat $^ | crontab - date > '$@' +# don't do anything, just create these if they doesn't exist +.crontab.local: + touch '$@' +Maildir: + mkdir -p '$@'/{cur,new,tmp} + commit: git commit -a |