summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/Makefile5
-rw-r--r--.config/awesome/Makefile5
-rw-r--r--.config/awesome/themes/Makefile4
-rw-r--r--.config/awesome/themes/custom/Makefile4
-rw-r--r--.config/clfswm/Makefile4
-rw-r--r--.config/cower/Makefile4
-rw-r--r--.config/dunst/Makefile4
-rw-r--r--.config/fehlstart/Makefile4
-rw-r--r--.config/fish/Makefile4
-rw-r--r--.config/herbstluftwm/Makefile6
-rw-r--r--.config/newsbeuter/Makefile4
-rw-r--r--.config/zathura/Makefile4
-rw-r--r--.conkerorrc/Makefile5
-rw-r--r--.conkerorrc/styles/Makefile4
-rw-r--r--.conkerorrc/themes/Makefile4
-rw-r--r--.conkerorrc/themes/naquadah/Makefile5
-rw-r--r--.conkerorrc/themes/yoshi/Makefile5
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules3
-rw-r--r--.local/Makefile4
-rw-r--r--.local/share/Makefile4
-rw-r--r--.local/share/applications/Makefile4
-rw-r--r--.moc/Makefile5
-rw-r--r--.moc/themes/Makefile4
-rw-r--r--.mutt/Makefile6
-rw-r--r--.ncmpcpp/Makefile4
-rw-r--r--.pentadactyl/Makefile4
-rw-r--r--.pentadactyl/plugins/Makefile4
-rw-r--r--.sawfish/Makefile4
-rw-r--r--.ssh/Makefile4
-rw-r--r--.w3m/Makefile4
-rw-r--r--.weechat/Makefile4
-rw-r--r--.zsh/Makefile4
-rw-r--r--.zsh/functions/Makefile4
m---------.zsh/syntax-highlighting0
-rw-r--r--Makefile13
-rw-r--r--awesome/.config/awesome/bowl.lua (renamed from .config/awesome/bowl.lua)0
-rw-r--r--awesome/.config/awesome/ext.lua (renamed from .config/awesome/ext.lua)0
-rw-r--r--awesome/.config/awesome/infoline.lua (renamed from .config/awesome/infoline.lua)0
-rw-r--r--awesome/.config/awesome/keychain.lua (renamed from .config/awesome/keychain.lua)0
-rw-r--r--awesome/.config/awesome/oni.lua (renamed from .config/awesome/oni.lua)0
-rw-r--r--awesome/.config/awesome/rc.lua (renamed from .config/awesome/rc.lua)0
-rw-r--r--awesome/.config/awesome/themes/custom/README (renamed from .config/awesome/themes/custom/README)0
-rw-r--r--awesome/.config/awesome/themes/custom/theme.lua (renamed from .config/awesome/themes/custom/theme.lua)0
-rw-r--r--beets/.beetsconfig (renamed from .beetsconfig)0
-rw-r--r--clfswm/.config/clfswm/clfswmrc (renamed from .config/clfswm/clfswmrc)0
-rw-r--r--conkeror/.conkerorrc/ext_restore.js (renamed from .conkerorrc/ext_restore.js)0
-rw-r--r--conkeror/.conkerorrc/gtk2rc (renamed from .conkerorrc/gtk2rc)0
-rw-r--r--conkeror/.conkerorrc/init.js (renamed from .conkerorrc/init.js)0
-rw-r--r--conkeror/.conkerorrc/styles/.gitignore (renamed from .conkerorrc/styles/.gitignore)0
-rw-r--r--conkeror/.conkerorrc/styles/base.less (renamed from .conkerorrc/styles/base.less)0
-rw-r--r--conkeror/.conkerorrc/styles/git-scm.less (renamed from .conkerorrc/styles/git-scm.less)0
-rw-r--r--conkeror/.conkerorrc/styles/github.css (renamed from .conkerorrc/styles/github.css)0
-rw-r--r--conkeror/.conkerorrc/styles/help.less (renamed from .conkerorrc/styles/help.less)0
-rw-r--r--conkeror/.conkerorrc/styles/tango.less (renamed from .conkerorrc/styles/tango.less)0
-rw-r--r--conkeror/.conkerorrc/styles/yoshi.less (renamed from .conkerorrc/styles/yoshi.less)0
-rw-r--r--conkeror/.conkerorrc/themes/naquadah/conkeror--scrollbars.css (renamed from .conkerorrc/themes/naquadah/conkeror--scrollbars.css)0
-rw-r--r--conkeror/.conkerorrc/themes/naquadah/hints--url-panel.css (renamed from .conkerorrc/themes/naquadah/hints--url-panel.css)0
-rw-r--r--conkeror/.conkerorrc/themes/naquadah/minibuffer.css (renamed from .conkerorrc/themes/naquadah/minibuffer.css)0
-rw-r--r--conkeror/.conkerorrc/themes/naquadah/mode-line.css (renamed from .conkerorrc/themes/naquadah/mode-line.css)0
-rw-r--r--conkeror/.conkerorrc/themes/naquadah/new-tabs.css (renamed from .conkerorrc/themes/naquadah/new-tabs.css)0
-rw-r--r--conkeror/.conkerorrc/themes/naquadah/tab-bar.css (renamed from .conkerorrc/themes/naquadah/tab-bar.css)0
-rw-r--r--conkeror/.conkerorrc/themes/naquadah/theme.json (renamed from .conkerorrc/themes/naquadah/theme.json)0
-rw-r--r--conkeror/.conkerorrc/themes/yoshi/conkeror--scrollbars.css (renamed from .conkerorrc/themes/yoshi/conkeror--scrollbars.css)0
-rw-r--r--conkeror/.conkerorrc/themes/yoshi/hints--url-panel.css (renamed from .conkerorrc/themes/yoshi/hints--url-panel.css)0
-rw-r--r--conkeror/.conkerorrc/themes/yoshi/minibuffer.css (renamed from .conkerorrc/themes/yoshi/minibuffer.css)0
-rw-r--r--conkeror/.conkerorrc/themes/yoshi/mode-line.css (renamed from .conkerorrc/themes/yoshi/mode-line.css)0
-rw-r--r--conkeror/.conkerorrc/themes/yoshi/new-tabs.css (renamed from .conkerorrc/themes/yoshi/new-tabs.css)0
-rw-r--r--conkeror/.conkerorrc/themes/yoshi/tab-bar.css (renamed from .conkerorrc/themes/yoshi/tab-bar.css)0
-rw-r--r--conkeror/.conkerorrc/themes/yoshi/theme.json (renamed from .conkerorrc/themes/yoshi/theme.json)0
-rw-r--r--conky/.conky_box.lua (renamed from .conky_box.lua)0
-rw-r--r--conky/.conkyrc (renamed from .conkyrc)0
-rw-r--r--cower/.config/cower/config (renamed from .config/cower/config)0
-rw-r--r--dotfiles.mk135
-rw-r--r--dotfiles2.mk17
-rw-r--r--dunst/.config/dunst/dunstrc (renamed from .config/dunst/dunstrc)0
-rw-r--r--fehlstart/.config/fehlstart/fehlstart.rc (renamed from .config/fehlstart/fehlstart.rc)0
-rw-r--r--fehlstart/.local/share/applications/moc.desktop (renamed from .local/share/applications/moc.desktop)0
-rw-r--r--fehlstart/.local/share/applications/ncmpcpp.desktop (renamed from .local/share/applications/ncmpcpp.desktop)0
-rw-r--r--fehlstart/.local/share/applications/poweroff.desktop (renamed from .local/share/applications/poweroff.desktop)0
-rw-r--r--fehlstart/.local/share/applications/reboot.desktop (renamed from .local/share/applications/reboot.desktop)0
-rw-r--r--fish/.config/fish/config.fish (renamed from .config/fish/config.fish)0
-rw-r--r--fontconfig/.config/fontconfig/fonts.conf (renamed from .config/fontconfig/fonts.conf)0
-rw-r--r--git/.gitconfig (renamed from .gitconfig)0
-rw-r--r--guile/.guile (renamed from .guile)0
-rwxr-xr-xherbstluftwm/.config/herbstluftwm/autostart (renamed from .config/herbstluftwm/autostart)0
-rwxr-xr-xherbstluftwm/.config/herbstluftwm/panel.sh (renamed from .config/herbstluftwm/panel.sh)0
-rw-r--r--mercurial/.hgrc (renamed from .hgrc)0
-rw-r--r--moc/.moc/.gitignore (renamed from .moc/.gitignore)0
-rw-r--r--moc/.moc/config (renamed from .moc/config)0
-rw-r--r--moc/.moc/themes/custom (renamed from .moc/themes/custom)0
-rw-r--r--mutt/.mutt/.gitignore (renamed from .mutt/.gitignore)0
-rw-r--r--mutt/.mutt/aethon.muttrc (renamed from .mutt/aethon.muttrc)0
-rw-r--r--mutt/.mutt/arch.muttrc (renamed from .mutt/arch.muttrc)0
-rw-r--r--mutt/.mutt/colors.muttrc (renamed from .mutt/colors.muttrc)0
-rw-r--r--mutt/.mutt/gmail.muttrc (renamed from .mutt/gmail.muttrc)0
-rw-r--r--mutt/.mutt/iactor.muttrc (renamed from .mutt/iactor.muttrc)0
-rw-r--r--mutt/.mutt/macros (renamed from .mutt/macros)0
-rw-r--r--mutt/.mutt/mailcap (renamed from .mutt/mailcap)0
-rw-r--r--mutt/.mutt/muttrc (renamed from .mutt/muttrc)0
-rw-r--r--mutt/.mutt/ninthfloor.muttrc (renamed from .mutt/ninthfloor.muttrc)0
-rw-r--r--mutt/.mutt/ryuslash.org.muttrc (renamed from .mutt/ryuslash.org.muttrc)0
-rw-r--r--mutt/.mutt/sig (renamed from .mutt/sig)0
-rw-r--r--mutt/.urlview (renamed from .urlview)0
-rw-r--r--ncmpcpp/.ncmpcpp/config (renamed from .ncmpcpp/config)0
-rw-r--r--newsbeuter/.config/newsbeuter/.gitignore (renamed from .config/newsbeuter/.gitignore)0
-rw-r--r--newsbeuter/.config/newsbeuter/config (renamed from .config/newsbeuter/config)0
-rw-r--r--newsbeuter/.config/newsbeuter/urls (renamed from .config/newsbeuter/urls)0
-rw-r--r--notion/.notion/cfg_notion.lua (renamed from notion/cfg_notion.lua)0
-rw-r--r--notion/.notion/cfg_notioncore.lua (renamed from notion/cfg_notioncore.lua)0
-rw-r--r--notion/Makefile6
-rw-r--r--offlineimap/.offlineimap.py (renamed from .offlineimap.py)0
-rw-r--r--offlineimap/.offlineimaprc (renamed from .offlineimaprc)0
-rw-r--r--pentadactil/.pentadactyl/plugins/emacs.penta (renamed from .pentadactyl/plugins/emacs.penta)0
-rw-r--r--sawfish/.sawfish/rc (renamed from .sawfish/rc)0
-rw-r--r--sbcl/Makefile8
-rw-r--r--screen/.screenrc (renamed from .screenrc)0
-rw-r--r--scwm/.scwmrc (renamed from .scwmrc)0
-rw-r--r--slrn/.slrnrc (renamed from .slrnrc)0
-rw-r--r--ssh/.ssh/.gitignore (renamed from .ssh/.gitignore)0
-rw-r--r--ssh/.ssh/config (renamed from .ssh/config)0
-rw-r--r--stumpwm/.stumpwmrc (renamed from .stumpwmrc)0
-rw-r--r--tmux/.tmux.conf (renamed from .tmux.conf)0
-rw-r--r--w3m/.w3m/.gitignore (renamed from .w3m/.gitignore)0
-rw-r--r--w3m/.w3m/config (renamed from .w3m/config)0
-rw-r--r--weechat/.weechat/alias.conf (renamed from .weechat/alias.conf)0
-rw-r--r--weechat/.weechat/irc.conf (renamed from .weechat/irc.conf)0
-rw-r--r--weechat/.weechat/weechat.conf (renamed from .weechat/weechat.conf)0
-rw-r--r--x11/.Xdefaults (renamed from .Xdefaults)0
-rw-r--r--x11/.Xmodmap (renamed from .Xmodmap)0
-rwxr-xr-xx11/.xinitrc (renamed from .xinitrc)0
-rwxr-xr-xx11/.xsession (renamed from .xsession)0
-rw-r--r--xbindkeys/.xbindkeysrc.scm (renamed from .xbindkeysrc.scm)0
-rw-r--r--xmonad/.xmonad/.gitignore (renamed from xmonad/.gitignore)0
-rw-r--r--xmonad/.xmonad/xmonad.hs (renamed from xmonad/xmonad.hs)0
-rw-r--r--xmonad/Makefile10
-rw-r--r--zathura/.config/zathura/zathurarc (renamed from .config/zathura/zathurarc)0
-rw-r--r--zile/.zile (renamed from .zile)0
l---------zsh/.bash_profile (renamed from .bash_profile)0
-rw-r--r--zsh/.zprofile (renamed from .zprofile)0
-rw-r--r--zsh/.zsh/.gitignore (renamed from .zsh/.gitignore)0
-rw-r--r--zsh/.zsh/functions/add-to-list (renamed from .zsh/functions/add-to-list)0
-rw-r--r--zsh/.zsh/functions/env (renamed from .zsh/functions/env)0
-rw-r--r--zsh/.zsh/functions/venv (renamed from .zsh/functions/venv)0
-rw-r--r--zsh/.zshrc (renamed from .zshrc)0
145 files changed, 0 insertions, 331 deletions
diff --git a/.config/Makefile b/.config/Makefile
deleted file mode 100644
index 3407f57..0000000
--- a/.config/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIR=.config
-modules=awesome clfswm cower dunst fehlstart fish herbstluftwm \
- newsbeuter zathura
-
-include ../dotfiles.mk
diff --git a/.config/awesome/Makefile b/.config/awesome/Makefile
deleted file mode 100644
index 071a7ad..0000000
--- a/.config/awesome/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIR=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
deleted file mode 100644
index 2c32a7e..0000000
--- a/.config/awesome/themes/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=themes
-modules=custom
-
-include ../../../dotfiles.mk
diff --git a/.config/awesome/themes/custom/Makefile b/.config/awesome/themes/custom/Makefile
deleted file mode 100644
index c5e3982..0000000
--- a/.config/awesome/themes/custom/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=custom
-objects=theme.lua
-
-include ../../../../dotfiles.mk
diff --git a/.config/clfswm/Makefile b/.config/clfswm/Makefile
deleted file mode 100644
index 974bea3..0000000
--- a/.config/clfswm/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=clfswm
-objects=clfswmrc
-
-include ../../dotfiles.mk
diff --git a/.config/cower/Makefile b/.config/cower/Makefile
deleted file mode 100644
index c7765dc..0000000
--- a/.config/cower/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=cower
-objects=config
-
-include ../../dotfiles.mk
diff --git a/.config/dunst/Makefile b/.config/dunst/Makefile
deleted file mode 100644
index 6076e74..0000000
--- a/.config/dunst/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=dunst
-objects=dunstrc
-
-include ../../dotfiles.mk
diff --git a/.config/fehlstart/Makefile b/.config/fehlstart/Makefile
deleted file mode 100644
index 0c6998d..0000000
--- a/.config/fehlstart/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=fehlstart
-objects=fehlstart.rc
-
-include ../../dotfiles.mk
diff --git a/.config/fish/Makefile b/.config/fish/Makefile
deleted file mode 100644
index cdce7a6..0000000
--- a/.config/fish/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=fish
-objects=config.fish
-
-include ../../dotfiles.mk
diff --git a/.config/herbstluftwm/Makefile b/.config/herbstluftwm/Makefile
deleted file mode 100644
index e8f232f..0000000
--- a/.config/herbstluftwm/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIR=herbstluftwm
-objects=autostart panel.sh
-
-include ../../dotfiles.mk
-
-install-autostart: MODE=744
diff --git a/.config/newsbeuter/Makefile b/.config/newsbeuter/Makefile
deleted file mode 100644
index df228e9..0000000
--- a/.config/newsbeuter/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=newsbeuter
-objects=config urls
-
-include ../../dotfiles.mk
diff --git a/.config/zathura/Makefile b/.config/zathura/Makefile
deleted file mode 100644
index b076c74..0000000
--- a/.config/zathura/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=zathura
-objects=zathurarc
-
-include ../../dotfiles.mk
diff --git a/.conkerorrc/Makefile b/.conkerorrc/Makefile
deleted file mode 100644
index be7ee27..0000000
--- a/.conkerorrc/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIR=.conkerorrc
-modules=themes styles
-objects=gtk2rc init.js ext_restore.js
-
-include ../dotfiles.mk
diff --git a/.conkerorrc/styles/Makefile b/.conkerorrc/styles/Makefile
deleted file mode 100644
index 8057419..0000000
--- a/.conkerorrc/styles/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=styles
-objects=github.css help.css git-scm.css
-
-include ../../dotfiles.mk
diff --git a/.conkerorrc/themes/Makefile b/.conkerorrc/themes/Makefile
deleted file mode 100644
index 6e95dc4..0000000
--- a/.conkerorrc/themes/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=themes
-modules=naquadah yoshi
-
-include ../../dotfiles.mk
diff --git a/.conkerorrc/themes/naquadah/Makefile b/.conkerorrc/themes/naquadah/Makefile
deleted file mode 100644
index 6a1634a..0000000
--- a/.conkerorrc/themes/naquadah/Makefile
+++ /dev/null
@@ -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
diff --git a/.conkerorrc/themes/yoshi/Makefile b/.conkerorrc/themes/yoshi/Makefile
deleted file mode 100644
index 1c5bb94..0000000
--- a/.conkerorrc/themes/yoshi/Makefile
+++ /dev/null
@@ -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
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 6dc3062..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.old
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e368c11..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule ".config/zsh/syntax-highlighting"]
- path = .config/zsh/syntax-highlighting
- url = git://github.com/zsh-users/zsh-syntax-highlighting
diff --git a/.local/Makefile b/.local/Makefile
deleted file mode 100644
index a473a83..0000000
--- a/.local/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.local
-modules=share
-
-include ../dotfiles.mk
diff --git a/.local/share/Makefile b/.local/share/Makefile
deleted file mode 100644
index da723ff..0000000
--- a/.local/share/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=share
-modules=applications
-
-include ../../dotfiles.mk
diff --git a/.local/share/applications/Makefile b/.local/share/applications/Makefile
deleted file mode 100644
index 4fb9a44..0000000
--- a/.local/share/applications/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=applications
-objects=moc.desktop ncmpcpp.desktop poweroff.desktop reboot.desktop
-
-include ../../../dotfiles.mk
diff --git a/.moc/Makefile b/.moc/Makefile
deleted file mode 100644
index ec1b2b7..0000000
--- a/.moc/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIR=.moc
-modules=themes
-objects=config
-
-include ../dotfiles.mk
diff --git a/.moc/themes/Makefile b/.moc/themes/Makefile
deleted file mode 100644
index 77c8f1f..0000000
--- a/.moc/themes/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=themes
-objects=custom
-
-include ../../dotfiles.mk
diff --git a/.mutt/Makefile b/.mutt/Makefile
deleted file mode 100644
index ba059f1..0000000
--- a/.mutt/Makefile
+++ /dev/null
@@ -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
diff --git a/.ncmpcpp/Makefile b/.ncmpcpp/Makefile
deleted file mode 100644
index 059c96b..0000000
--- a/.ncmpcpp/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.ncmpcpp
-objects=config
-
-include ../dotfiles.mk
diff --git a/.pentadactyl/Makefile b/.pentadactyl/Makefile
deleted file mode 100644
index 6c3ac5c..0000000
--- a/.pentadactyl/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.pentadactyl
-modules=plugins
-
-include ../dotfiles.mk
diff --git a/.pentadactyl/plugins/Makefile b/.pentadactyl/plugins/Makefile
deleted file mode 100644
index badaa01..0000000
--- a/.pentadactyl/plugins/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=plugins
-objects=emacs.penta
-
-include ../../dotfiles.mk
diff --git a/.sawfish/Makefile b/.sawfish/Makefile
deleted file mode 100644
index 842bb1a..0000000
--- a/.sawfish/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.sawfish
-objects=rc
-
-include ../dotfiles.mk
diff --git a/.ssh/Makefile b/.ssh/Makefile
deleted file mode 100644
index b805834..0000000
--- a/.ssh/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.ssh
-objects=config
-
-include ../dotfiles.mk
diff --git a/.w3m/Makefile b/.w3m/Makefile
deleted file mode 100644
index ba96315..0000000
--- a/.w3m/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.w3m
-objects=config
-
-include ../dotfiles.mk
diff --git a/.weechat/Makefile b/.weechat/Makefile
deleted file mode 100644
index 6f81768..0000000
--- a/.weechat/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.weechat
-objects=alias.conf irc.conf weechat.conf
-
-include ../dotfiles.mk
diff --git a/.zsh/Makefile b/.zsh/Makefile
deleted file mode 100644
index acd5e4e..0000000
--- a/.zsh/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.zsh
-modules=functions
-
-include ../dotfiles.mk
diff --git a/.zsh/functions/Makefile b/.zsh/functions/Makefile
deleted file mode 100644
index f71df23..0000000
--- a/.zsh/functions/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=functions
-objects=env venv add-to-list
-
-include ../../dotfiles.mk
diff --git a/.zsh/syntax-highlighting b/.zsh/syntax-highlighting
deleted file mode 160000
-Subproject d2715e2cb3294880bbc6a75b91288243054218d
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7b8c8ce..0000000
--- a/Makefile
+++ /dev/null
@@ -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
diff --git a/.config/awesome/bowl.lua b/awesome/.config/awesome/bowl.lua
index bf6af7b..bf6af7b 100644
--- a/.config/awesome/bowl.lua
+++ b/awesome/.config/awesome/bowl.lua
diff --git a/.config/awesome/ext.lua b/awesome/.config/awesome/ext.lua
index e7bdf00..e7bdf00 100644
--- a/.config/awesome/ext.lua
+++ b/awesome/.config/awesome/ext.lua
diff --git a/.config/awesome/infoline.lua b/awesome/.config/awesome/infoline.lua
index 2b8e00c..2b8e00c 100644
--- a/.config/awesome/infoline.lua
+++ b/awesome/.config/awesome/infoline.lua
diff --git a/.config/awesome/keychain.lua b/awesome/.config/awesome/keychain.lua
index 86ce7b2..86ce7b2 100644
--- a/.config/awesome/keychain.lua
+++ b/awesome/.config/awesome/keychain.lua
diff --git a/.config/awesome/oni.lua b/awesome/.config/awesome/oni.lua
index 7cc5df1..7cc5df1 100644
--- a/.config/awesome/oni.lua
+++ b/awesome/.config/awesome/oni.lua
diff --git a/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 745721d..745721d 100644
--- a/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
diff --git a/.config/awesome/themes/custom/README b/awesome/.config/awesome/themes/custom/README
index 1ddb349..1ddb349 100644
--- a/.config/awesome/themes/custom/README
+++ b/awesome/.config/awesome/themes/custom/README
diff --git a/.config/awesome/themes/custom/theme.lua b/awesome/.config/awesome/themes/custom/theme.lua
index c65edc8..c65edc8 100644
--- a/.config/awesome/themes/custom/theme.lua
+++ b/awesome/.config/awesome/themes/custom/theme.lua
diff --git a/.beetsconfig b/beets/.beetsconfig
index 3a9a192..3a9a192 100644
--- a/.beetsconfig
+++ b/beets/.beetsconfig
diff --git a/.config/clfswm/clfswmrc b/clfswm/.config/clfswm/clfswmrc
index f69623e..f69623e 100644
--- a/.config/clfswm/clfswmrc
+++ b/clfswm/.config/clfswm/clfswmrc
diff --git a/.conkerorrc/ext_restore.js b/conkeror/.conkerorrc/ext_restore.js
index 39b125e..39b125e 100644
--- a/.conkerorrc/ext_restore.js
+++ b/conkeror/.conkerorrc/ext_restore.js
diff --git a/.conkerorrc/gtk2rc b/conkeror/.conkerorrc/gtk2rc
index fd511e5..fd511e5 100644
--- a/.conkerorrc/gtk2rc
+++ b/conkeror/.conkerorrc/gtk2rc
diff --git a/.conkerorrc/init.js b/conkeror/.conkerorrc/init.js
index 520ef04..520ef04 100644
--- a/.conkerorrc/init.js
+++ b/conkeror/.conkerorrc/init.js
diff --git a/.conkerorrc/styles/.gitignore b/conkeror/.conkerorrc/styles/.gitignore
index 8b13789..8b13789 100644
--- a/.conkerorrc/styles/.gitignore
+++ b/conkeror/.conkerorrc/styles/.gitignore
diff --git a/.conkerorrc/styles/base.less b/conkeror/.conkerorrc/styles/base.less
index 410efe2..410efe2 100644
--- a/.conkerorrc/styles/base.less
+++ b/conkeror/.conkerorrc/styles/base.less
diff --git a/.conkerorrc/styles/git-scm.less b/conkeror/.conkerorrc/styles/git-scm.less
index d69a97d..d69a97d 100644
--- a/.conkerorrc/styles/git-scm.less
+++ b/conkeror/.conkerorrc/styles/git-scm.less
diff --git a/.conkerorrc/styles/github.css b/conkeror/.conkerorrc/styles/github.css
index 961ba4f..961ba4f 100644
--- a/.conkerorrc/styles/github.css
+++ b/conkeror/.conkerorrc/styles/github.css
diff --git a/.conkerorrc/styles/help.less b/conkeror/.conkerorrc/styles/help.less
index 339d7fa..339d7fa 100644
--- a/.conkerorrc/styles/help.less
+++ b/conkeror/.conkerorrc/styles/help.less
diff --git a/.conkerorrc/styles/tango.less b/conkeror/.conkerorrc/styles/tango.less
index ed6858b..ed6858b 100644
--- a/.conkerorrc/styles/tango.less
+++ b/conkeror/.conkerorrc/styles/tango.less
diff --git a/.conkerorrc/styles/yoshi.less b/conkeror/.conkerorrc/styles/yoshi.less
index 5fdac7e..5fdac7e 100644
--- a/.conkerorrc/styles/yoshi.less
+++ b/conkeror/.conkerorrc/styles/yoshi.less
diff --git a/.conkerorrc/themes/naquadah/conkeror--scrollbars.css b/conkeror/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
index 0f70e96..0f70e96 100644
--- a/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
+++ b/conkeror/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
diff --git a/.conkerorrc/themes/naquadah/hints--url-panel.css b/conkeror/.conkerorrc/themes/naquadah/hints--url-panel.css
index 143f3c1..143f3c1 100644
--- a/.conkerorrc/themes/naquadah/hints--url-panel.css
+++ b/conkeror/.conkerorrc/themes/naquadah/hints--url-panel.css
diff --git a/.conkerorrc/themes/naquadah/minibuffer.css b/conkeror/.conkerorrc/themes/naquadah/minibuffer.css
index c882f3e..c882f3e 100644
--- a/.conkerorrc/themes/naquadah/minibuffer.css
+++ b/conkeror/.conkerorrc/themes/naquadah/minibuffer.css
diff --git a/.conkerorrc/themes/naquadah/mode-line.css b/conkeror/.conkerorrc/themes/naquadah/mode-line.css
index 7e1ed45..7e1ed45 100644
--- a/.conkerorrc/themes/naquadah/mode-line.css
+++ b/conkeror/.conkerorrc/themes/naquadah/mode-line.css
diff --git a/.conkerorrc/themes/naquadah/new-tabs.css b/conkeror/.conkerorrc/themes/naquadah/new-tabs.css
index f5d30c0..f5d30c0 100644
--- a/.conkerorrc/themes/naquadah/new-tabs.css
+++ b/conkeror/.conkerorrc/themes/naquadah/new-tabs.css
diff --git a/.conkerorrc/themes/naquadah/tab-bar.css b/conkeror/.conkerorrc/themes/naquadah/tab-bar.css
index c451778..c451778 100644
--- a/.conkerorrc/themes/naquadah/tab-bar.css
+++ b/conkeror/.conkerorrc/themes/naquadah/tab-bar.css
diff --git a/.conkerorrc/themes/naquadah/theme.json b/conkeror/.conkerorrc/themes/naquadah/theme.json
index bb74ee1..bb74ee1 100644
--- a/.conkerorrc/themes/naquadah/theme.json
+++ b/conkeror/.conkerorrc/themes/naquadah/theme.json
diff --git a/.conkerorrc/themes/yoshi/conkeror--scrollbars.css b/conkeror/.conkerorrc/themes/yoshi/conkeror--scrollbars.css
index 0f70e96..0f70e96 100644
--- a/.conkerorrc/themes/yoshi/conkeror--scrollbars.css
+++ b/conkeror/.conkerorrc/themes/yoshi/conkeror--scrollbars.css
diff --git a/.conkerorrc/themes/yoshi/hints--url-panel.css b/conkeror/.conkerorrc/themes/yoshi/hints--url-panel.css
index 143f3c1..143f3c1 100644
--- a/.conkerorrc/themes/yoshi/hints--url-panel.css
+++ b/conkeror/.conkerorrc/themes/yoshi/hints--url-panel.css
diff --git a/.conkerorrc/themes/yoshi/minibuffer.css b/conkeror/.conkerorrc/themes/yoshi/minibuffer.css
index 12ca4e8..12ca4e8 100644
--- a/.conkerorrc/themes/yoshi/minibuffer.css
+++ b/conkeror/.conkerorrc/themes/yoshi/minibuffer.css
diff --git a/.conkerorrc/themes/yoshi/mode-line.css b/conkeror/.conkerorrc/themes/yoshi/mode-line.css
index 31aabd7..31aabd7 100644
--- a/.conkerorrc/themes/yoshi/mode-line.css
+++ b/conkeror/.conkerorrc/themes/yoshi/mode-line.css
diff --git a/.conkerorrc/themes/yoshi/new-tabs.css b/conkeror/.conkerorrc/themes/yoshi/new-tabs.css
index f5d30c0..f5d30c0 100644
--- a/.conkerorrc/themes/yoshi/new-tabs.css
+++ b/conkeror/.conkerorrc/themes/yoshi/new-tabs.css
diff --git a/.conkerorrc/themes/yoshi/tab-bar.css b/conkeror/.conkerorrc/themes/yoshi/tab-bar.css
index c451778..c451778 100644
--- a/.conkerorrc/themes/yoshi/tab-bar.css
+++ b/conkeror/.conkerorrc/themes/yoshi/tab-bar.css
diff --git a/.conkerorrc/themes/yoshi/theme.json b/conkeror/.conkerorrc/themes/yoshi/theme.json
index bb74ee1..bb74ee1 100644
--- a/.conkerorrc/themes/yoshi/theme.json
+++ b/conkeror/.conkerorrc/themes/yoshi/theme.json
diff --git a/.conky_box.lua b/conky/.conky_box.lua
index ef53427..ef53427 100644
--- a/.conky_box.lua
+++ b/conky/.conky_box.lua
diff --git a/.conkyrc b/conky/.conkyrc
index 297229e..297229e 100644
--- a/.conkyrc
+++ b/conky/.conkyrc
diff --git a/.config/cower/config b/cower/.config/cower/config
index 6c24291..6c24291 100644
--- a/.config/cower/config
+++ b/cower/.config/cower/config
diff --git a/dotfiles.mk b/dotfiles.mk
deleted file mode 100644
index 4132992..0000000
--- a/dotfiles.mk
+++ /dev/null
@@ -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,$^)
diff --git a/dotfiles2.mk b/dotfiles2.mk
deleted file mode 100644
index 521b06d..0000000
--- a/dotfiles2.mk
+++ /dev/null
@@ -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
diff --git a/.config/dunst/dunstrc b/dunst/.config/dunst/dunstrc
index 76427ed..76427ed 100644
--- a/.config/dunst/dunstrc
+++ b/dunst/.config/dunst/dunstrc
diff --git a/.config/fehlstart/fehlstart.rc b/fehlstart/.config/fehlstart/fehlstart.rc
index 6810f50..6810f50 100644
--- a/.config/fehlstart/fehlstart.rc
+++ b/fehlstart/.config/fehlstart/fehlstart.rc
diff --git a/.local/share/applications/moc.desktop b/fehlstart/.local/share/applications/moc.desktop
index 7d83074..7d83074 100644
--- a/.local/share/applications/moc.desktop
+++ b/fehlstart/.local/share/applications/moc.desktop
diff --git a/.local/share/applications/ncmpcpp.desktop b/fehlstart/.local/share/applications/ncmpcpp.desktop
index 8151a1e..8151a1e 100644
--- a/.local/share/applications/ncmpcpp.desktop
+++ b/fehlstart/.local/share/applications/ncmpcpp.desktop
diff --git a/.local/share/applications/poweroff.desktop b/fehlstart/.local/share/applications/poweroff.desktop
index b809e56..b809e56 100644
--- a/.local/share/applications/poweroff.desktop
+++ b/fehlstart/.local/share/applications/poweroff.desktop
diff --git a/.local/share/applications/reboot.desktop b/fehlstart/.local/share/applications/reboot.desktop
index 34ca716..34ca716 100644
--- a/.local/share/applications/reboot.desktop
+++ b/fehlstart/.local/share/applications/reboot.desktop
diff --git a/.config/fish/config.fish b/fish/.config/fish/config.fish
index f515917..f515917 100644
--- a/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
diff --git a/.config/fontconfig/fonts.conf b/fontconfig/.config/fontconfig/fonts.conf
index 6204d1f..6204d1f 100644
--- a/.config/fontconfig/fonts.conf
+++ b/fontconfig/.config/fontconfig/fonts.conf
diff --git a/.gitconfig b/git/.gitconfig
index d55f3be..d55f3be 100644
--- a/.gitconfig
+++ b/git/.gitconfig
diff --git a/.guile b/guile/.guile
index bcbc981..bcbc981 100644
--- a/.guile
+++ b/guile/.guile
diff --git a/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index a74f1aa..a74f1aa 100755
--- a/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
diff --git a/.config/herbstluftwm/panel.sh b/herbstluftwm/.config/herbstluftwm/panel.sh
index 22b46ae..22b46ae 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel.sh
diff --git a/.hgrc b/mercurial/.hgrc
index adef43b..adef43b 100644
--- a/.hgrc
+++ b/mercurial/.hgrc
diff --git a/.moc/.gitignore b/moc/.moc/.gitignore
index 1210ad5..1210ad5 100644
--- a/.moc/.gitignore
+++ b/moc/.moc/.gitignore
diff --git a/.moc/config b/moc/.moc/config
index 76619d2..76619d2 100644
--- a/.moc/config
+++ b/moc/.moc/config
diff --git a/.moc/themes/custom b/moc/.moc/themes/custom
index f9eef4d..f9eef4d 100644
--- a/.moc/themes/custom
+++ b/moc/.moc/themes/custom
diff --git a/.mutt/.gitignore b/mutt/.mutt/.gitignore
index ce8da72..ce8da72 100644
--- a/.mutt/.gitignore
+++ b/mutt/.mutt/.gitignore
diff --git a/.mutt/aethon.muttrc b/mutt/.mutt/aethon.muttrc
index 259098a..259098a 100644
--- a/.mutt/aethon.muttrc
+++ b/mutt/.mutt/aethon.muttrc
diff --git a/.mutt/arch.muttrc b/mutt/.mutt/arch.muttrc
index 36b260b..36b260b 100644
--- a/.mutt/arch.muttrc
+++ b/mutt/.mutt/arch.muttrc
diff --git a/.mutt/colors.muttrc b/mutt/.mutt/colors.muttrc
index 0779b07..0779b07 100644
--- a/.mutt/colors.muttrc
+++ b/mutt/.mutt/colors.muttrc
diff --git a/.mutt/gmail.muttrc b/mutt/.mutt/gmail.muttrc
index 80c9178..80c9178 100644
--- a/.mutt/gmail.muttrc
+++ b/mutt/.mutt/gmail.muttrc
diff --git a/.mutt/iactor.muttrc b/mutt/.mutt/iactor.muttrc
index f090b5f..f090b5f 100644
--- a/.mutt/iactor.muttrc
+++ b/mutt/.mutt/iactor.muttrc
diff --git a/.mutt/macros b/mutt/.mutt/macros
index 3f6ec6b..3f6ec6b 100644
--- a/.mutt/macros
+++ b/mutt/.mutt/macros
diff --git a/.mutt/mailcap b/mutt/.mutt/mailcap
index fba56f6..fba56f6 100644
--- a/.mutt/mailcap
+++ b/mutt/.mutt/mailcap
diff --git a/.mutt/muttrc b/mutt/.mutt/muttrc
index 2af358d..2af358d 100644
--- a/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
diff --git a/.mutt/ninthfloor.muttrc b/mutt/.mutt/ninthfloor.muttrc
index 16a3358..16a3358 100644
--- a/.mutt/ninthfloor.muttrc
+++ b/mutt/.mutt/ninthfloor.muttrc
diff --git a/.mutt/ryuslash.org.muttrc b/mutt/.mutt/ryuslash.org.muttrc
index 315aa9d..315aa9d 100644
--- a/.mutt/ryuslash.org.muttrc
+++ b/mutt/.mutt/ryuslash.org.muttrc
diff --git a/.mutt/sig b/mutt/.mutt/sig
index e69de29..e69de29 100644
--- a/.mutt/sig
+++ b/mutt/.mutt/sig
diff --git a/.urlview b/mutt/.urlview
index 35d5f34..35d5f34 100644
--- a/.urlview
+++ b/mutt/.urlview
diff --git a/.ncmpcpp/config b/ncmpcpp/.ncmpcpp/config
index 6d8655f..6d8655f 100644
--- a/.ncmpcpp/config
+++ b/ncmpcpp/.ncmpcpp/config
diff --git a/.config/newsbeuter/.gitignore b/newsbeuter/.config/newsbeuter/.gitignore
index 8afd898..8afd898 100644
--- a/.config/newsbeuter/.gitignore
+++ b/newsbeuter/.config/newsbeuter/.gitignore
diff --git a/.config/newsbeuter/config b/newsbeuter/.config/newsbeuter/config
index 257f150..257f150 100644
--- a/.config/newsbeuter/config
+++ b/newsbeuter/.config/newsbeuter/config
diff --git a/.config/newsbeuter/urls b/newsbeuter/.config/newsbeuter/urls
index 911e000..911e000 100644
--- a/.config/newsbeuter/urls
+++ b/newsbeuter/.config/newsbeuter/urls
diff --git a/notion/cfg_notion.lua b/notion/.notion/cfg_notion.lua
index d31458d..d31458d 100644
--- a/notion/cfg_notion.lua
+++ b/notion/.notion/cfg_notion.lua
diff --git a/notion/cfg_notioncore.lua b/notion/.notion/cfg_notioncore.lua
index 2839409..2839409 100644
--- a/notion/cfg_notioncore.lua
+++ b/notion/.notion/cfg_notioncore.lua
diff --git a/notion/Makefile b/notion/Makefile
deleted file mode 100644
index 2daf159..0000000
--- a/notion/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIR=.notion
-
-include ../dotfiles2.mk
-
-install: RFLAGS:=$(RFLAGS) --exclude=default-session--0
-install: RFLAGS:=$(RFLAGS) --exclude=.welcome_msg_displayed
diff --git a/.offlineimap.py b/offlineimap/.offlineimap.py
index fb4f66e..fb4f66e 100644
--- a/.offlineimap.py
+++ b/offlineimap/.offlineimap.py
diff --git a/.offlineimaprc b/offlineimap/.offlineimaprc
index 5b96d16..5b96d16 100644
--- a/.offlineimaprc
+++ b/offlineimap/.offlineimaprc
diff --git a/.pentadactyl/plugins/emacs.penta b/pentadactil/.pentadactyl/plugins/emacs.penta
index e28bce3..e28bce3 100644
--- a/.pentadactyl/plugins/emacs.penta
+++ b/pentadactil/.pentadactyl/plugins/emacs.penta
diff --git a/.sawfish/rc b/sawfish/.sawfish/rc
index 5f7da7c..5f7da7c 100644
--- a/.sawfish/rc
+++ b/sawfish/.sawfish/rc
diff --git a/sbcl/Makefile b/sbcl/Makefile
deleted file mode 100644
index 1be8c1a..0000000
--- a/sbcl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-objects=.sbclrc
-
-include ../dotfiles.mk
-
-.sbclrc: sbclrc.org
- $(EMACS) -Q -batch \
- -eval "(progn (require 'org) (require 'ob-tangle) \
- (org-babel-tangle-file \"$^\"))"
diff --git a/.screenrc b/screen/.screenrc
index 16e3032..16e3032 100644
--- a/.screenrc
+++ b/screen/.screenrc
diff --git a/.scwmrc b/scwm/.scwmrc
index 72ddae8..72ddae8 100644
--- a/.scwmrc
+++ b/scwm/.scwmrc
diff --git a/.slrnrc b/slrn/.slrnrc
index 00e28d0..00e28d0 100644
--- a/.slrnrc
+++ b/slrn/.slrnrc
diff --git a/.ssh/.gitignore b/ssh/.ssh/.gitignore
index e69de29..e69de29 100644
--- a/.ssh/.gitignore
+++ b/ssh/.ssh/.gitignore
diff --git a/.ssh/config b/ssh/.ssh/config
index edace41..edace41 100644
--- a/.ssh/config
+++ b/ssh/.ssh/config
diff --git a/.stumpwmrc b/stumpwm/.stumpwmrc
index 30df336..30df336 100644
--- a/.stumpwmrc
+++ b/stumpwm/.stumpwmrc
diff --git a/.tmux.conf b/tmux/.tmux.conf
index ef38f70..ef38f70 100644
--- a/.tmux.conf
+++ b/tmux/.tmux.conf
diff --git a/.w3m/.gitignore b/w3m/.w3m/.gitignore
index c375d5b..c375d5b 100644
--- a/.w3m/.gitignore
+++ b/w3m/.w3m/.gitignore
diff --git a/.w3m/config b/w3m/.w3m/config
index 9c4a8a2..9c4a8a2 100644
--- a/.w3m/config
+++ b/w3m/.w3m/config
diff --git a/.weechat/alias.conf b/weechat/.weechat/alias.conf
index dc8e9b3..dc8e9b3 100644
--- a/.weechat/alias.conf
+++ b/weechat/.weechat/alias.conf
diff --git a/.weechat/irc.conf b/weechat/.weechat/irc.conf
index 1e15734..1e15734 100644
--- a/.weechat/irc.conf
+++ b/weechat/.weechat/irc.conf
diff --git a/.weechat/weechat.conf b/weechat/.weechat/weechat.conf
index 60ae637..60ae637 100644
--- a/.weechat/weechat.conf
+++ b/weechat/.weechat/weechat.conf
diff --git a/.Xdefaults b/x11/.Xdefaults
index ffa38c6..ffa38c6 100644
--- a/.Xdefaults
+++ b/x11/.Xdefaults
diff --git a/.Xmodmap b/x11/.Xmodmap
index 15f66e7..15f66e7 100644
--- a/.Xmodmap
+++ b/x11/.Xmodmap
diff --git a/.xinitrc b/x11/.xinitrc
index eb49aae..eb49aae 100755
--- a/.xinitrc
+++ b/x11/.xinitrc
diff --git a/.xsession b/x11/.xsession
index 8f554c5..8f554c5 100755
--- a/.xsession
+++ b/x11/.xsession
diff --git a/.xbindkeysrc.scm b/xbindkeys/.xbindkeysrc.scm
index 509a130..509a130 100644
--- a/.xbindkeysrc.scm
+++ b/xbindkeys/.xbindkeysrc.scm
diff --git a/xmonad/.gitignore b/xmonad/.xmonad/.gitignore
index 11a024e..11a024e 100644
--- a/xmonad/.gitignore
+++ b/xmonad/.xmonad/.gitignore
diff --git a/xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
index 617ab53..617ab53 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/.xmonad/xmonad.hs
diff --git a/xmonad/Makefile b/xmonad/Makefile
deleted file mode 100644
index 9b8d3c3..0000000
--- a/xmonad/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-DESTDIR := $(DESTDIR)/.xmonad
-objects=xmonad-x86_64-linux xmonad.hs
-
-GHC := ghc
-
-include ../dotfiles.mk
-
-xmonad-x86_64-linux: xmonad.hs
- $(GHC) --make $^ -i -ilib -fforce-recomp -main-is main -v0 -o $@
-install-xmonad-x86_64-linux: MODE=744
diff --git a/.config/zathura/zathurarc b/zathura/.config/zathura/zathurarc
index 5066895..5066895 100644
--- a/.config/zathura/zathurarc
+++ b/zathura/.config/zathura/zathurarc
diff --git a/.zile b/zile/.zile
index 76abb70..76abb70 100644
--- a/.zile
+++ b/zile/.zile
diff --git a/.bash_profile b/zsh/.bash_profile
index c1abe3f..c1abe3f 120000
--- a/.bash_profile
+++ b/zsh/.bash_profile
diff --git a/.zprofile b/zsh/.zprofile
index 4a74a84..4a74a84 100644
--- a/.zprofile
+++ b/zsh/.zprofile
diff --git a/.zsh/.gitignore b/zsh/.zsh/.gitignore
index b9fd690..b9fd690 100644
--- a/.zsh/.gitignore
+++ b/zsh/.zsh/.gitignore
diff --git a/.zsh/functions/add-to-list b/zsh/.zsh/functions/add-to-list
index 18720e0..18720e0 100644
--- a/.zsh/functions/add-to-list
+++ b/zsh/.zsh/functions/add-to-list
diff --git a/.zsh/functions/env b/zsh/.zsh/functions/env
index a79fd5d..a79fd5d 100644
--- a/.zsh/functions/env
+++ b/zsh/.zsh/functions/env
diff --git a/.zsh/functions/venv b/zsh/.zsh/functions/venv
index 03ec83d..03ec83d 100644
--- a/.zsh/functions/venv
+++ b/zsh/.zsh/functions/venv
diff --git a/.zshrc b/zsh/.zshrc
index d4fb2ad..d4fb2ad 100644
--- a/.zshrc
+++ b/zsh/.zshrc