diff --git a/src/cdm b/src/cdm index 26ecd38..630474a 100755 --- a/src/cdm +++ b/src/cdm @@ -39,23 +39,14 @@ sysclientrc=/etc/X11/xinit/xinitrc # userserverrc=$HOME/.xserverrc # sysserverrc=/etc/X11/xinit/xserverrc -# Source cdm configuration -if [[ -f /etc/X11/cdm/cdmrc ]]; then - source /etc/X11/cdm/cdmrc - count=0 - while [[ ${count} -lt ${#userconfig[@]} ]]; do - if [[ "$USER" == "${userconfig[${count}]}" ]]; then - ${userconfig[${count}]} - fi - let count=count+1 - done - countfrom=${countfrom:-0} - cktimeout=${cktimeout:-30} -else - eerror "A valid cdm configuration was not found!" - ewarn "Logging out." - sleep 3 - exit 1 +# Source cdm configurations. + +if [[ -n "$1" ]]; then + source "$1" +elif [[ -f "$HOME/.cdmrc" ]]; then + source "$HOME/.cdmrc" +elif [[ -f /etc/cdmrc ]]; then + source /etc/cdmrc fi # Offer all available sessions in /etc/X11/Sessions diff --git a/src/cdmrc b/src/cdmrc index 6861853..8c9259b 100644 --- a/src/cdmrc +++ b/src/cdmrc @@ -32,34 +32,6 @@ suspendcommand='sudo pm-suspend' allowhibernate=no hibernatecommand='sudo pm-hibernate' -# Set configuration for specific users? -userconfig=(courtney) - -########################## -### USER CONFIGURATION ### -########################## - -courtney() { - # Set CDM theme - theme=lime - - # List user allowed WM binary names - wmbinlist=(openbox-session) - - # List user allowed WM display names - wmdisplist=(Openbox) - - # Allow console login? - allowconsole=yes - - # Allow shutdown? - allowshutdown=no - - # Set specific display for user - # (Not honored unless locktty=yes) - # display=1 -} - ############################ ### SYSTEM CONFIGURATION ### ############################