Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
commit
ff32e19231
2 changed files with 5 additions and 5 deletions
|
@ -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="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" ]
|
||||
if ! [ -f /run/.containerenv ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]
|
||||
then
|
||||
. "$XDG_CONFIG_HOME/locale.conf"
|
||||
fi
|
||||
|
|
|
@ -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 "['<Super>Tab']"
|
||||
gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['<Shift><Super>Tab']"
|
||||
gsettings set org.gnome.desktop.wm.keybindings switch-windows "['<Alt>Tab']"
|
||||
|
|
Loading…
Reference in a new issue