From 083dc3d5a8863e4115d7bfdc4aa85c34ef5b4513 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2011 15:13:29 -0400 Subject: When was someone going to tell me about https://github.com/dimitri/el-get/commit/8f886c07d267894263e5c9818c60ada480aa7e0a --- .emacs | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/.emacs b/.emacs index d2c5323..09c80f8 100644 --- a/.emacs +++ b/.emacs @@ -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 -- cgit v1.2.3 From a7f6f2073c8d60b433775c6f4462f58d28ae8d25 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2011 15:14:40 -0400 Subject: Some systems *cough*CentOS6*cough* want you to add $HOME/bin to $PATH in your .profile/.bash_profile, not /etc/profile. --- .profile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.profile b/.profile index 36a3ec5..4bf1916 100644 --- a/.profile +++ b/.profile @@ -9,6 +9,10 @@ umask 022 # set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ]; then + export PATH="$HOME/bin:$PATH" +fi + if [ -d "$HOME/.prefix/bin" ]; then export PATH="$HOME/.prefix/bin:$PATH" fi -- cgit v1.2.3 From 809560f184fc7ca052c1988a68616292954b5af5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2011 16:26:40 -0400 Subject: offlineimap should be run in .crontab.local --- .crontab | 1 - 1 file changed, 1 deletion(-) diff --git a/.crontab b/.crontab index fd50136..d4e21e0 100644 --- a/.crontab +++ b/.crontab @@ -1,3 +1,2 @@ # m h dom mon dow command -*/5 * * * * offlineimap -u quiet */5 * * * * cd $HOME && make -k -- cgit v1.2.3 From b83c46ff532390168eeb793dbb0c21f47389fcec Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2011 16:26:58 -0400 Subject: make Makefile for fault-tolerant --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 998ff62..3fb2243 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,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 -- cgit v1.2.3 From 2f7a1f33ab6fc5017cd58e9db61e430dffc73846 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2011 16:27:52 -0400 Subject: Add the user's rubygems bin to $PATH, if it exists --- .profile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.profile b/.profile index 4bf1916..a6704af 100644 --- a/.profile +++ b/.profile @@ -9,13 +9,12 @@ umask 022 # set PATH so it includes user's private bin if it exists -if [ -d "$HOME/bin" ]; then - export PATH="$HOME/bin:$PATH" -fi - -if [ -d "$HOME/.prefix/bin" ]; then - export PATH="$HOME/.prefix/bin:$PATH" -fi +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 running bash if [ -n "$BASH_VERSION" ]; then -- cgit v1.2.3 From a46c5c23b26cf149065bd516a781bc66535d8bcf Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 11 Nov 2011 15:19:25 -0500 Subject: move daemon-starting into a separate file, do it in .profile (and .bashrc) --- .bashrc | 7 ++----- .login-daemons | 7 +++++++ .profile | 22 ++++++++++++++++------ 3 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 .login-daemons diff --git a/.bashrc b/.bashrc index c4e4c64..2c5b611 100644 --- a/.bashrc +++ b/.bashrc @@ -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 diff --git a/.login-daemons b/.login-daemons new file mode 100644 index 0000000..5b8851e --- /dev/null +++ b/.login-daemons @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -x "`which daemon`"]; then + daemon emacs --daemon + daemon sysfiles + daemon maildirproc +fi diff --git a/.profile b/.profile index 36a3ec5..bc8d481 100644 --- a/.profile +++ b/.profile @@ -13,12 +13,10 @@ 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" - fi +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 +28,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 -- cgit v1.2.3 From 3f0ed06f522b6c6b4e3d376021890bc5a450aa85 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 11 Nov 2011 15:20:44 -0500 Subject: Change ALSACTL to a variable in Makefile, have it fail over to 'echo' --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 998ff62..0efe771 100644 --- a/Makefile +++ b/Makefile @@ -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 '$<' > '$@' -- cgit v1.2.3 From 2af83cc44a32b02ae031a6b7e618025d58fceb72 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 11 Nov 2011 15:21:40 -0500 Subject: Comment out offlineimap in .crontab --- .crontab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.crontab b/.crontab index fd50136..77e6afe 100644 --- a/.crontab +++ b/.crontab @@ -1,3 +1,3 @@ # m h dom mon dow command -*/5 * * * * offlineimap -u quiet +#*/5 * * * * offlineimap -u quiet */5 * * * * cd $HOME && make -k -- cgit v1.2.3 From fa0728204665d9d985f212826be65a563312e7e6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 13 Nov 2011 14:46:29 -0500 Subject: oops, `[' needs whitespace before `]' --- .login-daemons | 2 +- .profile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.login-daemons b/.login-daemons index 5b8851e..1d76e9d 100644 --- a/.login-daemons +++ b/.login-daemons @@ -1,6 +1,6 @@ #!/bin/sh -if [ -x "`which daemon`"]; then +if [ -x "`which daemon`" ]; then daemon emacs --daemon daemon sysfiles daemon maildirproc diff --git a/.profile b/.profile index 004b7a2..bc03469 100644 --- a/.profile +++ b/.profile @@ -16,7 +16,7 @@ for dir in $bins; do fi done -if [ -d "$HOME/tmp"]; then +if [ -d "$HOME/tmp" ]; then export TMPDIR="$HOME/tmp" elif [ -d "$HOME/.prefix/tmp"]; then export TMPDIR="$HOME/.prefix/tmp" -- cgit v1.2.3