New stow hierarchy

.config/Makefile

@@ -1,5 +0,0 @@
-SUBDIR=.config
-modules=awesome clfswm cower dunst fehlstart fish herbstluftwm \
-	newsbeuter zathura
-
-include ../dotfiles.mk

.config/awesome/Makefile

@@ -1,5 +0,0 @@
-SUBDIR=awesome
-modules=themes
-objects=bowl.lua ext.lua infoline.lua keychain.lua oni.lua rc.lua
-
-include ../../dotfiles.mk

.config/awesome/themes/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=themes
-modules=custom
-
-include ../../../dotfiles.mk

.config/awesome/themes/custom/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=custom
-objects=theme.lua
-
-include ../../../../dotfiles.mk

.config/clfswm/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=clfswm
-objects=clfswmrc
-
-include ../../dotfiles.mk

.config/cower/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=cower
-objects=config
-
-include ../../dotfiles.mk

.config/dunst/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=dunst
-objects=dunstrc
-
-include ../../dotfiles.mk

.config/fehlstart/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=fehlstart
-objects=fehlstart.rc
-
-include ../../dotfiles.mk

.config/fish/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=fish
-objects=config.fish
-
-include ../../dotfiles.mk

.config/herbstluftwm/Makefile

@@ -1,6 +0,0 @@
-SUBDIR=herbstluftwm
-objects=autostart panel.sh
-
-include ../../dotfiles.mk
-
-install-autostart: MODE=744

.config/newsbeuter/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=newsbeuter
-objects=config urls
-
-include ../../dotfiles.mk

.config/zathura/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=zathura
-objects=zathurarc
-
-include ../../dotfiles.mk

.conkerorrc/Makefile

@@ -1,5 +0,0 @@
-SUBDIR=.conkerorrc
-modules=themes styles
-objects=gtk2rc init.js ext_restore.js
-
-include ../dotfiles.mk

.conkerorrc/styles/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=styles
-objects=github.css help.css git-scm.css
-
-include ../../dotfiles.mk

.conkerorrc/themes/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=themes
-modules=naquadah yoshi
-
-include ../../dotfiles.mk

.conkerorrc/themes/naquadah/Makefile

@@ -1,5 +0,0 @@
-SUBDIR=naquadah
-objects=conkeror--scrollbars.css hints--url-panel.css minibuffer.css \
-	mode-line.css new-tabs.css tab-bar.css theme.json
-
-include ../../../dotfiles.mk

.conkerorrc/themes/yoshi/Makefile

@@ -1,5 +0,0 @@
-SUBDIR=yoshi
-objects=conkeror--scrollbars.css hints--url-panel.css minibuffer.css \
-	mode-line.css new-tabs.css tab-bar.css theme.json
-
-include ../../../dotfiles.mk

.gitignore

@@ -1 +0,0 @@
-Makefile.old

.gitmodules

@@ -1,3 +0,0 @@
-[submodule ".config/zsh/syntax-highlighting"]
-	path = .config/zsh/syntax-highlighting
-	url = git://github.com/zsh-users/zsh-syntax-highlighting

.local/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=.local
-modules=share
-
-include ../dotfiles.mk

.local/share/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=share
-modules=applications
-
-include ../../dotfiles.mk

.local/share/applications/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=applications
-objects=moc.desktop ncmpcpp.desktop poweroff.desktop reboot.desktop
-
-include ../../../dotfiles.mk

.moc/Makefile

@@ -1,5 +0,0 @@
-SUBDIR=.moc
-modules=themes
-objects=config
-
-include ../dotfiles.mk

.moc/themes/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=themes
-objects=custom
-
-include ../../dotfiles.mk

.mutt/Makefile

@@ -1,6 +0,0 @@
-SUBDIR=.mutt
-objects=aethon.muttrc arch.muttrc colors.muttrc gmail.muttrc \
-	iactor.muttrc macros mailcap muttrc ninthfloor.muttrc \
-	ryuslash.org.muttrc sig
-
-include ../dotfiles.mk

.ncmpcpp/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=.ncmpcpp
-objects=config
-
-include ../dotfiles.mk

.pentadactyl/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=.pentadactyl
-modules=plugins
-
-include ../dotfiles.mk

.pentadactyl/plugins/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=plugins
-objects=emacs.penta
-
-include ../../dotfiles.mk

.sawfish/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=.sawfish
-objects=rc
-
-include ../dotfiles.mk

.ssh/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=.ssh
-objects=config
-
-include ../dotfiles.mk

.w3m/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=.w3m
-objects=config
-
-include ../dotfiles.mk

.weechat/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=.weechat
-objects=alias.conf irc.conf weechat.conf
-
-include ../dotfiles.mk

.zsh/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=.zsh
-modules=functions
-
-include ../dotfiles.mk

.zsh/functions/Makefile

@@ -1,4 +0,0 @@
-SUBDIR=functions
-objects=env venv add-to-list
-
-include ../../dotfiles.mk

.zsh/syntax-highlighting

@@ -1 +0,0 @@
-Subproject commit d2715e2cb3294880bbc6a75b91288243054218d0

Makefile

@@ -1,13 +0,0 @@
-export DESTDIR:=$(HOME)
-modules=.config .conkerorrc .local .moc .ncmpcpp .sawfish .ssh \
-	.w3m .zsh sbcl
-objects=.bash_profile .beetsconfig .gitconfig .guile .hgrc \
-	.offlineimap.py .offlineimaprc .screenrc .stumpwmrc .urlview \
-	.Xdefaults .xinitrc .Xmodmap .xsession .zprofile .zshrc .zile
-
-export MAKEROOT=y
-
-include dotfiles.mk
-
-install-.xinitrc: MODE=744
-install-.xsession: MODE=744

dotfiles.mk

@@ -1,135 +0,0 @@
-LOAD_PATH=. /usr/share/emacs/site-lisp $(HOME)/.emacs.d/site-lisp
-EMACS=emacs $(addprefix -L ,$(LOAD_PATH))
-MODE=644
-
-ifeq ($(shell if [ "`tput colors`" -gt 0 ]; then echo -n "y"; fi),y)
-FG_BLU=\033[0;34m
-FG_YEL=\033[0;33m
-FG_GRE=\033[0;32m
-FG_RED=\033[0;31m
-CLR_RE=\033[0;00m
-else
-FG_BLU=
-FG_YEL=
-FG_GRE=
-FG_RED=
-CLR_RE=
-endif
-
-compile = $(EMACS) -Q -batch -eval "(byte-compile-file \"$(1)\")"
-define newer =
-$(shell if [ "$(1)" -nt "$(DESTDIR)/$(1)" ]; then echo "newer"; fi)
-endef
-define older =
-$(shell if [ "$(1)" -ot "$(DESTDIR)/$(1)" ]; then echo "older"; fi)
-endef
-
-check-objects=$(addprefix check-,$(objects))
-install-objects=$(addprefix install-,$(objects))
-reverse-objects=$(addprefix reverse-,$(objects))
-cleanup-objects=$(addprefix cleanup-,$(objects))
-uninstall-objects=$(addprefix uninstall-,$(objects))
-
-check-modules=$(addprefix check-,$(modules))
-install-modules=$(addprefix install-,$(modules))
-reverse-modules=$(addprefix reverse-,$(modules))
-cleanup-modules=$(addprefix cleanup-,$(modules))
-uninstall-modules=$(addprefix uninstall-,$(modules))
-
-.PHONY: all install cleanup check cleanup $(modules) \
-	$(install-objects) $(cleanup-objects) $(check-objects) \
-	$(install-modules) $(cleanup-modules) $(check-modules) \
-	$(reverse) $(reverse-objects) $(reverse-modules) \
-	$(uninstall-objects) $(uninstall-modules)
-all: $(modules) $(objects)
-
-ifeq ($(MAKEROOT),y)
-check: $(check-modules) $(check-objects)
-install: cleanup $(install-modules) $(install-objects) Makefile.old
-reverse: $(reverse-modules) $(reverse-objects)
-uninstall: $(uninstall-modules) $(uninstall-objects)
-	@rmdir --ignore-fail-on-non-empty $(DESTDIR) 2> /dev/null || true
-ifeq ($(firstword $(MAKEFILE_LIST)),Makefile.old)
-cleanup: $(cleanup-modules) $(cleanup-objects)
-	@rmdir --ignore-fail-on-non-empty $(DESTDIR) 2> /dev/null || true
-else
-cleanup: export NEWOBJS = $(objects)
-cleanup: export NEWMODS = $(modules)
-cleanup:
-	@$(MAKE) -s -f Makefile.old cleanup
-
-Makefile.old: $(firstword $(MAKEFILE_LIST))
-	@cp "$^" "$@"
-
-ifdef SUBDIR
-DESTDIR:=$(DESTDIR)/$(SUBDIR)
-endif
-endif
-else
-check:
-	@$(MAKE) -s -C ../ check
-install:
-	@$(MAKE) -s -C ../ install
-reverse:
-	@$(MAKE) -s -C ../ reverse
-cleanup:
-	@$(MAKE) -s -C ../ cleanup
-uninstall:
-	@$(MAKE) -s -C ../ uninstall
-endif
-
-$(modules): %:
-	$(MAKE) -C $*
-
-$(install-objects): install-%: %
-	@$(if $(call newer,$*), \
-		echo -e "$(FG_GRE)+ $(FG_YEL)$(MKDPREFIX)$* $(CLR_RE)to $(DESTDIR) as $(MODE)"; \
-		install -pDm $(MODE) "$*" "$(DESTDIR)/$*", \
-		$(if $(call older,$*) ,\
-			echo -e "$(FG_RED)- $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"))
-
-$(install-modules): install-%:
-	@$(MAKE) -s -C $* install MKDPREFIX=$(MKDPREFIX)$*/
-
-$(reverse-objects): reverse-%:
-	@$(if $(call older,$*), \
-		echo -e "$(FG_GRE)+ $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"; \
-		cp -a "$(DESTDIR)/$*" "$*", \
-		echo -e "$(FG_RED)- $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)")
-
-$(reverse-modules): reverse-%:
-	@$(MAKE) -s -C $* reverse MKDPREFIX=$(MKDPREFIX)$*/
-
-$(cleanup-objects): cleanup-%:
-	@$(if $(findstring $*,$(NEWOBJS)),, \
-		@$(if $(call older,$*), \
-	 		echo -e "$(FG_RED)+ $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)", \
-			echo -e "$(FG_GRE)- $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"; \
-			unlink "$(DESTDIR)/$*" || true))
-
-$(cleanup-modules): cleanup-%:
-	@$(if $(findstring $*,$(NEWMODS)), \
-		@$(MAKE) -C $* cleanup MKDPREFIX=$(MKDPREFIX)$*/, \
-		@$(MAKE) -C $* uninstall MKDPREFIX=$(MKDPREFIX)$*/)
-
-$(check-objects): check-%:
-	@$(if $(call newer,$*), \
-		echo -e "$(FG_GRE)+ $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)", \
-		$(if $(call older,$*), \
-			echo -e "$(FG_RED)- $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)", \
-			echo -e "$(FG_BLU)= $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"))
-
-$(check-modules): check-%:
-	@$(MAKE) -s -C $* check MKDPREFIX=$(MKDPREFIX)$*/
-
-$(uninstall-objects): uninstall-%:
-	@$(if $(call older,$*), \
-		echo -e "$(FG_RED)+ $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)", \
-		echo -e "$(FG_GRE)- $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"; \
-		unlink "$(DESTDIR)/$*" || true)
-
-$(uninstall-modules): uninstall-%:
-	@$(MAKE) -s -C $* uninstall MKDPREFIX=$(MKDPREFIX)$*/
-
-$(filter %.elc,$(objects)): %.elc: %.el
-	$(call compile,$^)

dotfiles2.mk

@@ -1,17 +0,0 @@
-DESTDIR?=$(HOME)
-DESTDIR:=$(DESTDIR)/$(SUBDIR)
-
-RSYNC=rsync
-RFLAGS=--links --perms --times --group --owner --dirs --verbose \
-	--update --delete --exclude=Makefile --exclude=.gitignore \
-	$(addprefix --exclude=,$(EXCLUDE))
-
-install-modules=$(addprefix install-,$(MODULES))
-
-install: $(install-modules)
-	@echo "Syncing $(CURDIR)/ with $(DESTDIR)"
-	@$(RSYNC) $(RFLAGS) $(CURDIR)/ $(DESTDIR)
-	@echo
-
-$(install-modules): install-%:
-	@DESTDIR=$(DESTDIR) $(MAKE) -s -C $* install