From a2ea57ad987166c612a675d2d150cc0c19d5f08b Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Fri, 5 Jun 2020 22:22:16 +0200
Subject: [PATCH] [X] Unify xresources, xdg, fontconfig modules

Removed modules for xdg folders and fontconfig setup, and unified it all
under the X heading, which now also houses the xresources module.
---
 {fontconfig => X}/.config/fontconfig/fonts.conf         | 0
 {xdg-user-dirs => X}/.config/user-dirs.dirs             | 0
 {xdg-user-dirs => X}/.config/user-dirs.locale           | 0
 {xresources => X}/.config/xresources/Xresources         | 1 +
 {xresources => X}/.config/xresources/Xresources.d/fonts | 0
 {xresources => X}/.config/xresources/xinitrc            | 0
 {xresources => X}/.local/bin/clip                       | 0
 7 files changed, 1 insertion(+)
 rename {fontconfig => X}/.config/fontconfig/fonts.conf (100%)
 rename {xdg-user-dirs => X}/.config/user-dirs.dirs (100%)
 rename {xdg-user-dirs => X}/.config/user-dirs.locale (100%)
 rename {xresources => X}/.config/xresources/Xresources (83%)
 rename {xresources => X}/.config/xresources/Xresources.d/fonts (100%)
 rename {xresources => X}/.config/xresources/xinitrc (100%)
 rename {xresources => X}/.local/bin/clip (100%)

diff --git a/fontconfig/.config/fontconfig/fonts.conf b/X/.config/fontconfig/fonts.conf
similarity index 100%
rename from fontconfig/.config/fontconfig/fonts.conf
rename to X/.config/fontconfig/fonts.conf
diff --git a/xdg-user-dirs/.config/user-dirs.dirs b/X/.config/user-dirs.dirs
similarity index 100%
rename from xdg-user-dirs/.config/user-dirs.dirs
rename to X/.config/user-dirs.dirs
diff --git a/xdg-user-dirs/.config/user-dirs.locale b/X/.config/user-dirs.locale
similarity index 100%
rename from xdg-user-dirs/.config/user-dirs.locale
rename to X/.config/user-dirs.locale
diff --git a/xresources/.config/xresources/Xresources b/X/.config/xresources/Xresources
similarity index 83%
rename from xresources/.config/xresources/Xresources
rename to X/.config/xresources/Xresources
index cd35b65..122fa17 100644
--- a/xresources/.config/xresources/Xresources
+++ b/X/.config/xresources/Xresources
@@ -9,3 +9,4 @@
 #include "Xresources.d/fonts"
 
 ! Colorscheme
+#include "Xresources.d/colorscheme"
diff --git a/xresources/.config/xresources/Xresources.d/fonts b/X/.config/xresources/Xresources.d/fonts
similarity index 100%
rename from xresources/.config/xresources/Xresources.d/fonts
rename to X/.config/xresources/Xresources.d/fonts
diff --git a/xresources/.config/xresources/xinitrc b/X/.config/xresources/xinitrc
similarity index 100%
rename from xresources/.config/xresources/xinitrc
rename to X/.config/xresources/xinitrc
diff --git a/xresources/.local/bin/clip b/X/.local/bin/clip
similarity index 100%
rename from xresources/.local/bin/clip
rename to X/.local/bin/clip