From 6ec1c2a7a21a47fef6e4d3834873bc7ebb431db9 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Sun, 16 Apr 2023 20:52:34 +0100 Subject: [PATCH 1/3] Use en_US by default --- roles/home-cli/files/profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile index 7390200..27ea052 100644 --- a/roles/home-cli/files/profile +++ b/roles/home-cli/files/profile @@ -25,7 +25,7 @@ if [ ! -d "$HOME/.local/bin" ] ; then install -d -m 0700 "$HOME/.local/bin" ; fi export TZ=Europe/London # Can override this elsewhere if needed. if ! [ -f "$XDG_CONFIG_HOME/locale.conf" ] && [ -x /usr/bin/locale ] then - LANG="C.UTF-8" /usr/bin/locale > "$XDG_CONFIG_HOME/locale.conf" + LANG="en_US.UTF-8" /usr/bin/locale > "$XDG_CONFIG_HOME/locale.conf" fi if [ -r "$XDG_CONFIG_HOME/locale.conf" ] then From dffe427054375c45988cf5033c36767c0dccbb7d Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Sun, 16 Apr 2023 20:59:39 +0100 Subject: [PATCH 2/3] Use Caps Lock as Compose again --- roles/home-gui/files/gnome-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/home-gui/files/gnome-setup.sh b/roles/home-gui/files/gnome-setup.sh index ecd9b62..6eb0357 100644 --- a/roles/home-gui/files/gnome-setup.sh +++ b/roles/home-gui/files/gnome-setup.sh @@ -22,7 +22,7 @@ set_favorites_bar set_keyboard_and_language () { gsettings set org.gnome.desktop.input-sources show-all-sources true gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us')]" - gsettings set org.gnome.desktop.input-sources xkb-options "['compose:ralt']" + gsettings set org.gnome.desktop.input-sources xkb-options "['compose:caps', 'shift:both_capslock']" gsettings set org.gnome.desktop.wm.keybindings switch-applications "['Tab']" gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['Tab']" gsettings set org.gnome.desktop.wm.keybindings switch-windows "['Tab']" From 0e54aecd61d1121138e59a80e712a011e947f06f Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Sun, 16 Apr 2023 21:34:30 +0100 Subject: [PATCH 3/3] Use C locale in containers --- roles/home-cli/files/profile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile index 27ea052..df37851 100644 --- a/roles/home-cli/files/profile +++ b/roles/home-cli/files/profile @@ -1,7 +1,7 @@ #!/bin/sh # Start from known core "C" locale. This will get overwritten later. -export LANG=C +export LANG=C.UTF-8 # Set up XDG variables. See: # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html @@ -23,11 +23,11 @@ if [ ! -d "$HOME/.local/bin" ] ; then install -d -m 0700 "$HOME/.local/bin" ; fi # Locale and language. ## Clear the existing locale settings and set options I always want. export TZ=Europe/London # Can override this elsewhere if needed. -if ! [ -f "$XDG_CONFIG_HOME/locale.conf" ] && [ -x /usr/bin/locale ] +if ! [ -f /run/.containerenv ] && ! [ -f "$XDG_CONFIG_HOME/locale.conf" ] && [ -x /usr/bin/locale ] then LANG="en_US.UTF-8" /usr/bin/locale > "$XDG_CONFIG_HOME/locale.conf" fi -if [ -r "$XDG_CONFIG_HOME/locale.conf" ] +if ! [ -f /run/.containerenv ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ] then . "$XDG_CONFIG_HOME/locale.conf" fi