diff --git a/reform2-imx8mq/mkuserland.sh b/reform2-imx8mq/mkuserland.sh
index d55bd078da182f7ba284dd39289f76d4ca5f138a..c0f57159c307c8ab693260ebdc7b1d23be876d40 100755
--- a/reform2-imx8mq/mkuserland.sh
+++ b/reform2-imx8mq/mkuserland.sh
@@ -74,7 +74,7 @@ dpkg --configure -a
apt update
apt install -y apt apt-utils gnupg ca-certificates
-apt install -y cpio bsdmainutils init-system-helpers procps gpgv debian-archive-keyring readline-common cron netbase iproute2 ifupdown isc-dhcp-client iptables iputils-ping locales less net-tools curl wget nano micro vim coreutils parted file git sudo console-setup console-data unicode-data kbd gpm systemd libpam-systemd systemd-sysv bash-completion ncurses-term alsa-utils brightnessctl usbutils pciutils fbset netcat-traditional nfacct traceroute wpasupplicant htop ncdu ntpdate ntp screen tmux telnet lm-sensors rfkill dosfstools e2fsprogs
+apt install -y cpio bsdmainutils init-system-helpers procps gpgv debian-archive-keyring readline-common cron netbase iproute2 ifupdown isc-dhcp-client iptables iputils-ping locales less net-tools curl wget nano micro vim coreutils parted file git sudo console-setup console-data unicode-data kbd gpm systemd libpam-systemd systemd-sysv bash-completion ncurses-term alsa-utils brightnessctl brightness-udev usbutils pciutils fbset netcat-traditional nfacct traceroute wpasupplicant htop ncdu ntpdate ntp screen tmux telnet lm-sensors rfkill dosfstools e2fsprogs
# add MNT Research/Reform apt repository
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 376511EB67AD7BAF
@@ -82,8 +82,8 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 376511EB67AD7BAF
echo "deb https://mntre.com/reform-debian sid/" >>/etc/apt/sources.list
apt update
-# install essential MNT Reform system management scripts
-apt install -y reform-tools
+# install essential MNT Reform system management scripts and docs
+apt install -y reform-tools reform-handbook
apt install -y sway grim slurp xwayland xterm xfce4-terminal rofi arc-theme thunar policykit-1 libblockdev-dm2 libblockdev-crypto2 gnome-disk-utility cryptsetup gnome-system-monitor eog evince mpv gedit engrampa connman-gtk gnome-icon-theme breeze-icon-theme fonts-noto-color-emoji lxpolkit mesa-utils w3m man-db pulseaudio pavucontrol python3-psutil ircii
diff --git a/reform2-imx8mq/mkuserland3.sh b/reform2-imx8mq/mkuserland3.sh
index 4281ba73168fac199e55056b06c956473be7c80d..454d480ba2869236b1b273d7e032646ef4c964e2 100755
--- a/reform2-imx8mq/mkuserland3.sh
+++ b/reform2-imx8mq/mkuserland3.sh
@@ -20,7 +20,7 @@ export LANG=C
# install applications
-apt install -y libreoffice libreoffice-gtk3 inkscape firefox-esr emacs gimp wmaker
+apt install -y libreoffice libreoffice-gtk3 inkscape firefox-esr emacs gimp wmaker x11-utils
apt install -y chromium evolution freecad ardour sxiv neverball scummvm dosbox wf-recorder wev linphone-desktop
# install patched software from mntre
diff --git a/reform2-imx8mq/reform-tools_1.0-4/DEBIAN/control b/reform2-imx8mq/reform-tools_1.0-5/DEBIAN/control
similarity index 91%
rename from reform2-imx8mq/reform-tools_1.0-4/DEBIAN/control
rename to reform2-imx8mq/reform-tools_1.0-5/DEBIAN/control
index ca014710cc0bdb29152bd400a1cf420750c01beb..9e5d5197b13cb9d0d4d43cdb1e40a655f319ebd9 100644
--- a/reform2-imx8mq/reform-tools_1.0-4/DEBIAN/control
+++ b/reform2-imx8mq/reform-tools_1.0-5/DEBIAN/control
@@ -1,9 +1,10 @@
Package: reform-tools
-Version: 1.0-4
+Version: 1.0-5
Section: base
Priority: required
Architecture: arm64
Depends: bash
+Recommends: reform-handbook
Maintainer: Lukas F. Hartmann <lukas@mntre.com>
Description: MNT Reform System Tools
A number of scripts for managing boot media, displays, standby, plus a few help texts and gadgets for the customized sway desktop. Also contains /sbin/reform-init, a boot manager script that gets loaded by u-boot and which in turn launches the real /sbin/init after mounting an (encrypted) boot medium.
diff --git a/reform2-imx8mq/reform-tools_1.0-4/etc/reform-desktop-help b/reform2-imx8mq/reform-tools_1.0-5/etc/reform-desktop-help
similarity index 83%
rename from reform2-imx8mq/reform-tools_1.0-4/etc/reform-desktop-help
rename to reform2-imx8mq/reform-tools_1.0-5/etc/reform-desktop-help
index 2485b356c5f660377fc533c504fd9a051a59790e..861dd727aa9c54c7107f14536cf0dcbdbcedbc4e 100644
--- a/reform2-imx8mq/reform-tools_1.0-4/etc/reform-desktop-help
+++ b/reform2-imx8mq/reform-tools_1.0-5/etc/reform-desktop-help
@@ -3,7 +3,6 @@ Windows don't normally float around. Instead, a new window occupies
the full screen or a division of the screen. For example, if you
open another window now, both windows will take half of the screen.
-This terminal is autostarted near the end of the sway config.
To open another terminal, press [1mSUPER+ENTER[0m.
To go to a workspace, press [1mSUPER+1[0m to [1mSUPER+9[0m.
@@ -18,9 +17,11 @@ To find a program by typing its name, press [1mSUPER+D[0m.
To configure the network, click on [1mNET[0m in the title bar.
-You can make windows float, split vertically or be ordered as
-tabs and more. Check out the sway configuration file:
+You can make windows float, split vertically and more.
+Check out the sway configuration file:
[1mgedit ~/.config/sway/config[0m.
To learn more about the command line, enter: [1mreform-help[0m.
This help can be reached by entering: [1mreform-desktop-help[0m.
+Read the MNT Reform handbook in a browser: [1mreform-handbook[0m.
+
diff --git a/reform2-imx8mq/reform-tools_1.0-4/etc/reform-help b/reform2-imx8mq/reform-tools_1.0-5/etc/reform-help
similarity index 90%
rename from reform2-imx8mq/reform-tools_1.0-4/etc/reform-help
rename to reform2-imx8mq/reform-tools_1.0-5/etc/reform-help
index accd1b2f425d511b6aefb4ed4ad20ee9e0b0f830..022c6aee9a7ae9c8d3f3c0d756241b0fd172bcdf 100644
--- a/reform2-imx8mq/reform-tools_1.0-4/etc/reform-help
+++ b/reform2-imx8mq/reform-tools_1.0-5/etc/reform-help
@@ -15,6 +15,7 @@ List hardware/peripherals: [1mlsblk[0m
[1mlspci[0m
[1mip a[0m
View this message again: [1mreform-help[0m
+Read the Operator Handbook: [1mreform-handbook[0m (press % to fix contrast, Q to quit)
Set keyboard layout and timezone: [1mreform-config[0m
Chat in Reform community: [1mreform-chat[0m
Select boot device: [1mreform-boot-config[0m
@@ -26,5 +27,6 @@ View a text file: [1mless[0m [1;4mfilename[0m
Edit a text file: [1mmicro[0m [1;4mfilename[0m
Log out: [1mexit[0m
-Most programs can be quit with Ctrl+C or Q.
+Most programs can be quit with Ctrl+C, Q, or Ctrl+Q.
Exit the chat with /quit.
+
diff --git a/reform2-imx8mq/reform-tools_1.0-4/etc/reform-root-help b/reform2-imx8mq/reform-tools_1.0-5/etc/reform-root-help
similarity index 59%
rename from reform2-imx8mq/reform-tools_1.0-4/etc/reform-root-help
rename to reform2-imx8mq/reform-tools_1.0-5/etc/reform-root-help
index 22c147b8845c4661446faa8e12fd5384e872fd79..0835a5542345e12c4c23384f38ceea5094cee44a 100644
--- a/reform2-imx8mq/reform-tools_1.0-4/etc/reform-root-help
+++ b/reform2-imx8mq/reform-tools_1.0-5/etc/reform-root-help
@@ -9,9 +9,10 @@ Afterwards, to be able to become root by using sudo, enter:
[1madduser [1;4myour-name[0m [1msudo[0m
-Then, log out using exit and log in as [1;4myour-name[0m.
+Then, log out using [1mexit[0m and log in as [1;4myour-name[0m.
-To learn more about GNU/Linux, enter:
+To read the MNT Reform Operator Handbook, enter:
- [1mman intro[0m
+ [1mreform-handbook[0m # (in the browser, press %
+ # to fix contrast, Q to quit)
diff --git a/reform2-imx8mq/reform-tools_1.0-5/lib/systemd/system-shutdown/reform-poweroff b/reform2-imx8mq/reform-tools_1.0-5/lib/systemd/system-shutdown/reform-poweroff
new file mode 100755
index 0000000000000000000000000000000000000000..0a33fceefb72825f385b29f958b630e9c7c5b6a2
--- /dev/null
+++ b/reform2-imx8mq/reform-tools_1.0-5/lib/systemd/system-shutdown/reform-poweroff
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+sync
+echo 'xPWR0' > /dev/hidraw0
+
+
diff --git a/reform2-imx8mq/reform-tools_1.0-4/sbin/reform-init b/reform2-imx8mq/reform-tools_1.0-5/sbin/reform-init
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/sbin/reform-init
rename to reform2-imx8mq/reform-tools_1.0-5/sbin/reform-init
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-chat b/reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-chat
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-chat
rename to reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-chat
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-compstat.py b/reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-compstat.py
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-compstat.py
rename to reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-compstat.py
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-compstat.sh b/reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-compstat.sh
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-compstat.sh
rename to reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-compstat.sh
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-connman-gtk.sh b/reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-connman-gtk.sh
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-connman-gtk.sh
rename to reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-connman-gtk.sh
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-desktop-help b/reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-desktop-help
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-desktop-help
rename to reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-desktop-help
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-help b/reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-help
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-help
rename to reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-help
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-pavucontrol.sh b/reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-pavucontrol.sh
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/bin/reform-pavucontrol.sh
rename to reform2-imx8mq/reform-tools_1.0-5/usr/bin/reform-pavucontrol.sh
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-boot-config b/reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-boot-config
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-boot-config
rename to reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-boot-config
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-config b/reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-config
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-config
rename to reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-config
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-display-config b/reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-display-config
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-display-config
rename to reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-display-config
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-hw-setup.sh b/reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-hw-setup.sh
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-hw-setup.sh
rename to reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-hw-setup.sh
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-migrate b/reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-migrate
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-migrate
rename to reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-migrate
diff --git a/reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-standby b/reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-standby
similarity index 100%
rename from reform2-imx8mq/reform-tools_1.0-4/usr/sbin/reform-standby
rename to reform2-imx8mq/reform-tools_1.0-5/usr/sbin/reform-standby
diff --git a/reform2-imx8mq/template-skel/.config/sway/config b/reform2-imx8mq/template-skel/.config/sway/config
index 5e52800de5f575ec24c100c5b538475c7182b648..d42341845aae0872308d3c2fa457c47bed7be86f 100644
--- a/reform2-imx8mq/template-skel/.config/sway/config
+++ b/reform2-imx8mq/template-skel/.config/sway/config
@@ -18,7 +18,7 @@ set $term xfce4-terminal
# Your preferred application launcher
# Note: it's recommended that you pass the final command to sway
#set $menu dmenu_path | dmenu | xargs swaymsg exec --
-set $menu rofi -show run -font "Inter Bold Italic 32" -theme base16-atelier-cave | xargs swaymsg exec --
+set $menu rofi -show drun -font "Inter Bold 24" -display-drun "" -theme mnt-reform | xargs swaymsg exec --
#xwayland disable
diff --git a/reform2-imx8mq/template-skel/.config/waybar/config b/reform2-imx8mq/template-skel/.config/waybar/config
index 67f097f36fdf7db51e203d7e451869011593a613..cfb595bb543bbd3df4884a465ea9d819c897540e 100644
--- a/reform2-imx8mq/template-skel/.config/waybar/config
+++ b/reform2-imx8mq/template-skel/.config/waybar/config
@@ -6,7 +6,7 @@
// Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/mode", "sway/window"],
"modules-center": [],
- "modules-right": ["tray", "network", "custom/stat", "memory", "temperature", "pulseaudio", "clock", "tray"],
+ "modules-right": ["tray", "network", "custom/stat", "memory", "temperature", "pulseaudio", "clock"],
"sway/window": {
"on-click": "xfce4-appfinder"
},
@@ -42,7 +42,7 @@
"format-wifi": "NET {essid} {signalStrength}%",
"format-ethernet": "NET {ifname}: {ipaddr}/{cidr}",
"format-linked": "NET {ifname} NO IP",
- "format-disconnected": "OFFLINE",
+ "format-disconnected": "NET ×",
//"format-alt": "NET {ifname}: {ipaddr}/{cidr}"
"on-click": "reform-connman-gtk.sh"
},
diff --git a/reform2-imx8mq/template-skel/.local/share/rofi/themes/base16-atelier-cave.rasi b/reform2-imx8mq/template-skel/.local/share/rofi/themes/base16-atelier-cave.rasi
deleted file mode 100644
index ca2c84228a76f96396e47ce073e0afddd40ad9bf..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/rofi/themes/base16-atelier-cave.rasi
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Base16 Atelier Cave ROFI Color theme
- *
- * Authors
- * Scheme: Bram de Haan (http://atelierbramdehaan.nl)
- * Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
- */
-
-* {
- red: rgba ( 190, 70, 120, 100 % );
- blue: rgba ( 87, 109, 219, 100 % );
- lightfg: rgba ( 226, 223, 231, 100 % );
- lightbg: rgba ( 38, 35, 42, 100 % );
- foreground: rgba ( 139, 135, 146, 100 % );
- background: rgba ( 25, 23, 28, 100 % );
- background-color: rgba ( 25, 23, 28, 0 % );
- separatorcolor: @foreground;
- border-color: @foreground;
- selected-normal-foreground: @lightbg;
- selected-normal-background: @lightfg;
- selected-active-foreground: @background;
- selected-active-background: @blue;
- selected-urgent-foreground: @background;
- selected-urgent-background: @red;
- normal-foreground: @foreground;
- normal-background: @background;
- active-foreground: @blue;
- active-background: @background;
- urgent-foreground: @red;
- urgent-background: @background;
- alternate-normal-foreground: @foreground;
- alternate-normal-background: @lightbg;
- alternate-active-foreground: @blue;
- alternate-active-background: @lightbg;
- alternate-urgent-foreground: @red;
- alternate-urgent-background: @lightbg;
- spacing: 2;
-}
-window {
- background-color: @background;
- border: 1;
- padding: 5;
-}
-mainbox {
- border: 0;
- padding: 0;
-}
-message {
- border: 1px dash 0px 0px ;
- border-color: @separatorcolor;
- padding: 1px ;
-}
-textbox {
- text-color: @foreground;
-}
-listview {
- fixed-height: 0;
- border: 2px dash 0px 0px ;
- border-color: @separatorcolor;
- spacing: 2px ;
- scrollbar: true;
- padding: 2px 0px 0px ;
-}
-element {
- border: 0;
- padding: 1px ;
-}
-element normal.normal {
- background-color: @normal-background;
- text-color: @normal-foreground;
-}
-element normal.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
-}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
-}
-element selected.active {
- background-color: @selected-active-background;
- text-color: @selected-active-foreground;
-}
-element alternate.normal {
- background-color: @alternate-normal-background;
- text-color: @alternate-normal-foreground;
-}
-element alternate.urgent {
- background-color: @alternate-urgent-background;
- text-color: @alternate-urgent-foreground;
-}
-element alternate.active {
- background-color: @alternate-active-background;
- text-color: @alternate-active-foreground;
-}
-scrollbar {
- width: 4px ;
- border: 0;
- handle-color: @normal-foreground;
- handle-width: 8px ;
- padding: 0;
-}
-sidebar {
- border: 2px dash 0px 0px ;
- border-color: @separatorcolor;
-}
-button {
- spacing: 0;
- text-color: @normal-foreground;
-}
-button selected {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-inputbar {
- spacing: 0px;
- text-color: @normal-foreground;
- padding: 1px ;
- children: [ prompt,textbox-prompt-colon,entry,case-indicator ];
-}
-case-indicator {
- spacing: 0;
- text-color: @normal-foreground;
-}
-entry {
- spacing: 0;
- text-color: @normal-foreground;
-}
-prompt {
- spacing: 0;
- text-color: @normal-foreground;
-}
-textbox-prompt-colon {
- expand: false;
- str: ":";
- margin: 0px 0.3000em 0.0000em 0.0000em ;
- text-color: inherit;
-}
diff --git a/reform2-imx8mq/template-skel/.local/share/rofi/themes/mnt-reform.rasi b/reform2-imx8mq/template-skel/.local/share/rofi/themes/mnt-reform.rasi
new file mode 100644
index 0000000000000000000000000000000000000000..5602d38eefb81c9164098ceb424a2167794bc677
--- /dev/null
+++ b/reform2-imx8mq/template-skel/.local/share/rofi/themes/mnt-reform.rasi
@@ -0,0 +1,28 @@
+//! ------------------------------------------------------------------------------
+//! ROFI MNT Reform Color theme
+//! User: MNT Research GmbH
+//! ------------------------------------------------------------------------------
+
+* {
+ background-color: #000000;
+ text-color: #ffffff;
+}
+
+prompt {
+ text-color: #000000;
+ font-size: 0;
+}
+
+window {
+ padding: 32px;
+}
+
+element normal {
+ text-color: #ffffff;
+}
+
+element selected {
+ background-color: #ffffff;
+ text-color: #000000;
+}
+
diff --git a/reform2-imx8mq/template-skel/bin/reform-windowmaker b/reform2-imx8mq/template-skel/bin/reform-windowmaker
index 676968ccd5d202ffe5d5f1a4e1d5996950c9aaae..36957f842f9be63323841989da1b9d7667d607ca 100755
--- a/reform2-imx8mq/template-skel/bin/reform-windowmaker
+++ b/reform2-imx8mq/template-skel/bin/reform-windowmaker
@@ -8,14 +8,26 @@
# exec xfce4-session
#
-cage -- /usr/local/bin/Xwayland -retro &
-sleep 2
+DNUM=:0
+
+cage -- /usr/local/bin/Xwayland $DNUM -retro -noreset &
+
+export DISPLAY=$DNUM
+
+# idea lifted from https://gist.github.com/tullmann/476cc71169295d5c3fe6
+MAX=10
+CT=0
+while ! xdpyinfo >/dev/null 2>&1; do
+ sleep 0.50s
+ CT=$(( CT + 1 ))
+ if [ "$CT" -ge "$MAX" ]; then
+ LOG "FATAL: $0: Gave up waiting for X server $DISPLAY"
+ exit 11
+ fi
+done
export WAYLAND_DISPLAY=null # Hack, but works
-export DISPLAY=:0
export GDK_BACKEND=x11
unset SDL_VIDEODRIVER
-xterm &
-
exec wmaker