32 files changed, 33 insertions, 72 deletions

diff --git a/.gitmodules b/.gitmodules
index 2d31281..dd834b9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,12 @@
-[submodule "vim/.vim/vim-pathogen"]
-        path = vim/.vim/vim-pathogen
+[submodule "dotfiles"]
+        path = dotfiles
+        url = https://github.com/jbernard/dotfiles.git
+[submodule "vim/vim-pathogen"]
+        path = vim/vim-pathogen
         url = https://github.com/tpope/vim-pathogen.git
-[submodule "vim/.vim/bundle/nerdtree"]
-        path = vim/.vim/bundle/nerdtree
+[submodule "vim/bundle/nerdtree"]
+        path = vim/bundle/nerdtree
         url = https://github.com/scrooloose/nerdtree.git
-[submodule "vim/.vim/bundle/supertab"]
-        path = vim/.vim/bundle/supertab
+[submodule "vim/bundle/supertab"]
+        path = vim/bundle/supertab
         url = https://github.com/ervandew/supertab.git
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c383450..0000000
--- a/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-ALL=$(shell ls -p | grep "/")
-HOME=$(shell echo ~)
-
-install:
-        @echo "Installing dotfiles to $(HOME)"
-        @stow -t $(HOME) -v $(ALL)
-
-uninstall:
-        @echo "Uninstalling dotfiles"
-        @stow -t $(HOME) -Dv $(ALL)
diff --git a/README.md b/README.md
index c46fe49..fbb6e82 100644
--- a/README.md
+++ b/README.md
@@ -6,15 +6,8 @@ Recently I've been discovering tiling window managers and that customizeing my d
 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 make install to stow all dotfiles to your home directory (recommended)
-
-The makefile has two recepies:
- - install: Installs all my dotfiles to your $HOME
- - uninstall: Uninstalls all my dotfiles
-
-The makefile depends on GNU Stow.
+1. Clone this repository and cd into it
+2. Run `./dotfiles.sh --sync` to sync all the dotfiles to your $HOME
 
+Thanks to [jbernard](https://github.com/jbernard) for making dotfile management easy!
diff --git a/xorg/.Xresources b/Xresources
index b489339..b489339 100644
--- a/xorg/.Xresources
+++ b/Xresources
diff --git a/bash/.bashrc b/bashrc
index 36bb569..36bb569 100644
--- a/bash/.bashrc
+++ b/bashrc
diff --git a/compton/.compton b/compton
index 2f736fd..2f736fd 100644
--- a/compton/.compton
+++ b/compton
diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/config/herbstluftwm/autostart
index 78e9af8..78e9af8 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/config/herbstluftwm/autostart
diff --git a/herbstluftwm/.config/herbstluftwm/dependencylist b/config/herbstluftwm/dependencylist
index 7d3babf..7d3babf 100644
--- a/herbstluftwm/.config/herbstluftwm/dependencylist
+++ b/config/herbstluftwm/dependencylist
diff --git a/herbstluftwm/.config/herbstluftwm/lock.sh b/config/herbstluftwm/lock.sh
index 04c4638..04c4638 100755
--- a/herbstluftwm/.config/herbstluftwm/lock.sh
+++ b/config/herbstluftwm/lock.sh
diff --git a/herbstluftwm/.config/herbstluftwm/notify.sh b/config/herbstluftwm/notify.sh
index 40c5330..40c5330 100755
--- a/herbstluftwm/.config/herbstluftwm/notify.sh
+++ b/config/herbstluftwm/notify.sh
diff --git a/herbstluftwm/.config/herbstluftwm/panel.sh b/config/herbstluftwm/panel.sh
index 763c668..763c668 100755
--- a/herbstluftwm/.config/herbstluftwm/panel.sh
+++ b/config/herbstluftwm/panel.sh
diff --git a/herbstluftwm/.config/herbstluftwm/panel_indicators.sh b/config/herbstluftwm/panel_indicators.sh
index e450337..e450337 100644
--- a/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
+++ b/config/herbstluftwm/panel_indicators.sh
diff --git a/herbstluftwm/.config/herbstluftwm/popup.sh b/config/herbstluftwm/popup.sh
index eda37f5..eda37f5 100755
--- a/herbstluftwm/.config/herbstluftwm/popup.sh
+++ b/config/herbstluftwm/popup.sh
diff --git a/herbstluftwm/.config/herbstluftwm/start.sh b/config/herbstluftwm/start.sh
index f10fca6..f10fca6 100755
--- a/herbstluftwm/.config/herbstluftwm/start.sh
+++ b/config/herbstluftwm/start.sh
diff --git a/herbstluftwm/.config/herbstluftwm/theme.sh b/config/herbstluftwm/theme.sh
index c40f94a..c40f94a 100644
--- a/herbstluftwm/.config/herbstluftwm/theme.sh
+++ b/config/herbstluftwm/theme.sh
diff --git a/config/redshift.conf b/config/redshift.conf
new file mode 120000
index 0000000..89e8120
--- /dev/null
+++ b/config/redshift.conf
@@ -0,0 +1 @@
+/home/tom/dotfiles/redshift.conf
\ No newline at end of file
diff --git a/dotfiles b/dotfiles
new file mode 160000
+Subproject 2837c58f4a1b6441f9ecfe2cae89bd4a96e850d
diff --git a/dotfiles.sh b/dotfiles.sh
new file mode 100755
index 0000000..0cc525a
--- /dev/null
+++ b/dotfiles.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+DOTFILES=$HOME/dotfiles
+DOTFILESRC=$DOTFILES/dotfilesrc
+PATH=$PATH:$DOTFILES/dotfiles/bin
+
+dotfiles --repo="$DOTFILES" --config="$DOTFILESRC" $@
diff --git a/dotfilesrc b/dotfilesrc
new file mode 100644
index 0000000..f5d8526
--- /dev/null
+++ b/dotfilesrc
@@ -0,0 +1,13 @@
+[dotfiles]
+repository = ~/dotfiles
+
+packages = ['config',
+            'themes']
+
+ignore = [
+    '.git',
+    '.gitignore',
+    '.gitmodules',
+    'dotfiles*',
+    '*.swp',
+    'README.md']
diff --git a/liquidprompt/.liquidpromptrc b/liquidpromptrc
index 1cb350c..1cb350c 100755
--- a/liquidprompt/.liquidpromptrc
+++ b/liquidpromptrc
diff --git a/liquidprompt/.lp_ps1 b/lp_ps1
index 93987bb..93987bb 100755
--- a/liquidprompt/.lp_ps1
+++ b/lp_ps1
diff --git a/redshift/.config/redshift.conf b/redshift/.config/redshift.conf
deleted file mode 100644
index 2b88434..0000000
--- a/redshift/.config/redshift.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-; Global settings for redshift
-[redshift]
-; Set the day and night screen temperatures
-temp-day=6500
-temp-night=4200
-
-; Enable/Disable a smooth transition between day and night
-; 0 will cause a direct change from day to night screen temperature. 
-; 1 will gradually increase or decrease the screen temperature
-transition=1
-
-; Set the screen brightness. Default is 1.0
-;brightness=0.9
-; It is also possible to use different settings for day and night since version 1.8.
-;brightness-day=0.7
-;brightness-night=0.4
-; Set the screen gamma (for all colors, or each color channel individually)
-gamma=0.8
-;gamma=0.8:0.7:0.8
-
-; Set the location-provider: 'geoclue', 'gnome-clock', 'manual'
-; type 'redshift -l list' to see possible values
-; The location provider settings are in a different section.
-location-provider=manual
-
-; Set the adjustment-method: 'randr', 'vidmode'
-; type 'redshift -m list' to see all possible values
-; 'randr' is the preferred method, 'vidmode' is an older API
-; but works in some cases when 'randr' does not.
-; The adjustment method settings are in a different section.
-adjustment-method=randr
-
-; Configuration of the location-provider:
-; type 'redshift -l PROVIDER:help' to see the settings
-; e.g. 'redshift -l manual:help'
-[manual]
-lat=52.6
-lon=5.1
-
-; Configuration of the adjustment-method
-; type 'redshift -m METHOD:help' to see the settings
-; ex: 'redshift -m randr:help'
-; In this example, randr is configured to adjust screen 1. 
-; Note that the numbering starts from 0, so this is actually the second screen.
-[randr]
-screen=0
diff --git a/themes/.local/share/themes/numix-no-title-max/index.theme b/themes/numix-no-title-max/index.theme
index 553f572..553f572 100644
--- a/themes/.local/share/themes/numix-no-title-max/index.theme
+++ b/themes/numix-no-title-max/index.theme
diff --git a/themes/.local/share/themes/numix-no-title-max/metacity-1/metacity-theme-3.xml b/themes/numix-no-title-max/metacity-1/metacity-theme-3.xml
index 264fb01..264fb01 100644
--- a/themes/.local/share/themes/numix-no-title-max/metacity-1/metacity-theme-3.xml
+++ b/themes/numix-no-title-max/metacity-1/metacity-theme-3.xml
diff --git a/themes/.local/share/themes/numix-no-title/index.theme b/themes/numix-no-title/index.theme
index 33b73d8..33b73d8 100644
--- a/themes/.local/share/themes/numix-no-title/index.theme
+++ b/themes/numix-no-title/index.theme
diff --git a/themes/.local/share/themes/numix-no-title/metacity-1/metacity-theme-3.xml b/themes/numix-no-title/metacity-1/metacity-theme-3.xml
index 1beaa48..1beaa48 100644
--- a/themes/.local/share/themes/numix-no-title/metacity-1/metacity-theme-3.xml
+++ b/themes/numix-no-title/metacity-1/metacity-theme-3.xml
diff --git a/vim/.vim/bundle/supertab b/vim/.vim/bundle/supertab
deleted file mode 160000
-Subproject 454c06e25680799b6f408622d6bfbaf920ace82
diff --git a/vim/.vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
index 9a7227e..9a7227e 120000
--- a/vim/.vim/autoload/pathogen.vim
+++ b/vim/autoload/pathogen.vim
diff --git a/vim/.vim/bundle/nerdtree b/vim/bundle/nerdtree
-Subproject 3b98a7fcae8f9fff356907171f0406ff8cd2892
+Subproject 3b98a7fcae8f9fff356907171f0406ff8cd2892
diff --git a/vim/bundle/supertab b/vim/bundle/supertab
new file mode 160000
+Subproject c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e
diff --git a/vim/.vim/vim-pathogen b/vim/vim-pathogen
-Subproject b9fb0dfd811004010f5f6903edef42d6004ebea
+Subproject b9fb0dfd811004010f5f6903edef42d6004ebea
diff --git a/vim/.vimrc b/vimrc
index 0d11819..0d11819 100644
--- a/vim/.vimrc
+++ b/vimrc