re-jigger to have most everything in XDG directories

5 files changed, 30 insertions, 61 deletions

diff --git a/.config/Makefile b/.config/Makefile
index 391e43c..829b820 100644
--- a/.config/Makefile
+++ b/.config/Makefile
@@ -1,15 +1,22 @@
+#!/usr/bin/make -f
+
 SHELL = /bin/bash
 
-GITDIR=${HOME}/.git
+GITDIR = ${HOME}/.git
+
+targets = \
+	${GITDIR}/info/exclude \
+	${HOME}/.folders \
+	${XDG_CACHE_HOME}/config-symlinks/cookie \
+	${XDG_CACHE_HOME}/cron/cookie
 
-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 .??*/)
+${GITDIR}/info/exclude: ${HOME}/.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
@@ -17,6 +24,11 @@ ${XDG_CACHE_HOME}/cron/cookie: ${XDG_CONFIG_HOME}/cron
 	mkdir -p '$(@D)'
 	date > '$@'
 
+${XDG_CACHE_HOME}/config-symlinks/cookie: ${XDG_CONFIG_HOME}/symlinks
+	config-symlinks
+	mkdir -p '$(@D)'
+	date > '$@'
+
 ${HOME}/Maildir:
 	mkdir -p '$@'/{cur,new,tmp}
 ${HOME}/Maildir/%: | ${HOME}/Maildir
diff --git a/.profile.local b/.config/login.local.sh
index 25b322b..25b322b 100644
--- a/.profile.local
+++ b/.config/login.local.sh
diff --git a/.profile b/.config/login.sh
index 84103f3..851f4ec 100644
--- a/.profile
+++ b/.config/login.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # ~/.profile: executed by the command interpreter for login shells.
 # Should be whether logging in graphically or not.
 #
@@ -100,6 +101,6 @@ if [[ -z $DBUS_SESSION_BUS_ADDRESS ]] && type dbus-launch &>/dev/null; then
 fi
 
 # Load any box-specific stuff
-if [[ -f "$HOME/.profile.local" ]]; then
-	. "$HOME/.profile.local"
+if [[ -f "$XDG_CONFIG_HOME/login.local.sh" ]]; then
+	. "$XDG_CONFIG_HOME/login.local.sh"
 fi
diff --git a/.config/symlinks b/.config/symlinks
index 01c8c4e..05d6631 100644
--- a/.config/symlinks
+++ b/.config/symlinks
@@ -1,5 +1,8 @@
 # target		link
 
+# Generic
+.config/login.sh	.profile
+
 # X11
 .config/X11/defaults	.Xdefaults
 .config/X11/clientrc	.xinitrc
diff --git a/.git.info.exclude.in b/.git.info.exclude.in
index 0c5ce40..2d09032 100644
--- a/.git.info.exclude.in
+++ b/.git.info.exclude.in
@@ -1,18 +1,17 @@
 # Defualt to ignoring all files
 /*
+# except these:
 
-# Except dotfiles
-!.*
+# The things I actually want to track
+!/.config
+!/.local*
 
-# Or Makefile
-!Makefile
+# The file that generates this one
+!/.git.info.exclude.in
 
-# Ignore these for privacy
-.ssh/*
-!.ssh/config
-.gnupg/*
-!.gnupg/gpg.conf
-.netrc
+# The relevent programs do not like symlinks for these:
+!/.gtkrc-2.0
+!/.gtkrc-2.0.mine
 
 # Ignore temp/log/history files
 *.log
@@ -46,49 +45,3 @@ lock
 *~
 .#*
 \#*#
-
-
-# Ignore these special-purpose cache/temp files
-.camel_certs
-.compiz/session/*
-.config/RecentDocuments/*
-.dbus/session-bus/*
-.ddd/sessions
-.esd_auth
-.evolution/.*
-.gconfd/saved_state
-.gnash-media
-.gnash/SharedObjects/*
-.lesshst
-.link*/*.his
-.local/share/Trash/*
-.local/share/gvfs-metadata/*
-.local/share/icons/*
-.local/share/recently-used.xbel
-.pki
-.pulse
-.pulse-cookie
-.recently-used
-.recently-used.xbel*
-.setroubleshoot
-.shotwell/thumbs/*
-.sudo_as_admin_successful
-.thumbnails/*
-.wireshark/recent*
-.xsession-errors*
-
-# Ignore files that are autogenerated
-.folders
-.git.info.exclude
-
-# Ignore these files for no good reason
-.bogofilter
-.gem
-.gitk
-.offlineimap
-.prefix
-.prefix.*
-.wine*
-
-# Ignore these files that if I tracked them, would be a separate repo
-.mozilla