From 80436550ff876444cd6188614c844889fcc66ac0 Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Thu, 17 Mar 2022 12:10:58 +0000
Subject: [PATCH] Add ca+multix layout and French language files

---
 roles/fedora/tasks/packages-cli.yml | 1 +
 roles/home-gui/files/gnome-setup.sh | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/fedora/tasks/packages-cli.yml b/roles/fedora/tasks/packages-cli.yml
index b7b6ff5..0cc8f90 100644
--- a/roles/fedora/tasks/packages-cli.yml
+++ b/roles/fedora/tasks/packages-cli.yml
@@ -31,6 +31,7 @@
       - fossil
       - git
       - glibc-langpack-en
+      - glibc-langpack-fr
       - gnupg
       - hostname
       - ldns-utils
diff --git a/roles/home-gui/files/gnome-setup.sh b/roles/home-gui/files/gnome-setup.sh
index 21b962b..60cee05 100644
--- a/roles/home-gui/files/gnome-setup.sh
+++ b/roles/home-gui/files/gnome-setup.sh
@@ -21,7 +21,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'), ('xkb', 'gb')]"
+	gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'gb'), ('xkb', 'ca+multix')]"
 	gsettings set org.gnome.desktop.input-sources xkb-options "['lv3:ralt_switch', 'compose:caps', 'nbsp:level3n', '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']"
@@ -111,7 +111,7 @@ set_misc_preferences () {
 }
 set_misc_preferences
 
-if [ -x "$HOME/bin/reset-gnome-setup.local" ]
+if [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/reset-gnome-setup.local" ]
 then
-	. "$HOME/bin/reset-gnome-setup.local"
+	. "${XDG_CONFIG_HOME:-$HOME/.config}/reset-gnome-setup.local"
 fi