From 072249d5d4dd431c97465b76bb09e4368ec85bca Mon Sep 17 00:00:00 2001
From: Ben Reaves <rbreaves@gmail.com>
Date: Wed, 5 Feb 2020 00:12:44 -0600
Subject: [PATCH] - Corrected chromebook config file and updated the
 initialization of the keyswap service file to work when re-running the
 installer on a currently running version of kinto

---
 defaults.json      | 8 ++++----
 keyswap_service.sh | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/defaults.json b/defaults.json
index df83f75..8ea15a6 100644
--- a/defaults.json
+++ b/defaults.json
@@ -49,7 +49,7 @@
 		"type":"chromebook",
 		"active": false,
 		"description":"Standard Chromebook Keyboards",
-		"gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.chromebook.gui $DISPLAY",
+		"gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
 		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY",
 		"xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)",
 		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)",
@@ -62,9 +62,9 @@
 		"type":"chromebook",
 		"active": false,
 		"description":"Chromebook with Windows 104 Keyboard",
-		"gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.chromebook.gui $DISPLAY; setxkbmap -device $usbid -option altwin:ctrl_alt_win",
+		"gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY; setxkbmap -device $usbid -option altwin:ctrl_alt_win",
 		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY",
-		"fallbackgui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.chromebook.gui $DISPLAY",
+		"fallbackgui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
 		"xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)",
 		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",
@@ -76,7 +76,7 @@
 		"type":"chromebook",
 		"active": false,
 		"description":"Chromebook with Mac Keyboard",
-		"gui":"setxkbmap -option;setxkbmap -option ctrl:swap_lwin_lctl; xkbcomp -w0 -i $internalid -I$HOME/.xkb ~/.xkb/keymap/kbd.chromebook.gui $DISPLAY",
+		"gui":"setxkbmap -option;setxkbmap -option ctrl:swap_lwin_lctl; xkbcomp -w0 -i $internalid -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
 		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY",
 		"xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)",
 		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)",
diff --git a/keyswap_service.sh b/keyswap_service.sh
index 8e0d807..fef6436 100755
--- a/keyswap_service.sh
+++ b/keyswap_service.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+systemctl --user stop keyswap >/dev/null 2>&1
+systemctl --user disable keyswap >/dev/null 2>&1
 swapcmd="\/bin\/bash\ \/home\/`whoami`\/.config\/kinto\/xactive.sh"
 mkdir -p ~/.config/systemd/user
 mkdir -p ~/.config/autostart
@@ -10,4 +12,5 @@ cp ./system-config/xactive.sh ~/.config/kinto/xactive.sh
 sed -i "s/{username}/`whoami`/g" ~/.config/systemd/user/keyswap.service
 sed -i "s/ExecStart=/ExecStart=${swapcmd}/g" ~/.config/systemd/user/keyswap.service
 systemctl --user enable keyswap.timer
-systemctl --user start keyswap.timer
\ No newline at end of file
+systemctl --user start keyswap.timer
+systemctl --user start keyswap
\ No newline at end of file