Commit caaf719d authored by mntmn's avatar mntmn

Merge branch 'mmdebstrap' into 'main'

(Probably) final changes for first release

See merge request reform/reform-system-image!13
parents b71f647d 3ba23dba
......@@ -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
......
......@@ -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
......
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.
......@@ -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 SUPER+ENTER.
To go to a workspace, press SUPER+1 to SUPER+9.
......@@ -18,9 +17,11 @@ To find a program by typing its name, press SUPER+D.
To configure the network, click on NET 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:
gedit ~/.config/sway/config.
To learn more about the command line, enter: reform-help.
This help can be reached by entering: reform-desktop-help.
Read the MNT Reform handbook in a browser: reform-handbook.
......@@ -15,6 +15,7 @@ List hardware/peripherals: lsblk
lspci
ip a
View this message again: reform-help
Read the Operator Handbook: reform-handbook (press % to fix contrast, Q to quit)
Set keyboard layout and timezone: reform-config
Chat in Reform community: reform-chat
Select boot device: reform-boot-config
......@@ -26,5 +27,6 @@ View a text file: less filename
Edit a text file: micro filename
Log out: exit
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.
......@@ -9,9 +9,10 @@ Afterwards, to be able to become root by using sudo, enter:
adduser your-name sudo
Then, log out using exit and log in as your-name.
Then, log out using exit and log in as your-name.
To learn more about GNU/Linux, enter:
To read the MNT Reform Operator Handbook, enter:
man intro
reform-handbook # (in the browser, press %
# to fix contrast, Q to quit)
......@@ -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
......
......@@ -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"
},
......
/**
* 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;
}
//! ------------------------------------------------------------------------------
//! 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;
}
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment