From 4c95a9d2eb1f0f533d2ca7e5172a5d2005407ef7 Mon Sep 17 00:00:00 2001
From: Ben Reaves <rbreaves@gmail.com>
Date: Sun, 2 Feb 2020 16:46:20 -0600
Subject: [PATCH] - Updated files to create service for kintox11

---
 keyswap_service.sh                   |  44 ++++++---------------------
 kintox11/binary/kintox11_ubuntu19-10 | Bin 236168 -> 236168 bytes
 kintox11/src/kintox11.c              |   2 +-
 system-config/keyswap.service        |   2 +-
 user_config.json                     |   2 +-
 5 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/keyswap_service.sh b/keyswap_service.sh
index a18a9cc..0f41f93 100755
--- a/keyswap_service.sh
+++ b/keyswap_service.sh
@@ -1,36 +1,12 @@
 #!/bin/bash
 
-swapbehavior=$1
-noswapcmd=$2
-
-systemtype=$3
-internalid=$4
-usbid=$5
-chromeswap=$6
-
-if [[ "$swapbehavior" == "1" ]]; then
-	swapcmd="\/bin\/bash\ \/home\/`whoami`\/.config\/xactive.sh\ ${systemtype}\ ${internalid}\ ${usbid}\ ${chromeswap}"
-	mkdir -p ~/.config/systemd/user
-	mkdir -p ~/.config/autostart
-	cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service
-	cp ./system-config/keyswap.sh ~/.config/autostart/keyswap.sh
-	cp ./system-config/xactive.sh ~/.config/xactive.sh
-	cp ./system-config/keyswap_toggle.sh ~/.config/keyswap_toggle.sh
-	cp ./kintox11/binary/kintox11_ubuntu19-10 ~/.config/kintox11
-	cp ./kintox11/binary/kinto.json ~/.config/kinto.json
-	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
-	systemctl --user start keyswap
-else
-	#/usr/bin/setxkbmap
-	#/usr/bin/xkbcomp
-	#echo $XDG_SESSION_TYPE
-	if [ ! -f "~/.Xsession" ]; then
-		echo "$noswapcmd" > ~/.Xsession
-	fi
-	grep "xkb" ~/.Xsession 1>/dev/null
-	if [ $? -eq 1 ]; then
-		echo "$noswapcmd" >> ~/.Xsession
-	fi
-fi
\ No newline at end of file
+swapcmd="\/bin\/bash\ \/home\/`whoami`\/.config\/kinto\/kintox11"
+mkdir -p ~/.config/systemd/user
+mkdir -p ~/.config/autostart
+cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service
+cp ./system-config/keyswap.sh ~/.config/autostart/keyswap.sh
+cp ./kintox11/binary/kintox11_ubuntu19-10 ~/.config/kinto/kintox11
+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
+systemctl --user start keyswap
\ No newline at end of file
diff --git a/kintox11/binary/kintox11_ubuntu19-10 b/kintox11/binary/kintox11_ubuntu19-10
index fed97216cc9616a8407fd41139f62929f9eff4f2..6320156ba346b896548e0b5c7320de4f74a86fb2 100755
GIT binary patch
delta 1243
zcmY*XYfzL`82+BK3oO?~z))CRN{C%RK$zt^T$fltaFvmYjQdT-&{EUT85t)Va2lyR
z<>4|VwNloPWIe(sP+6e{mD5Z*Wm7n0VuFcXn1(Xh&d1gi-;d{g&hvind)~`wAMj}(
z@agYW1^CV^i=MBw1=$A6{KrluUhU{u>CaEA4timhr}(<5QA4u>0@1?D0vZF+M?Z?v
z;RSkC;2wTAs>TI@v|?=rzNN1Uw9)U@zD`{B)7JQ4e9e2}i5j!?wL~4x(UHUoG|`}>
zB1H1WBp=`}zB{=UI7WX@DZqA~l^O;_^ZK+C1kZAxj9~%?AI}Pf$UT$&uDGWwM~^@0
zP);l^(rLl_sk>PZN{s?{(*l8Iw8<QeNP5(4!W{kF9EETAy!j0TW^R?F={1i?l2)H9
zNyBPMlJXCm!l?bB&A3Fp^K8&kdtS0gKa*FuYNSb$ZqiaodcG)3^W3=hpvB>E48s}p
zA}z5zh-TVi(Zfo+EIOFzpe2%s=B`=7wKH2JX_wc(KTpv6@>B5=-I#x2`9z~6eUcmI
zrQ|6{Ik!tED)@p&7gPZ|=;6XjX!z~I7-(+PDaEDVrmKq@HG7<g9(tt6p?R`)(Q|@!
z6;I+RzIS~%5$oyQP>Ths-sr#rSC`!Jgb$r7uf;p`(Ta7bpvNn$iX!j>np<hbHu|!_
zRrGqL2?;c)>J(Pfi&eq+gHBiJF+ts{_4t??tFyFI*8jJ1g+5cA6=W1z{-HZJz0$-$
z_b&W57GM5lburOgD_SfuibvGB5nST24M*>Xj$ddyV(@%=XZ?=K+U?sKni_d|e>!-t
z{lg^j%&MnPy1Lic#aP7G!dL#>rq!1Ib2MO+yUNARPdYwT5f{6>PX#p;azKr@6~dxj
zaa|Go+z_L}Z!FsbMoh7-ikW7wcpx0JY{UbR*uZXh;DGRL@f6~e+~J9CSBx^FAIun)
zoBgoU6PM-hLr_PQjFwQuFOq!^AYqa8he4yl4{Rs`#UjwnfO`DMnhmgui{CfE$Wo2)
zV!s-&O5DB7C`!1+(iAhx>V<K-yN!5kkqt&-y-Mr9v{ku$4f24`*zp*g!5Ax#72%w<
z3Bz=8(6Y0!NMLyiLmYzf9t(*RuI@PauuXB$vBzVDt5tEGmwSXjaD|<TM+7G1$#^sq
zLhQ_HLOvGcP7_WOZQRlV*yd#1)8;M}<;E1;RW`ut((#jGOENI0OesGTqsnmFymKIX
z=aBR1xXgaBksx-qmH5i{TFJvJL^ncN!7@6DpS-`5q<UhW4cSO=$b7$Z?Z?Inon-ks
zr}dCj^RftPhl<!G7W$P4Z|Ebw?5$Gb&opm}MB{zriA=FhB{iMArIt&kNaDcXlB$)c

delta 1233
zcmY*XYfzL`82+BKD=f=pl@JIPmU0o6+ae8D2LzUO7lbxROGmi{v=CA`Fiq*$jx!Wq
z25UI!ff|zp%bGElj`#sa7fXyLoQbC4j|CPbSY{zPG-%uTpr-hKJn#EH=e*B*Ip6-i
zfc<>|?k-hO%PSZ3YRl<`;8p3a&27W}iMOJf_*qqpAEtTcN^doG(7d1!H1Tag&JY}@
zpTz5NfPN=%7hi~fd<9m~@^v}*h8`1mj9yvyCh_d0u9R?m#a~Y$YE08N()9R{o=+=B
zH4RHIhLJnd1AyE7*$fxZNpEKsqMqkw8G*IDcKs=Wy*waikl;@~k{bn~eLe3zQKvKC
zfH^vlZ^k7$Bm8%%kHvsCY7+PiEfn|&t+yn=NRL`l@hkn(5|6L>yyXN!G8-gmCh;*z
z(isXQX;3XmlD#c8lJ-8h9i!CW+6^DtYt0by*R4g7ef5$wO}9wWp<<)v#SvYL&ExS5
zVkzk$Ew!zMlRj@VppbUj^f1$Nwm7m-N58j4>!#`?soC$}%i}cIo`pknlYMygxKolY
z6&U>#ox;q|n)RZC5uQ+33GAe8MHL|YMo|(plQl|n+1KcrVy9-;QgDQ}7ke~MRxh5M
zpq(X?XyCgaiYDTDx*o2^JXLS<V4kZ>Z~8(*=gO+lL${W1#8%o<?ob$k{j{LMfjauC
zz)(6>k%~kbR{1_6=xAj)Zqb=a1IDROl>r}6Q&p~R!twu6#^`fZxnXMrXFqUr+HbvB
z=<dJ%TZ@*DRh1CUmEy$~qj^k?H^C@3KXLRv1oPq6_Sh8-^-ncF&8ywnXjgghuHKK+
z#XnXxbH>YON3Yn4_?q~=zqRUgj(@^fZ1z!k-29B^3l;IW<vl8>p*Z{0ct>$qf)}O~
zBG4O2D%@asT9`1w8Wi&bJEBE2rrCKd;!wnX(qf-DtMe7)gnZZ+uX$mJnF3+KklYxE
zCSP2ZuSTGTD2lcyq%1mn?#Ba*j@t;03g5DU7?g-a?^x90Dr<~|Llhp0T`YV}7}g&H
z9W$5^&JLU4$E+qqiY{tRi#J|2iL?p%4->YjbpFc+mCF)g1un9lB=q9~D>I9f)2vl7
zZq{o?9(&0ww2_Q(oMREmf*)WuVVFKy@GikKYcc}lQz9f7WBn<J!MHq`f<{8_xS1mr
zcFfBisW?k?am%Z-?HRbM%UMp!&P*&Q%V#y&_(id$Iha!xWZ!^KmA$n3=R@|-Cl|AE
znf=~P!q`VHvQob5B9DfOQ3Mmpaym$${6YuG^2ID0=qBM2v+kuAKmK{qlCyf_lGRG8
sSy?3Q2ktB-*PJAQ?CmY&9;SIq$c&sMJ2!}TRD|i|&uY2!N0Qd}H(o%a!~g&Q

diff --git a/kintox11/src/kintox11.c b/kintox11/src/kintox11.c
index f5fb0a5..793ca59 100644
--- a/kintox11/src/kintox11.c
+++ b/kintox11/src/kintox11.c
@@ -128,7 +128,7 @@ int main(void){
 
   size_t i,n,r; 
 
-  fp = fopen("kinto.json","r");
+  fp = fopen("user_config.json","r");
   fread(buffer, 10240, 1, fp);
   fclose(fp);
 
diff --git a/system-config/keyswap.service b/system-config/keyswap.service
index 2834351..b7e3bd6 100755
--- a/system-config/keyswap.service
+++ b/system-config/keyswap.service
@@ -8,7 +8,7 @@ Type=simple
 #Group={username}
 Environment=DISPLAY=:0
 Restart=always
-WorkingDirectory=/home/{username}/.config/
+WorkingDirectory=/home/{username}/.config/kinto
 ExecStart=
 
 [Install]
diff --git a/user_config.json b/user_config.json
index f2b974c..4b2516a 100644
--- a/user_config.json
+++ b/user_config.json
@@ -30,7 +30,7 @@
 		"active": false,
 		"name":"gnome-term",
 		"description":"Gnome - Terminal - Superkey+Space opens Activities Overview",
-		"run":"gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Super>Space']\""
+		"run":"gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Control><Shift>Space']\""
 	},
 	{
 		"id": 3,