luxferre/bananarchy
1
0
Fork 0
Code Issues Actions Activity

fix(system,x11): set system-wide TERM=xterm-256color and C.UTF-8 locale

Browse Source
This commit is contained in:
Luxferre
2026-10-21 00:16:33 +03:00
parent 262d1a3649
commit da24f0d9ac
22 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlay/rootfs/etc/locale.conf
+1
View File
@@ -0,0 +1 @@
LANG=C.UTF-8
overlay/rootfs/etc/profile
+5
View File
@@ -4,6 +4,11 @@ export EDITOR=nano
export VISUAL=nano
export PAGER="less -RXF"
export LESS="-RXF"
export TERM=xterm-256color
export CHARSET=UTF-8
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
export LC_COLLATE=C.UTF-8
umask 022
# use nicer PS1 for bash and busybox ash
overlay/rootfs/etc/profile.d/20locale.sh
+4
View File
@@ -0,0 +1,4 @@
export CHARSET=UTF-8
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
export LC_COLLATE=C.UTF-8
overlay/rootfs/etc/profile.d/sxmo_init.sh
+5
View File
@@ -109,6 +109,11 @@ _sxmo_load_environments() {
export VISUAL="${VISUAL:-nano}"
export PAGER="less -RXF"
export LESS="-RXF"
export TERM=xterm-256color
export CHARSET=UTF-8
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
export LC_COLLATE=C.UTF-8
export BROWSER="${BROWSER:-firefox}"
export SHELL="${SHELL:-/bin/sh}"
overlay/rootfs/etc/skel/.Xresources
+1
View File
@@ -16,6 +16,7 @@ dwm.selbordercolor: #005577
dwm.selfgcolor: #ffffff
st.font: Fira Code:pixelsize=18:style=Regular:antialias=true:autohint=true
st.termname: xterm-256color
st.background: #1c1c1c
st.foreground: #e5e5e5
st.cursorColor: #cccccc
overlay/rootfs/etc/skel/.config/sxmo/profile
+5
View File
@@ -75,6 +75,11 @@ export EDITOR="nano"
export VISUAL="nano"
export PAGER="less -RXF"
export LESS="-RXF"
export TERM="xterm-256color"
export CHARSET="UTF-8"
export LANG="C.UTF-8"
export LC_ALL="C.UTF-8"
export LC_COLLATE="C.UTF-8"
export SXMO_WM="dwm"
export SXMO_MENU="dmenu"
export SXMO_TERMINAL="st"
overlay/rootfs/etc/skel/.profile
+5
View File
@@ -4,6 +4,11 @@ export EDITOR=nano
export VISUAL=nano
export PAGER="less -RXF"
export LESS="-RXF"
export TERM=xterm-256color
export CHARSET=UTF-8
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
export LC_COLLATE=C.UTF-8
export SXMO_WM=dwm
export SXMO_MENU=dmenu
export SXMO_TERMINAL=st
overlay/rootfs/home/user/.Xresources
+1
View File
@@ -16,6 +16,7 @@ dwm.selbordercolor: #005577
dwm.selfgcolor: #ffffff
st.font: Fira Code:pixelsize=18:style=Regular:antialias=true:autohint=true
st.termname: xterm-256color
st.background: #1c1c1c
st.foreground: #e5e5e5
st.cursorColor: #cccccc
overlay/rootfs/home/user/.config/sxmo/profile
+5
View File
@@ -75,6 +75,11 @@ export EDITOR="nano"
export VISUAL="nano"
export PAGER="less -RXF"
export LESS="-RXF"
export TERM="xterm-256color"
export CHARSET="UTF-8"
export LANG="C.UTF-8"
export LC_ALL="C.UTF-8"
export LC_COLLATE="C.UTF-8"
export SXMO_WM="dwm"
export SXMO_MENU="dmenu"
export SXMO_TERMINAL="st"
overlay/rootfs/home/user/.profile
+5
View File
@@ -4,6 +4,11 @@ export EDITOR=nano
export VISUAL=nano
export PAGER="less -RXF"
export LESS="-RXF"
export TERM=xterm-256color
export CHARSET=UTF-8
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
export LC_COLLATE=C.UTF-8
export SXMO_WM=dwm
export SXMO_MENU=dmenu
export SXMO_TERMINAL=st
overlay/rootfs/usr/bin/bananarchy-x11-session.sh
+5
View File
@@ -21,6 +21,11 @@ export EDITOR=nano
export VISUAL=nano
export PAGER="less -RXF"
export LESS="-RXF"
export TERM=xterm-256color
export CHARSET=UTF-8
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
export LC_COLLATE=C.UTF-8
export SXMO_DISABLE_LEDS=1
export SXMO_NO_VIRTUAL_KEYBOARD=1
export NO_AT_BRIDGE=1
overlay/rootfs/usr/bin/st
BIN
View File
Binary file not shown.
overlay/rootfs/usr/bin/sxmo_terminal.sh
+5
View File
@@ -3,6 +3,11 @@
# Copyright 2022 Sxmo Contributors
# shellcheck disable=SC2086
export TERM=xterm-256color
export CHARSET=UTF-8
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
SXMO_TERMINAL="${SXMO_TERMINAL:-st}"
if [ -z "$*" ]; then
overlay/rootfs/usr/share/sxmo/appcfg/Xresources
+1
View File
@@ -16,6 +16,7 @@ dwm.selbordercolor: #005577
dwm.selfgcolor: #ffffff
st.font: Fira Code:pixelsize=18:style=Regular:antialias=true:autohint=true
st.termname: xterm-256color
st.background: #1c1c1c
st.foreground: #e5e5e5
st.cursorColor: #cccccc
overlay/rootfs/usr/share/sxmo/appcfg/profile_template
+5
View File
@@ -75,6 +75,11 @@ export EDITOR="nano"
export VISUAL="nano"
export PAGER="less -RXF"
export LESS="-RXF"
export TERM="xterm-256color"
export CHARSET="UTF-8"
export LANG="C.UTF-8"
export LC_ALL="C.UTF-8"
export LC_COLLATE="C.UTF-8"
export SXMO_WM="dwm"
export SXMO_MENU="dmenu"
export SXMO_TERMINAL="st"
overlay/rootfs/usr/share/sxmo/default_hooks/sxmo_hook_contextmenu.sh
+1 -1
View File
@@ -191,7 +191,7 @@ case "$WMCLASS" in
"
WINNAME=St
;;
st|st-*|*terminal*|org.gnome.vte.application|org.gnome.vte.app.gtk4|*alacritty*)
st|st-*|xterm*|*terminal*|org.gnome.vte.application|org.gnome.vte.app.gtk4|*alacritty*)
# These git commands only launch the editor.
case "$WMNAME" in
prebuilt/sxmo-x11/usr/bin/st
BIN
View File
Binary file not shown.
scripts/configure-rootfs-from-scratch.sh
+1 -1
View File
@@ -214,7 +214,7 @@ ff02::2 ipv6-allrouters
ff02::3 ipv6-allhosts
EOF
echo "LANG=en_US.UTF-8" > "$ROOTFS/etc/locale.conf"
echo "LANG=C.UTF-8" > "$ROOTFS/etc/locale.conf"
if [ -f "$ROOTFS/usr/share/zoneinfo/UTC" ]; then
cp "$ROOTFS/usr/share/zoneinfo/UTC" "$ROOTFS/etc/localtime"
echo "UTC" > "$ROOTFS/etc/timezone"
src/sxmo-st/config.def.h
+1 -1
View File
@@ -74,7 +74,7 @@ static unsigned int cursorthickness = 2;
static int bellvolume = 0;
/* default TERM value */
char *termname = "st-256color";
char *termname = "xterm-256color";
/*
* spaces per tab
src/sxmo-st/config.h
+1 -1
View File
@@ -74,7 +74,7 @@ static unsigned int cursorthickness = 2;
static int bellvolume = 0;
/* default TERM value */
char *termname = "st-256color";
char *termname = "xterm-256color";
/*
* spaces per tab
src/sxmo-st/st.c
+8
View File
@@ -715,6 +715,14 @@ execsh(char *cmd, char **args)
setenv("SHELL", sh, 1);
setenv("HOME", pw->pw_dir, 1);
setenv("TERM", termname, 1);
setenv("CHARSET", "UTF-8", 1);
setenv("LANG", "C.UTF-8", 1);
setenv("LC_ALL", "C.UTF-8", 1);
setenv("LC_COLLATE", "C.UTF-8", 1);
setenv("EDITOR", "nano", 0);
setenv("VISUAL", "nano", 0);
setenv("PAGER", "less -RXF", 0);
setenv("LESS", "-RXF", 0);
signal(SIGCHLD, SIG_DFL);
signal(SIGHUP, SIG_DFL);
src/sxmo-st/x.c
+2 -2
View File
@@ -881,8 +881,8 @@ xclear(int x1, int y1, int x2, int y2)
void
xhints(void)
{
XClassHint class = {opt_name ? opt_name : termname,
opt_class ? opt_class : termname};
XClassHint class = {opt_name ? opt_name : "st-256color",
opt_class ? opt_class : "st-256color"};
XWMHints wm = {.flags = InputHint, .input = 1};
XSizeHints *sizeh;