diff options
Diffstat (limited to 'share/provision')
| -rw-r--r-- | share/provision/debian/files/desktop-basic/home/user/.custom/xsession | 11 | ||||
| -rwxr-xr-x | share/provision/debian/openbox | 8 |
2 files changed, 14 insertions, 5 deletions
diff --git a/share/provision/debian/files/desktop-basic/home/user/.custom/xsession b/share/provision/debian/files/desktop-basic/home/user/.custom/xsession index ee206e0..157c4e2 100644 --- a/share/provision/debian/files/desktop-basic/home/user/.custom/xsession +++ b/share/provision/debian/files/desktop-basic/home/user/.custom/xsession @@ -36,9 +36,13 @@ sleep 8 # Startup programs if [ "$HOSTNAME" = "web" ]; then - PROGRAMS="$PROGRAMS tor-browser" + PROGRAMS="terminal-session-chooser" +elif [ "$HOSTNAME" = "tor" ]; then + PROGRAMS="$PROGRAMS tint2 tor-browser" elif [ "$HOSTNAME" = "vnc" ]; then PROGRAMS="$PROGRAMS vnc" +elif [ -e "$HOME/apps/local/startup" ]; then + PROGRAMS="$PROGRAMS startup" else PROGRAMS="$PROGRAMS terminal" fi @@ -46,3 +50,8 @@ fi # Fix keyboard layout if needed # https://wiki.debian.org/Keyboard #setxkbmap -model abnt2 -layout br -variant thinkpad + +# Local customizations +if [ -e "$HOME/.custom/xsession-$HOSTNAME" ]; then + . "$HOME/.custom/xsession-$HOSTNAME" +fi diff --git a/share/provision/debian/openbox b/share/provision/debian/openbox index 821369b..5288f4e 100755 --- a/share/provision/debian/openbox +++ b/share/provision/debian/openbox @@ -38,9 +38,9 @@ fi if [ -f "$HOME/.custom/xsession" ]; then sed -i -e 's/^WINDOW_MANAGER=.*$/WINDOW_MANAGER="openbox"/' $HOME/.custom/xsession - echo "" > $HOME/.custom/xsession - echo '# Custom config' >> $HOME/.custom/xsession - echo 'PROGRAMS="$PROGRAMS tint2"' >> $HOME/.custom/xsession + #echo "" >> $HOME/.custom/xsession + #echo '# Custom config' >> $HOME/.custom/xsession + #echo 'PROGRAMS="$PROGRAMS tint2"' >> $HOME/.custom/xsession cat <<-EOF > $HOME/.custom/xsession-ready #!/bin/bash @@ -48,7 +48,7 @@ if [ -f "$HOME/.custom/xsession" ]; then # xsession-ready: runs after the X11 session is ready # -# Fix the background color due to window resize +# Fix the background color due to window resize in kvmx guests running openbox sleep 20 xsetroot -solid '#1C1C1C' EOF |