17 files changed, 18 insertions, 70 deletions

diff --git a/Makefile b/Makefile
index 8d2e9fb..c383450 100644
--- a/Makefile
+++ b/Makefile
@@ -1,59 +1,10 @@
-PWD=$(shell pwd)
+ALL=$(shell ls -p | grep "/")
+HOME=$(shell echo ~)
 
-THEMES_DIR = .local/share/themes
-CONFIG_DIR = .config
-GTK3_DIR = gtk-3.0
-
-BASHRC = .bashrc
-COMPTON = .compton
-GTKCSS = gtk.css
-HERBSTLUFT = herbstluftwm
-LIQUIDPROMPT = .liquidpromptrc
-LP_PS1 = .lp_ps1
-NUMIX = numix-no-title
-VIMRC = .vimrc
-XRESOURCES = .Xresources
-
-install: all
-
-all:  bash compton gtk3fix herbstluftwm liquidprompt numix-no-title vim xresources 
-
-bash:
-        ln -sf $(PWD)/$(BASHRC) ~
-
-compton:
-        ln -sf $(PWD)/$(COMPTON) ~
-
-gtk3fix:
-        mkdir -p ~/$(CONFIG_DIR)/$(GTK3_DIR)
-        ln -sf $(PWD)/$(CONFIG_DIR)/$(GTK3_DIR)/$(GTKCSS) ~/$(CONFIG_DIR)/$(GTK3_DIR)
-
-herbstluftwm:
-        mkdir -p ~/$(CONFIG_DIR)
-        ln -sf $(PWD)/$(CONFIG_DIR)/$(HERBSTLUFT) ~/$(CONFIG_DIR)/
-
-liquidprompt:
-        ln -sf $(PWD)/$(LIQUIDPROMPT) ~
-        ln -sf $(PWD)/$(LP_PS1) ~
-
-numix-no-title:
-        mkdir -p ~/$(THEMES_DIR)
-        ln -sf $(PWD)/$(THEMES_DIR)/$(NUMIX) ~/$(THEMES_DIR)/
-
-vim:
-        ln -sf $(PWD)/$(VIMRC) ~
-
-xresources:
-        ln -sf $(PWD)/$(XRESOURCES) ~
+install:
+        @echo "Installing dotfiles to $(HOME)"
+        @stow -t $(HOME) -v $(ALL)
 
 uninstall:
-        #remove all
-        -rm ~/$(BASHRC)
-        -rm ~/$(COMPTON)
-        -rm ~/$(CONFIG_DIR)/$(HERBSTLUFT)
-        -rm ~/$(CONFIG_DIR)/$(GTK3_DIR)/$(GTKCSS)
-        -rm ~/$(LIQUIDPROMPT)
-        -rm ~/$(LP_PS1)
-        -rm ~/$(THEMES_DIR)/$(NUMIX)
-        -rm ~/$(VIMRC)
-        -rm ~/$(XRESOURCES)
+        @echo "Uninstalling dotfiles"
+        @stow -t $(HOME) -Dv $(ALL)
diff --git a/README.md b/README.md
index a541fc9..df5a3b5 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,20 @@
 Toms Dotfiles
 =============
+
 ###About
-Recently I've been discovering tiling window managers and how nice it is to customize my desktop.
-This means I've got a "lot" of dotfiles wanting to share across my machines and with everyone who is interested.
+Recently I've been discovering tiling window managers and that customizeing my desktop is really cool.
+This means I've got a "lot" of dotfiles I want to share across my machines and with everyone who is interested.
+
 ###How to install
 You can
  - copy the files to your home directory
 
-or
- - You can run install my dotfiles with the Makefile
+or 
+ - You can run make install to stow all dotfiles to your home directory (recommanded)
+
+The makefile has two recepies:
+ - install: Installs all my dotfiles to your $HOME
+ - uninstall: Uninstalls all my dotfiles
 
-The makefile has multiple recepies:
- - numix-no-title: Installs a modified version of the numix metacity theme
- - herbstluftwm: Installs my herbstluftwm dotfiles
- - bash: Installs my bashrc file
- - vim: Installs my vimrc file
- - xresources: Installs my xresources file
- - install: Does all of the above
- - uninstall: uninstall all my dotfiles
+The makefile depends on GNU Stow.
 
-###Disclaimer
-I am not responsible for the loss of any of your files! You should make a backup before installing anything!
diff --git a/.bashrc b/bash/.bashrc
index ee01ef2..ee01ef2 100644
--- a/.bashrc
+++ b/bash/.bashrc
diff --git a/.compton b/compton/.compton
index 2f736fd..2f736fd 100644
--- a/.compton
+++ b/compton/.compton
diff --git a/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 109ea43..109ea43 100755
--- a/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
diff --git a/.config/herbstluftwm/dependencylist b/herbstluftwm/.config/herbstluftwm/dependencylist
index a18055d..a18055d 100644
--- a/.config/herbstluftwm/dependencylist
+++ b/herbstluftwm/.config/herbstluftwm/dependencylist
diff --git a/.config/herbstluftwm/lock.sh b/herbstluftwm/.config/herbstluftwm/lock.sh
index 04c4638..04c4638 100755
--- a/.config/herbstluftwm/lock.sh
+++ b/herbstluftwm/.config/herbstluftwm/lock.sh
diff --git a/.config/herbstluftwm/notify.sh b/herbstluftwm/.config/herbstluftwm/notify.sh
index 190d496..190d496 100755
--- a/.config/herbstluftwm/notify.sh
+++ b/herbstluftwm/.config/herbstluftwm/notify.sh
diff --git a/.config/herbstluftwm/panel.sh b/herbstluftwm/.config/herbstluftwm/panel.sh
index 24d0e12..24d0e12 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel.sh
diff --git a/.config/herbstluftwm/popup.sh b/herbstluftwm/.config/herbstluftwm/popup.sh
index 41c5e9c..41c5e9c 100755
--- a/.config/herbstluftwm/popup.sh
+++ b/herbstluftwm/.config/herbstluftwm/popup.sh
diff --git a/.config/herbstluftwm/start.sh b/herbstluftwm/.config/herbstluftwm/start.sh
index f10fca6..f10fca6 100755
--- a/.config/herbstluftwm/start.sh
+++ b/herbstluftwm/.config/herbstluftwm/start.sh
diff --git a/.liquidpromptrc b/liquidprompt/.liquidpromptrc
index 1cb350c..1cb350c 100755
--- a/.liquidpromptrc
+++ b/liquidprompt/.liquidpromptrc
diff --git a/.lp_ps1 b/liquidprompt/.lp_ps1
index 821dcf7..821dcf7 100755
--- a/.lp_ps1
+++ b/liquidprompt/.lp_ps1
diff --git a/.local/share/themes/numix-no-title/index.theme b/themes/.local/share/themes/numix-no-title/index.theme
index 33b73d8..33b73d8 100644
--- a/.local/share/themes/numix-no-title/index.theme
+++ b/themes/.local/share/themes/numix-no-title/index.theme
diff --git a/.local/share/themes/numix-no-title/metacity-1/metacity-theme-3.xml b/themes/.local/share/themes/numix-no-title/metacity-1/metacity-theme-3.xml
index 1beaa48..1beaa48 100644
--- a/.local/share/themes/numix-no-title/metacity-1/metacity-theme-3.xml
+++ b/themes/.local/share/themes/numix-no-title/metacity-1/metacity-theme-3.xml
diff --git a/.vimrc b/vim/.vimrc
index 7313a1c..7313a1c 100644
--- a/.vimrc
+++ b/vim/.vimrc
diff --git a/.Xresources b/xorg/.Xresources
index b489339..b489339 100644
--- a/.Xresources
+++ b/xorg/.Xresources