From 4478c5bec3f8726204be35a96d0302c45743e29d Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 16 Mar 2017 10:55:55 -0300
Subject: Updates provisioning

---
 provision/desktop-basic                            | 51 ++++------------------
 provision/files/desktop-basic/etc/default/keyboard | 10 +++++
 .../files/desktop-basic/home/user/.custom/xsession | 22 ++++++++++
 3 files changed, 40 insertions(+), 43 deletions(-)
 create mode 100644 provision/files/desktop-basic/etc/default/keyboard
 create mode 100644 provision/files/desktop-basic/home/user/.custom/xsession

diff --git a/provision/desktop-basic b/provision/desktop-basic
index 773bfba..24c71af 100755
--- a/provision/desktop-basic
+++ b/provision/desktop-basic
@@ -29,20 +29,6 @@ APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
 # Ensure we are in the user home folder
 cd
 
-# Configure keyboard
-cat <<-EOF | sudo tee /etc/default/keyboard > /dev/null
-# KEYBOARD CONFIGURATION FILE
-
-# Consult the keyboard(5) manual page.
-
-XKBMODEL="abnt2"
-XKBLAYOUT="br"
-XKBVARIANT="thinkpad"
-XKBOPTIONS="compose:ralt,terminate:ctrl_alt_bksp"
-
-BACKSPACE="guess"
-EOF
-
 # Dependencies
 sudo sed -i -e "s|main$|main contrib non-free|g" /etc/apt/sources.list
 sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get autoremove -y && sudo apt-get clean
@@ -59,39 +45,18 @@ apps/inception init
 apps/inception load-bundle desktop-basic
 apps/inception deps-bundle desktop-basic
 
-# Environment
-$APT_INSTALL lightdm ratpoison awesome firefox-esr chromium torbrowser-launcher
+# Additional packages
+$APT_INSTALL lightdm firefox-esr chromium torbrowser-launcher
 
-# Configuration
+# System-wide configuration
 sudo cp $DIRNAME/files/desktop-basic/etc/lightdm/lightdm.conf /etc/lightdm/lightdm.conf
+sudo cp $DIRNAME/files/desktop-basic/etc/default/keyboard     /etc/default/keyboard
 
-mkdir -p .custom
-
-if [ ! -e ".custom/xsession" ]; then
-cat <<-EOF | tee .custom/xsession > /dev/null
-#
-# Custom X11 session config
-#
-WINDOW_MANAGER="ratpoison"
-PROGRAMS="\$PROGRAMS terminal"
-
-#
-# Set screen size
-#
-
-# On stretch onwards Virtual-0 was renamed to Virtual-0
-# Modeline determined by running "cvt 1280 780"
-xrandr --newmode "1280x780_60.00"   81.50  1280 1352 1480 1680  780 783 793 810 -hsync +vsync
-xrandr --addmode Virtual-0 1280x780_60.00
-
-# Modeline determined by running "cvt 1368 748"
-xrandr --newmode "1368x748_60.00"   83.00  1368 1440 1576 1784  748 751 761 777 -hsync +vsync
-xrandr --addmode Virtual-0 1368x748_60.00
+# User configuration
+mkdir -p $HOME/.custom
 
-# Set default modeline
-#xrandr --output Virtual-0 --mode 1368x748_60.00
-xrandr --output Virtual-0 --mode 1280x780_60.00
-EOF
+if [ ! -e "$HOME/.custom/xsession" ]; then
+  cp $DIRNAME/files/desktop-basic/home/user/.custom/xsession $HOME/.custom/xsession
 fi
 
 # Mozilla configuration
diff --git a/provision/files/desktop-basic/etc/default/keyboard b/provision/files/desktop-basic/etc/default/keyboard
new file mode 100644
index 0000000..f18fc73
--- /dev/null
+++ b/provision/files/desktop-basic/etc/default/keyboard
@@ -0,0 +1,10 @@
+# KEYBOARD CONFIGURATION FILE
+
+# Consult the keyboard(5) manual page.
+
+XKBMODEL="abnt2"
+XKBLAYOUT="br"
+XKBVARIANT="thinkpad"
+XKBOPTIONS="compose:ralt,terminate:ctrl_alt_bksp"
+
+BACKSPACE="guess"
diff --git a/provision/files/desktop-basic/home/user/.custom/xsession b/provision/files/desktop-basic/home/user/.custom/xsession
new file mode 100644
index 0000000..97ef73d
--- /dev/null
+++ b/provision/files/desktop-basic/home/user/.custom/xsession
@@ -0,0 +1,22 @@
+#
+# Custom X11 session config
+#
+WINDOW_MANAGER="ratpoison"
+PROGRAMS="\$PROGRAMS terminal"
+
+#
+# Set screen size
+#
+
+# On stretch onwards Virtual-0 was renamed to Virtual-0
+# Modeline determined by running "cvt 1280 780"
+xrandr --newmode "1280x780_60.00"   81.50  1280 1352 1480 1680  780 783 793 810 -hsync +vsync
+xrandr --addmode Virtual-0 1280x780_60.00
+
+# Modeline determined by running "cvt 1368 748"
+xrandr --newmode "1368x748_60.00"   83.00  1368 1440 1576 1784  748 751 761 777 -hsync +vsync
+xrandr --addmode Virtual-0 1368x748_60.00
+
+# Set default modeline
+#xrandr --output Virtual-0 --mode 1368x748_60.00
+xrandr --output Virtual-0 --mode 1280x780_60.00
-- 
cgit v1.2.3