27 files changed, 14 insertions, 37 deletions

diff --git a/compton b/.compton
index 2f736fd..2f736fd 100644
--- a/compton
+++ b/.compton
diff --git a/.gitmodules b/.gitmodules
index 93ccec3..b993b7a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,21 @@
-[submodule "dotfiles"]
-        path = dotfiles
-        url = https://github.com/jbernard/dotfiles.git
-[submodule "vim/vim-pathogen"]
-        path = vim/vim-pathogen
+[submodule "vim/.vim/vim-pathogen"]
+        path = vim/.vim/vim-pathogen
         url = https://github.com/tpope/vim-pathogen.git
-[submodule "vim/bundle/nerdtree"]
-        path = vim/bundle/nerdtree
+[submodule "vim/.vim/bundle/nerdtree"]
+        path = vim/.vim/bundle/nerdtree
         url = https://github.com/scrooloose/nerdtree.git
-[submodule "vim/bundle/supertab"]
-        path = vim/bundle/supertab
+[submodule "vim/.vim/bundle/supertab"]
+        path = vim/.vim/bundle/supertab
         url = https://github.com/ervandew/supertab.git
-[submodule "vim/bundle/syntastic"]
-        path = vim/bundle/syntastic
+[submodule "vim/.vim/bundle/syntastic"]
+        path = vim/.vim/bundle/syntastic
         url = https://github.com/scrooloose/syntastic.git
-[submodule "vim/bundle/vim-fugitive"]
-        path = vim/bundle/vim-fugitive
+[submodule "vim/.vim/bundle/vim-fugitive"]
+        path = vim/.vim/bundle/vim-fugitive
         url = https://github.com/tpope/vim-fugitive.git
-[submodule "vim/bundle/vim-nerdtree-tabs"]
-        path = vim/bundle/vim-nerdtree-tabs
+[submodule "vim/.vim/bundle/vim-nerdtree-tabs"]
+        path = vim/.vim/bundle/vim-nerdtree-tabs
         url = https://github.com/jistr/vim-nerdtree-tabs.git
-[submodule "vim/bundle/nerdcommenter"]
-        path = vim/bundle/nerdcommenter
+[submodule "vim/.vim/bundle/nerdcommenter"]
+        path = vim/.vim/bundle/nerdcommenter
         url = https://github.com/scrooloose/nerdcommenter.git
diff --git a/bashrc b/bash/.bashrc
index 218b1a8..218b1a8 100644
--- a/bashrc
+++ b/bash/.bashrc
diff --git a/dotfiles.sh b/dotfiles.sh
deleted file mode 100755
index 0cc525a..0000000
--- a/dotfiles.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/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
deleted file mode 100644
index f5d8526..0000000
--- a/dotfilesrc
+++ /dev/null
@@ -1,13 +0,0 @@
-[dotfiles]
-repository = ~/dotfiles
-
-packages = ['config',
-            'themes']
-
-ignore = [
-    '.git',
-    '.gitignore',
-    '.gitmodules',
-    'dotfiles*',
-    '*.swp',
-    'README.md']
diff --git a/config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 683fbf1..683fbf1 100755
--- a/config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
diff --git a/config/herbstluftwm/dependencylist b/herbstluftwm/.config/herbstluftwm/dependencylist
index 7d3babf..7d3babf 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 40c5330..40c5330 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 763c668..763c668 100755
--- a/config/herbstluftwm/panel.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel.sh
diff --git a/config/herbstluftwm/panel_indicators.sh b/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
index e450337..e450337 100644
--- a/config/herbstluftwm/panel_indicators.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
diff --git a/config/herbstluftwm/poligons.png b/herbstluftwm/.config/herbstluftwm/poligons.png
index e5c7cda..e5c7cda 100644
--- a/config/herbstluftwm/poligons.png
+++ b/herbstluftwm/.config/herbstluftwm/poligons.png
diff --git a/config/herbstluftwm/popup.sh b/herbstluftwm/.config/herbstluftwm/popup.sh
index eda37f5..eda37f5 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/config/herbstluftwm/theme.sh b/herbstluftwm/.config/herbstluftwm/theme.sh
index 34e22a7..34e22a7 100644
--- a/config/herbstluftwm/theme.sh
+++ b/herbstluftwm/.config/herbstluftwm/theme.sh
diff --git a/liquidpromptrc b/liquidprompt/.liquidpromptrc
index 57414d5..57414d5 100644
--- a/liquidpromptrc
+++ b/liquidprompt/.liquidpromptrc
diff --git a/lp_ps1 b/liquidprompt/.lp_ps1
index 93987bb..93987bb 100644
--- a/lp_ps1
+++ b/liquidprompt/.lp_ps1
diff --git a/config/redshift.conf b/redshift/.config/redshift.conf
index 2b88434..2b88434 100644
--- a/config/redshift.conf
+++ b/redshift/.config/redshift.conf
diff --git a/themes/numix-no-title-max/index.theme b/themes/.themes/numix-no-title-max/index.theme
index 553f572..553f572 100644
--- a/themes/numix-no-title-max/index.theme
+++ b/themes/.themes/numix-no-title-max/index.theme
diff --git a/themes/numix-no-title-max/metacity-1/metacity-theme-3.xml b/themes/.themes/numix-no-title-max/metacity-1/metacity-theme-3.xml
index 264fb01..264fb01 100644
--- a/themes/numix-no-title-max/metacity-1/metacity-theme-3.xml
+++ b/themes/.themes/numix-no-title-max/metacity-1/metacity-theme-3.xml
diff --git a/themes/numix-no-title/index.theme b/themes/.themes/numix-no-title/index.theme
index 33b73d8..33b73d8 100644
--- a/themes/numix-no-title/index.theme
+++ b/themes/.themes/numix-no-title/index.theme
diff --git a/themes/numix-no-title/metacity-1/metacity-theme-3.xml b/themes/.themes/numix-no-title/metacity-1/metacity-theme-3.xml
index 1beaa48..1beaa48 100644
--- a/themes/numix-no-title/metacity-1/metacity-theme-3.xml
+++ b/themes/.themes/numix-no-title/metacity-1/metacity-theme-3.xml
diff --git a/vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim
index 9a7227e..9a7227e 120000
--- a/vim/autoload/pathogen.vim
+++ b/vim/.vim/autoload/pathogen.vim
diff --git a/vim/ftplugin/python.vim b/vim/.vim/ftplugin/python.vim
index 183ef4b..183ef4b 100644
--- a/vim/ftplugin/python.vim
+++ b/vim/.vim/ftplugin/python.vim
diff --git a/vimrc b/vim/.vimrc
index fa53318..fa53318 100644
--- a/vimrc
+++ b/vim/.vimrc
diff --git a/vimperatorrc b/vimperator/.vimperatorrc
index 984f4e0..984f4e0 100644
--- a/vimperatorrc
+++ b/vimperator/.vimperatorrc
diff --git a/Xresources b/xorg/.Xresources
index b489339..b489339 100644
--- a/Xresources
+++ b/xorg/.Xresources