From 91fefe78e7da58646b85f864c53cee30a6ae0376 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 12 Dec 2015 12:48:16 +0100
Subject: [PATCH] Restructure dotfiles directories.

---
 {dotfiles_minimal => dotfiles}/bashrc                  |  0
 {dotfiles_minimal => dotfiles}/profile                 |  0
 {dotfiles_root => dotfiles/root}/shinit_color          |  0
 {dotfiles_minimal => dotfiles}/shinit                  |  0
 {dotfiles_user_minimal => dotfiles/user}/gitconfig     |  0
 .../user/server}/getmail/getmailrc                     |  0
 .../user/server}/mailfilter                            |  0
 {dotfiles_user_server => dotfiles/user/server}/muttrc  |  0
 .../user/server}/procmailrc                            |  0
 .../user/server}/shinit_add                            |  0
 .../user/server}/shinit_color                          |  0
 .../user/server}/weechatrc                             |  0
 .../user/thinkpad}/i3/config                           |  0
 .../user/thinkpad}/i3status.conf                       |  0
 .../user/thinkpad}/pentadactylrc                       |  0
 .../user/thinkpad}/shinit_color                        |  0
 .../user/thinkpad}/xinitrc                             |  0
 {dotfiles_minimal => dotfiles}/vimrc                   |  0
 symlink.sh                                             | 10 +++++-----
 19 files changed, 5 insertions(+), 5 deletions(-)
 rename {dotfiles_minimal => dotfiles}/bashrc (100%)
 rename {dotfiles_minimal => dotfiles}/profile (100%)
 rename {dotfiles_root => dotfiles/root}/shinit_color (100%)
 rename {dotfiles_minimal => dotfiles}/shinit (100%)
 rename {dotfiles_user_minimal => dotfiles/user}/gitconfig (100%)
 rename {dotfiles_user_server => dotfiles/user/server}/getmail/getmailrc (100%)
 rename {dotfiles_user_server => dotfiles/user/server}/mailfilter (100%)
 rename {dotfiles_user_server => dotfiles/user/server}/muttrc (100%)
 rename {dotfiles_user_server => dotfiles/user/server}/procmailrc (100%)
 rename {dotfiles_user_server => dotfiles/user/server}/shinit_add (100%)
 rename {dotfiles_user_server => dotfiles/user/server}/shinit_color (100%)
 rename {dotfiles_user_server => dotfiles/user/server}/weechatrc (100%)
 rename {dotfiles_user_thinkpad => dotfiles/user/thinkpad}/i3/config (100%)
 rename {dotfiles_user_thinkpad => dotfiles/user/thinkpad}/i3status.conf (100%)
 rename {dotfiles_user_thinkpad => dotfiles/user/thinkpad}/pentadactylrc (100%)
 rename {dotfiles_user_thinkpad => dotfiles/user/thinkpad}/shinit_color (100%)
 rename {dotfiles_user_thinkpad => dotfiles/user/thinkpad}/xinitrc (100%)
 rename {dotfiles_minimal => dotfiles}/vimrc (100%)

diff --git a/dotfiles_minimal/bashrc b/dotfiles/bashrc
similarity index 100%
rename from dotfiles_minimal/bashrc
rename to dotfiles/bashrc
diff --git a/dotfiles_minimal/profile b/dotfiles/profile
similarity index 100%
rename from dotfiles_minimal/profile
rename to dotfiles/profile
diff --git a/dotfiles_root/shinit_color b/dotfiles/root/shinit_color
similarity index 100%
rename from dotfiles_root/shinit_color
rename to dotfiles/root/shinit_color
diff --git a/dotfiles_minimal/shinit b/dotfiles/shinit
similarity index 100%
rename from dotfiles_minimal/shinit
rename to dotfiles/shinit
diff --git a/dotfiles_user_minimal/gitconfig b/dotfiles/user/gitconfig
similarity index 100%
rename from dotfiles_user_minimal/gitconfig
rename to dotfiles/user/gitconfig
diff --git a/dotfiles_user_server/getmail/getmailrc b/dotfiles/user/server/getmail/getmailrc
similarity index 100%
rename from dotfiles_user_server/getmail/getmailrc
rename to dotfiles/user/server/getmail/getmailrc
diff --git a/dotfiles_user_server/mailfilter b/dotfiles/user/server/mailfilter
similarity index 100%
rename from dotfiles_user_server/mailfilter
rename to dotfiles/user/server/mailfilter
diff --git a/dotfiles_user_server/muttrc b/dotfiles/user/server/muttrc
similarity index 100%
rename from dotfiles_user_server/muttrc
rename to dotfiles/user/server/muttrc
diff --git a/dotfiles_user_server/procmailrc b/dotfiles/user/server/procmailrc
similarity index 100%
rename from dotfiles_user_server/procmailrc
rename to dotfiles/user/server/procmailrc
diff --git a/dotfiles_user_server/shinit_add b/dotfiles/user/server/shinit_add
similarity index 100%
rename from dotfiles_user_server/shinit_add
rename to dotfiles/user/server/shinit_add
diff --git a/dotfiles_user_server/shinit_color b/dotfiles/user/server/shinit_color
similarity index 100%
rename from dotfiles_user_server/shinit_color
rename to dotfiles/user/server/shinit_color
diff --git a/dotfiles_user_server/weechatrc b/dotfiles/user/server/weechatrc
similarity index 100%
rename from dotfiles_user_server/weechatrc
rename to dotfiles/user/server/weechatrc
diff --git a/dotfiles_user_thinkpad/i3/config b/dotfiles/user/thinkpad/i3/config
similarity index 100%
rename from dotfiles_user_thinkpad/i3/config
rename to dotfiles/user/thinkpad/i3/config
diff --git a/dotfiles_user_thinkpad/i3status.conf b/dotfiles/user/thinkpad/i3status.conf
similarity index 100%
rename from dotfiles_user_thinkpad/i3status.conf
rename to dotfiles/user/thinkpad/i3status.conf
diff --git a/dotfiles_user_thinkpad/pentadactylrc b/dotfiles/user/thinkpad/pentadactylrc
similarity index 100%
rename from dotfiles_user_thinkpad/pentadactylrc
rename to dotfiles/user/thinkpad/pentadactylrc
diff --git a/dotfiles_user_thinkpad/shinit_color b/dotfiles/user/thinkpad/shinit_color
similarity index 100%
rename from dotfiles_user_thinkpad/shinit_color
rename to dotfiles/user/thinkpad/shinit_color
diff --git a/dotfiles_user_thinkpad/xinitrc b/dotfiles/user/thinkpad/xinitrc
similarity index 100%
rename from dotfiles_user_thinkpad/xinitrc
rename to dotfiles/user/thinkpad/xinitrc
diff --git a/dotfiles_minimal/vimrc b/dotfiles/vimrc
similarity index 100%
rename from dotfiles_minimal/vimrc
rename to dotfiles/vimrc
diff --git a/symlink.sh b/symlink.sh
index f0e6345..332cd53 100755
--- a/symlink.sh
+++ b/symlink.sh
@@ -2,11 +2,11 @@
 
 set -x
 
-dir_minimal=~/config/dotfiles_minimal
-dir_user_minimal=~/config/dotfiles_user_minimal
-dir_user_thinkpad=~/config/dotfiles_user_thinkpad
-dir_user_server=~/config/dotfiles_user_server
-dir_root=~/config/dotfiles_root
+dir_minimal=~/config/dotfiles
+dir_user_minimal=~/config/dotfiles/user
+dir_user_thinkpad=~/config/dotfiles/user/thinkpad
+dir_user_server=~/config/dotfiles/user/server
+dir_root=~/config/dotfiles/root
 homedir=`echo ~`
 find ~ -lname $homedir'/config/*' -delete
 for file in `ls $dir_minimal`; do
-- 
2.30.2