move a bunch of things into XDG directories

11 files changed, 55 insertions, 45 deletions

diff --git a/.config/Makefile b/.config/Makefile
new file mode 100644
index 0000000..391e43c
--- /dev/null
+++ b/.config/Makefile
@@ -0,0 +1,28 @@
+SHELL = /bin/bash
+
+GITDIR=${HOME}/.git
+
+targets=${HOME}/.folders ${XDG_CACHE_HOME}/cron/cookie ${GITDIR}/info/exclude
+all: $(targets)
+clean:
+	rm -f $(targets)
+
+${HOME}/.folders: ${HOME}/Maildir
+	( echo '..'; find $< -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@'
+${GITDIR}/info/exclude: .git.info.exclude.in $(shell echo .??*/)
+	( cat $<; find $^ -type f -name 'CACHEDIR.TAG' -printf '%h\n'|sed 's@^\./@/@' ) > $@
+
+${XDG_CACHE_HOME}/cron/cookie: ${XDG_CONFIG_HOME}/cron
+	-(cat $^/*; echo) | crontab - 2>/dev/null
+	mkdir -p '$(@D)'
+	date > '$@'
+
+${HOME}/Maildir:
+	mkdir -p '$@'/{cur,new,tmp}
+${HOME}/Maildir/%: | ${HOME}/Maildir
+	mkdir -p '$@'/{cur,new,tmp}
+	touch '$@'/maildirfolder
+
+.PHONY: FORCE PHONY
+FORCE: ; 
+PHONY: ;
diff --git a/.config/cron/make-config b/.config/cron/make-config
new file mode 100644
index 0000000..afe690d
--- /dev/null
+++ b/.config/cron/make-config
@@ -0,0 +1,2 @@
+# m	h	dom	mon	dow	command
+*/5	*	*	*	*	. $HOME/.local/lib/xdg.sh && make -C $XDG_CONFIG_HOME
diff --git a/.gitignore b/.config/git/ignore
index e69de29..e69de29 100644
--- a/.gitignore
+++ b/.config/git/ignore
diff --git a/.gnupg/gpg.conf b/.config/gpg/gpg.conf
index f43a58e..f43a58e 100644
--- a/.gnupg/gpg.conf
+++ b/.config/gpg/gpg.conf
diff --git a/.icons/default/index.theme b/.config/icons/default/index.theme
index dd26337..dd26337 100644
--- a/.icons/default/index.theme
+++ b/.config/icons/default/index.theme
diff --git a/.config/irbrc b/.config/irbrc
new file mode 100644
index 0000000..27cce66
--- /dev/null
+++ b/.config/irbrc
@@ -0,0 +1,4 @@
+require 'rubygems' unless defined? Gem # only needed in 1.8
+require 'irb/ext/save-history'
+IRB.conf[:SAVE_HISTORY] = 5000
+IRB.conf[:HISTORY_FILE] = "#{ENV['XDG_CACHE_HOME']}/irb/history"
\ No newline at end of file
diff --git a/.selected_editor b/.config/selected_editor
index 7631487..7631487 100644
--- a/.selected_editor
+++ b/.config/selected_editor
diff --git a/.ssh/config b/.config/ssh/config
index 1debee4..1debee4 100644
--- a/.ssh/config
+++ b/.config/ssh/config
diff --git a/.config/symlinks b/.config/symlinks
index 27b837d..01c8c4e 100644
--- a/.config/symlinks
+++ b/.config/symlinks
@@ -1,12 +1,30 @@
+# target		link
+
+# X11
 .config/X11/defaults	.Xdefaults
 .config/X11/clientrc	.xinitrc
 .config/X11/serverrc	.xserverrc
 .config/X11/login	.xsession
 
+# Bash
 .config/bash/rc.sh	.bashrc
 .config/bash/login.sh	.bash_login
 .config/bash/logout.sh	.bash_logout
 
+# Files plucked out of multi-purpose directories
+.config/ssh/config	.ssh/config
+.config/gpg/gpg.conf	.gnupg/gpg.conf
+
+# Individual config files
+.config/conkerorrc	.conkerorrc
+.config/hgrc		.hgrc
+.config/irbrc		.irbrc
+.config/linphonerc	.linphonerc
+.config/offlineimaprc	.offlineimaprc
+.config/selected_editor	.selected_editor
+
+# Directories
+.config/icons/		.icons
 .config/arduino/	.arduino
 .config/bazaar/		.bazaar
 .config/cpan/		.cpan
@@ -16,17 +34,13 @@
 .config/mplayer/	.mplayer
 .config/nanorc		.nanorc
 .config/purple/		.purple
-.config/ssh/		.ssh		#
 .config/subversion/	.subversion
 .config/wmii/		.wmii
 
-.config/conkerorrc	.conkerorrc
-.config/hgrc		.hgrc
-.config/linphonerc	.linphonerc
-.config/offlineimaprc	.offlineimaprc
-
+# KDE
 .config/		.kde/share/apps
 .config/		.kde/share/config
-
 .kde/			.kde4
+
+# Alias for conkeror
 .mozilla/		.conkeror.mozdev.org
diff --git a/.irbrc b/.irbrc
deleted file mode 100644
index 0d2f5b4..0000000
--- a/.irbrc
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'rubygems' unless defined? Gem # only needed in 1.8
-require 'irb/ext/save-history'
-IRB.conf[:SAVE_HISTORY] = 1000
-IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb-save-history"
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5e4fb21..0000000
--- a/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-SHELL = /bin/bash
-
-NANO_BIN_PREFIX = $(patsubst %/bin/nano,%,$(shell which nano))
-NANO_CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:$(NANO_BIN_PREFIX)
-NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(NANO_CHECK)))))
-
-targets=.nanorc .folders .crontab.cookie .git.info.exclude
-all: $(targets)
-clean:
-	rm -f $(targets)
-
-.config/nanorc: .config/nanorc.in $(NANO_SHARE)
-	cat '$<' > '$@'
-	for file in $(NANO_SHARE)/*.nanorc; do echo "include \"$$file\""; done >> '$@'
-
-.folders: Maildir
-	( echo '..'; find ~/Maildir -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@'
-.git.info.exclude: .git.info.exclude.in $(shell echo .??*/)
-	( cat $<; find $^ -type f -name 'CACHEDIR.TAG' -printf '%h\n'|sed 's@^\./@/@' ) > $@
-
-.cache/cron/cookie: .config/cron
-	-(cat $^/*; echo) | crontab - 2>/dev/null
-	mkdir -p '$(@D)'
-	date > '$@'
-
-Maildir:
-	mkdir -p '$@'/{cur,new,tmp}
-Maildir/%: | Maildir
-	mkdir -p '$@'/{cur,new,tmp}
-	touch '$@'/maildirfolder
-
-.PHONY: FORCE PHONY
-FORCE: ; 
-PHONY: ;