Move even more files to .config

Signed-off-by: Severin Kaderli <severin.kaderli@gmail.com>

system/.bash_profile

@@ -15,17 +15,17 @@ if [[ -f "${HOME}/.bashrc" ]]; then
     . "${HOME}/.bashrc"
 fi
 
-if [[ -f "${HOME}/.keyleds" ]]; then
-    . "${HOME}/.keyleds"
+if [[ -f "${XDG_CONFIG_HOME}/custom/keyleds" ]]; then
+    . "${XDG_CONFIG_HOME}/custom/keyleds"
 fi
 
 # Restore custom dconf configuration
-dconf load / < "${HOME}/.config/dconf/root.conf"
+dconf load / < "${XDG_CONFIG_HOME}/dconf/root.conf"
 
 # Activate correct crontab file
 crontab "${XDG_CONFIG_HOME}/cron/crontab"
 
 # If we are on tty1 we start the x-server
 if [ "$(tty)" = "/dev/tty1" ]; then
-    startx && exit
+    startx "${XDG_CONFIG_HOME}/X11/xinitrc" && exit
 fi

system/.bashrc

@@ -23,8 +23,8 @@ if [ -f "${HOME}/.env" ]; then
 fi
 
 # Enable color support of ls
-if [ -f "${HOME}/.dircolors" ]; then
-    dircolors -b "${HOME}/.dircolors" > /dev/null 2>&1
+if [ -f "${XDG_CONFIG_HOME}/custom/dircolors" ]; then
+    dircolors -b "${XDG_CONFIG_HOME}/custom/dircolors" > /dev/null 2>&1
 fi
 
 # Sourcing alias definitions

system/.config/X11/xinitrc

@@ -1,7 +1,7 @@
 #!/bin/bash
 # 
 # SCRIPT NAME:
-# .xinitrc
+# .config/X11/xinitrc
 #
 # AUTHOR:
 # Severin Kaderli <severin.kaderli@gmail.com>
@@ -11,5 +11,5 @@
 #
 # USAGE:
 # This script is executed when you start the x-server.
-. "${HOME}/.xsetup"
+. "${XDG_CONFIG_HOME}/X11/xsetup"
 i3

system/.config/X11/xsetup

@@ -1,7 +1,7 @@
 #!/bin/bash
 # 
 # SCRIPT NAME:
-# .xsetup
+# .config/X11/xsetup
 #
 # AUTHOR:
 # Severin Kaderli <severin.kaderli@gmail.com>
@@ -26,7 +26,7 @@ nm-applet &
 redshift &
 
 # Merge .Xresources on boot
-xrdb -merge "${HOME}/.Xresources"
+xrdb -merge "${XDG_CONFIG_HOME}/X11/xresources"
 
 # Start ibus
 #ibus-daemon -drx

system/.env

@@ -29,6 +29,8 @@ export PYLINTHOME="${XDG_CACHE_HOME}/pylint"
 export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
 export GTK_RC_FILES="${XDG_CONFIG_HOME}/gtk-1.0/gtkrc"
 export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
+export XINITRC="${XDG_CONFIG_HOME}/X11/xinitrc"
+export XSERVERRC="${XDG_CONFIG_HOME}/X11/xserverrc"
 
 # Bash
 export HISTCONTROL=ignoreboth

system/.xprofile

@@ -1,17 +0,0 @@
-#!/bin/bash
-# 
-# SCRIPT NAME:
-# .xprofile
-#
-# AUTHOR:
-# Severin Kaderli <severin.kaderli@gmail.com>
-#
-# DESCRIPTION:
-# This is the startup script when LightDM starts. Currently it sources .xsetup
-# and .bash_profile so it's almost the same as if you start the x-server
-# manually.
-#
-# USAGE:
-# This script is executed when LightDM starts.
-. "${HOME}/.xsetup"
-. "${HOME}/.bash_profile"