Do not link xsession with xprofile

diff --git a/modules/awesome/config.dot/awesome.link/programs.lua b/modules/awesome/config.dot/awesome.link/programs.lua
index 89ebd3c1fffae8092474f6e455475f7775a3e269..b14083c51af2b2f3ca48560acdfebf0227f99127 100644 (file)
--- a/modules/awesome/config.dot/awesome.link/programs.lua
+++ b/modules/awesome/config.dot/awesome.link/programs.lua
@@ -1,2 +1,2 @@
 -- Put here all startup command declarations
-awful.util.spawn_with_shell("xwicd")
+--awful.util.spawn_with_shell("xwicd")

diff --git a/modules/profile/profile.dot.link b/modules/profile/profile.dot.link
index 3b71de0a612b75f709e90d5e7041c7b1dd97642a..ce2dd52dc1878ac867009153b838f6a69c846390 100644 (file)
--- a/modules/profile/profile.dot.link
+++ b/modules/profile/profile.dot.link
@@ -31,14 +31,14 @@ mkdir -p $TMP
 eval "`dircolors -b ~/.dircolorsrc`"
 
 # SSH Agent
-#if [ -e "$HOME/apps/scripts/ssh-agent-eval" ]; then
-#  $HOME/apps/scripts/ssh-agent-eval
-#fi
+if [ -e "$HOME/apps/scripts/ssh-agent-eval" ]; then
+  $HOME/apps/scripts/ssh-agent-eval
+fi
 
 # GPG Agent
-#if [ -e "$HOME/apps/scripts/gpg-agent-eval" ]; then
-#  $HOME/apps/scripts/gpg-agent-eval
-#fi
+if [ -e "$HOME/apps/scripts/gpg-agent-eval" ]; then
+  $HOME/apps/scripts/gpg-agent-eval
+fi
 
 # Remove lost found folder if empty
 if [ -d "$HOME/lost+found" ]; then

diff --git a/modules/profile/xinitrc.dot.link b/modules/profile/xinitrc.dot.link
index fdd35b10b7ac1971432bbcc7c6ce50ee7623cde6..2f0f702c3810cb53318588bc94847a0bd832f889 100644 (file)
--- a/modules/profile/xinitrc.dot.link
+++ b/modules/profile/xinitrc.dot.link
@@ -7,6 +7,4 @@
 source $HOME/.xprofile &
 
 # Run window manager
-#enlightenment
-#fluxbox
-awesome
+#awesome

diff --git a/modules/profile/xprofile.dot.link b/modules/profile/xprofile.dot.link
old mode 100755 (executable)
new mode 100644 (file)
index 7de56ea..e69de29
--- a/modules/profile/xprofile.dot.link
+++ b/modules/profile/xprofile.dot.link
@@ -1,63 +0,0 @@
-#!/bin/bash
-#
-# .xprofile: set basic X11 environment
-#
-
-# Background image
-BACKGROUND=""
-
-# Session applications
-PROGRAMS=""
-
-# OS Version
-OSVERSION="`cut -d . -f 1 /etc/debian_version`"
-
-# Hostname
-HOSTNAME="`cat /etc/hostname`"
-
-# Make sure to load the profile
-. $HOME/.profile
-
-# Start xscreensaver
-xscreensaver -no-splash &
-
-# Custom
-if [ -e "$HOME/.custom/xprofile" ]; then
-  . $HOME/.custom/xprofile
-fi
-
-# Set background
-if [ ! -z "$BACKGROUND" ]; then
-  Esetroot -scale $HOME/.config/themes/backgrounds/$BACKGROUND
-else
-  xsetroot -solid black
-fi
-
-# Additional applications depending on the machine type
-if laptop-detect; then
-  PROGRAMS="$PROGRAMS"
-else
-  PROGRAMS="$PROGRAMS"
-fi
-
-# Start session applications
-for program in $PROGRAMS; do
-  $program &
-done
-
-# Apply custom keyboard configuration
-if [ -f "$HOME/.Xmodmaps/$HOSTNAME" ]; then
-  xmodmap $HOME/.Xmodmaps/$HOSTNAME
-fi
-
-# Execute window manager
-if [ "$OSVERSION" = "7" ]; then
-  # See https://bugzilla.redhat.com/show_bug.cgi?id=783568
-  #     https://bugs.launchpad.net/ubuntu/+source/gnome-keyring/+bug/932177
-  #unset GNOME_KEYRING_PID
-  #unset GNOME_KEYRING_CONTROL
-  #eval $(gnome-keyring-daemon --start) &
-
-  # Start window manager
-  awesome
-fi

diff --git a/modules/profile/xsession.dot.link b/modules/profile/xsession.dot.link
deleted file mode 120000 (symlink)
index d381138f9fc7cccd2dc77d7fa677bd1989f557b6..0000000000000000000000000000000000000000
--- a/modules/profile/xsession.dot.link
+++ /dev/null
@@ -1 +0,0 @@
-xprofile.dot.link
\ No newline at end of file

diff --git a/modules/profile/xsession.dot.link b/modules/profile/xsession.dot.link
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..98b52258f727741e34ecd8113030a8dea29bbdcc
--- /dev/null
+++ b/modules/profile/xsession.dot.link
@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# .xsession: set basic X11 environment
+#
+
+# Background image
+BACKGROUND=""
+
+# Session applications
+PROGRAMS=""
+
+# OS Version
+OSVERSION="`cut -d . -f 1 /etc/debian_version`"
+
+# Hostname
+HOSTNAME="`cat /etc/hostname`"
+
+# Make sure to load the profile
+. $HOME/.profile
+
+# Start xscreensaver
+xscreensaver -no-splash &
+
+# Custom
+if [ -e "$HOME/.custom/xsession" ]; then
+  . $HOME/.custom/xsession
+fi
+
+# Set background
+if [ ! -z "$BACKGROUND" ]; then
+  Esetroot -scale $HOME/.config/themes/backgrounds/$BACKGROUND
+else
+  xsetroot -solid black
+fi
+
+# Additional applications depending on the machine type
+if laptop-detect; then
+  PROGRAMS="$PROGRAMS xwicd"
+else
+  PROGRAMS="$PROGRAMS"
+fi
+
+# Start session applications
+for program in $PROGRAMS; do
+  $program &
+done
+
+# Apply custom keyboard configuration
+if [ -f "$HOME/.Xmodmaps/$HOSTNAME" ]; then
+  xmodmap $HOME/.Xmodmaps/$HOSTNAME
+fi
+
+# Execute window manager
+if [ "$OSVERSION" = "7" ]; then
+  # See https://bugzilla.redhat.com/show_bug.cgi?id=783568
+  #     https://bugs.launchpad.net/ubuntu/+source/gnome-keyring/+bug/932177
+  unset GNOME_KEYRING_PID
+  unset GNOME_KEYRING_CONTROL
+  #eval $(gnome-keyring-daemon --start) &
+
+  # Start window manager
+  awesome
+fi