diff options
| author |  Tom Willemsen | 2012-12-05 00:44:09 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-12-05 00:44:09 +0100 |
| commit | 6278e2e634b05027d31220afd328a9f7fe77c6f1 (patch) | |
| tree | 3dbec6a3880ca980694def0d737a477b68254691 /.config | |
| parent | fa717d86a07d009ab324a40cd8dbf539e61a9da3 (diff) | |
| parent | 15adc911da3f5b527c74b6bb67d677898d6a173e (diff) | |
| download | dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.tar.gz dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.config')
| -rw-r--r-- | .config/Makefile | 5 | ||||
| -rw-r--r-- | .config/awesome/Makefile | 5 | ||||
| -rw-r--r-- | .config/awesome/themes/Makefile | 4 | ||||
| -rw-r--r-- | .config/awesome/themes/custom/Makefile | 4 | ||||
| -rw-r--r-- | .config/clfswm/Makefile | 4 | ||||
| -rw-r--r-- | .config/cower/Makefile | 4 | ||||
| -rw-r--r-- | .config/dunst/Makefile | 4 | ||||
| -rw-r--r-- | .config/fehlstart/Makefile | 4 | ||||
| -rw-r--r-- | .config/fish/Makefile | 4 | ||||
| -rw-r--r-- | .config/herbstluftwm/Makefile | 4 | ||||
| -rw-r--r-- | .config/newsbeuter/Makefile | 4 | ||||
| -rw-r--r-- | .config/zathura/Makefile | 4 |
12 files changed, 50 insertions, 0 deletions
diff --git a/.config/Makefile b/.config/Makefile new file mode 100644 index 0000000..0d9939f --- /dev/null +++ b/.config/Makefile @@ -0,0 +1,5 @@ +DESTDIR:=$(DESTDIR)/.config +modules=awesome clfswm cower dunst fehlstart fish herbstluftwm \ + newsbeuter zathura + +include ../dotfiles.mk diff --git a/.config/awesome/Makefile b/.config/awesome/Makefile new file mode 100644 index 0000000..bec3818 --- /dev/null +++ b/.config/awesome/Makefile @@ -0,0 +1,5 @@ +DESTDIR:=$(DESTDIR)/awesome +modules=themes +objects=bowl.lua ext.lua infoline.lua keychain.lua oni.lua rc.lua + +include ../../dotfiles.mk diff --git a/.config/awesome/themes/Makefile b/.config/awesome/themes/Makefile new file mode 100644 index 0000000..85298f3 --- /dev/null +++ b/.config/awesome/themes/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/themes +modules=custom + +include ../../../dotfiles.mk diff --git a/.config/awesome/themes/custom/Makefile b/.config/awesome/themes/custom/Makefile new file mode 100644 index 0000000..8cebe3d --- /dev/null +++ b/.config/awesome/themes/custom/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/custom +objects=theme.lua + +include ../../../../dotfiles.mk diff --git a/.config/clfswm/Makefile b/.config/clfswm/Makefile new file mode 100644 index 0000000..d79241a --- /dev/null +++ b/.config/clfswm/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/clfswm +objects=clfswmrc + +include ../../dotfiles.mk diff --git a/.config/cower/Makefile b/.config/cower/Makefile new file mode 100644 index 0000000..8828ad3 --- /dev/null +++ b/.config/cower/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/cower +objects=config + +include ../../dotfiles.mk diff --git a/.config/dunst/Makefile b/.config/dunst/Makefile new file mode 100644 index 0000000..4f8a4e5 --- /dev/null +++ b/.config/dunst/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/dunst +objects=dunstrc + +include ../../dotfiles.mk diff --git a/.config/fehlstart/Makefile b/.config/fehlstart/Makefile new file mode 100644 index 0000000..303a9ca --- /dev/null +++ b/.config/fehlstart/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/fehlstart +objects=fehlstart.rc + +include ../../dotfiles.mk diff --git a/.config/fish/Makefile b/.config/fish/Makefile new file mode 100644 index 0000000..2b32c1b --- /dev/null +++ b/.config/fish/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/fish +objects=config.fish + +include ../../dotfiles.mk diff --git a/.config/herbstluftwm/Makefile b/.config/herbstluftwm/Makefile new file mode 100644 index 0000000..f875c23 --- /dev/null +++ b/.config/herbstluftwm/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/herbstluftwm +objects=autostart panel.sh + +include ../../dotfiles.mk diff --git a/.config/newsbeuter/Makefile b/.config/newsbeuter/Makefile new file mode 100644 index 0000000..fbf22de --- /dev/null +++ b/.config/newsbeuter/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/newsbeuter +objects=config urls + +include ../../dotfiles.mk diff --git a/.config/zathura/Makefile b/.config/zathura/Makefile new file mode 100644 index 0000000..c6c93c1 --- /dev/null +++ b/.config/zathura/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/zathura +objects=zathurarc + +include ../../dotfiles.mk |