From eb49a4859f007930293da4f5505940ca10338b57 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 22 Feb 2020 22:36:21 -0600 Subject: [PATCH 01/43] - Fixed apt-get to update before installing packages --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 8cd370e..d425aa8 100755 --- a/setup.py +++ b/setup.py @@ -50,13 +50,12 @@ if len(pkgm) == 0: pkgm += " install -y " else: pkgm += " install -y " + pkgm = "apt-get update && sudo " + pkgm if len(pkgm) == 0: pkgm = cmdline("which pacman 2>/dev/null").strip() if len(pkgm) > 0: pkgm += " -S " -else: - print("hello") if len(pkgm) == 0: From 324e4d83c6e8e1ab6fe4c19742a58dcc4ce4f0cb Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 23 Feb 2020 17:16:49 -0600 Subject: [PATCH 02/43] - Added file that contains references to symbol names --- references/symbol_names.txt | 1411 +++++++++++++++++++++++++++++++++++ 1 file changed, 1411 insertions(+) create mode 100644 references/symbol_names.txt diff --git a/references/symbol_names.txt b/references/symbol_names.txt new file mode 100644 index 0000000..0c2c517 --- /dev/null +++ b/references/symbol_names.txt @@ -0,0 +1,1411 @@ +name[Group1]=English (US) +TLDE=grave,asciitilde +AE01=1,exclam +AE02=2,at +AE03=3,numbersign +AE04=4,dollar +AE05=5,percent +AE06=6,asciicircum +AE07=7,ampersand +AE08=8,asterisk +AE09=9,parenleft +AE10=0,parenright +AE11=minus,underscore +AE12=equal,plus +AD01=q,Q +AD02=w,W +AD03=e,E +AD04=r,R +AD05=t,T +AD06=y,Y +AD07=u,U +AD08=i,I +AD09=o,O +AD10=p,P +AD11=racketleft,braceleft +AD12=racketright,braceright +AC01=a,A +AC02=s,S +AC03=d,D +AC04=f,F +AC05=g,G +AC06=h,H +AC07=j,J +AC08=k,K +AC09=l,L +AC10=semicolon,colon +AC11=apostrophe,quotedbl +AB01=z,Z +AB02=x,X +AB03=c,C +AB04=v,V +AB05=b,B +AB06=n,N +AB07=m,M +AB08=comma,less +AB09=period,greater +AB10=slash,question +BKSL=ackslash,bar + +hidden partial alphanumeric_keys +xkb_symbols=media_common +I01=XF86AudioMedia +I10=XF86AudioPrev +I19=XF86AudioNext +I20=XF86AudioMute +I22=XF86AudioPlay, XF86AudioPause +I24=XF86AudioStop, XF86Eject +I2E=XF86AudioLowerVolume +I30=XF86AudioRaiseVolume +K5A=XF86Eject +K6C=XF86Eject + +hidden partial alphanumeric_keys +xkb_symbols=nav_common +I21=XF86Calculator +I32=XF86WWW +I65=XF86Search +I66=XF86Favorites +I67=XF86Reload +I68=XF86Stop +I69=XF86Forward +I6A=XF86Back +I6B=XF86MyComputer +I6C=XF86Mail +I6D=XF86AudioMedia + +hidden partial alphanumeric_keys +xkb_symbols=acpi_common +I5E=XF86PowerOff +I5F=XF86Standby +I63=XF86WakeUp +I74=XF86Battery +I76=XF86WLAN +I16=XF86Sleep + +partial alphanumeric_keys +xkb_symbols=evdev +MUTE=XF86AudioMute +VOL-=XF86AudioLowerVolume +VOL+=XF86AudioRaiseVolume +POWR=XF86PowerOff +STOP=Cancel +AGAI=Redo +PROP=SunProps +UNDO=Undo +FRNT=SunFront +COPY=XF86Copy +OPEN=XF86Open +PAST=XF86Paste +FIND=Find +CUT=XF86Cut +HELP=Help +LNFD=Linefeed + + +HKTG=Hiragana_Katakana +HENK=Henkan +MUHE=Muhenkan +KATA=Katakana +HIRA=Hiragana +RO=Romaji + +HNGL=Hangul +HJCV=Hangul_Hanja +FK21=XF86TouchpadToggle +FK22=XF86TouchpadOn +FK23=XF86TouchpadOff +FK20=XF86AudioMicMute +I126=plusminus +I128=XF86LaunchA +I147=XF86MenuKB +I148=XF86Calculator +I150=XF86Sleep +I151=XF86WakeUp +I152=XF86Explorer +I153=XF86Send +I155=XF86Xfer +I156=XF86Launch1 +I157=XF86Launch2 +I158=XF86WWW +I159=XF86DOS +I160=XF86ScreenSaver +I161=XF86RotateWindows +I162=XF86TaskPane +I163=XF86Mail +I164=XF86Favorites +I165=XF86MyComputer +I166=XF86Back +I167=XF86Forward +I169=XF86Eject +I170=XF86Eject, XF86Eject +I171=XF86AudioNext +I172=XF86AudioPlay, XF86AudioPause +I173=XF86AudioPrev +I174=XF86AudioStop, XF86Eject +I175=XF86AudioRecord +I176=XF86AudioRewind +I177=XF86Phone +I179=XF86Tools +I180=XF86HomePage +I181=XF86Reload +I182=XF86Close +I185=XF86ScrollUp +I186=XF86ScrollDown +I187=parenleft +I188=parenright +I189=XF86New +I190=Redo +I192=XF86LaunchA +I193=XF86LaunchC +I194=XF86LaunchD +I195=XF86LaunchE +I196=XF86LaunchF +I208=XF86AudioPlay +I209=XF86AudioPause +I210=XF86Launch3 +I211=XF86Launch4 +I212=XF86LaunchB +I213=XF86Suspend +I214=XF86Close +I215=XF86AudioPlay +I216=XF86AudioForward +I218=Print +I220=XF86WebCam +I223=XF86Mail +I225=XF86Search +I227=XF86Finance +I229=XF86Shop +I231=Cancel +I232=XF86MonBrightnessDown +I233=XF86MonBrightnessUp +I234=XF86AudioMedia +I235=XF86Display +I239=XF86Send +I240=XF86Reply +I241=XF86MailForward +I242=XF86Save +I243=XF86Documents +I244=XF86Battery +I245=XF86Bluetooth +I246=XF86WLAN +FK13=XF86Tools +FK14=XF86Launch5 +FK15=XF86Launch6 +FK16=XF86Launch7 +FK17=XF86Launch8 +FK18=XF86Launch9 + + + +partial alphanumeric_keys +xkb_symbols=airkey +I13=XF86AudioNext +I15=XF86AudioPlay, XF86AudioPause +I16=XF86Mail +I18=XF86AudioPrev +I19=XF86AudioMute +I24=XF86WWW +I26=XF86AudioLowerVolume +I2D=XF86AudioRaiseVolume +I2F=XF86Terminal +I31=XF86AudioStop, XF86Eject + +partial alphanumeric_keys +xkb_symbols=acer_c300 +I17=F14 +I1F=F13 +I20=XF86AudioMute +I2E=XF86AudioLowerVolume +I30=XF86AudioRaiseVolume +I5E=XF86Launch2 +I75=Help +IR7C=XF86Launch1 + +partial alphanumeric_keys +xkb_symbols=acer_ferrari4k +I24=dollar +I25=EuroSign +I26=XF86Display +I70=Help +I71=XF86Launch1 +I72=XF86Launch2 +I73=XF86Launch3 +I74=XF86Launch4 + +partial alphanumeric_keys +xkb_symbols=acer_laptop + + + + + +partial alphanumeric_keys +xkb_symbols=azonaRF2300 +I02=XF86HomePage +I17=XF86AudioStop +I1E=XF86AudioRaiseVolume +I1F=XF86AudioPlay, XF86AudioPause +I22=XF86AudioNext +I24=XF86AudioPrev +I25=XF86AudioLowerVolume +I26=XF86AudioMute +I3C=XF86Copy +I78=XF86Cut + + + +partial alphanumeric_keys +xkb_symbols=brother +I10=XF86ScrollUp +I12=XF86AudioPlay, XF86AudioPause +I17=XF86AudioPrev +I18=XF86ScrollDown +I19=XF86ZoomOut +I1E=XF86AudioMute +I21=XF86WWW +I22=Menu +I23=XF86AudioStop +I24=XF86Calculator +I25=XF86Xfer +I26=XF86Mail +I2E=XF86AudioNext +I30=XF86AudioRaiseVolume +I32=XF86ZoomIn +I68=XF86AudioLowerVolume + + + +partial alphanumeric_keys +xkb_symbols=btc5113rf +I10=XF86AudioStop +I12=XF86AudioMute +I19=XF86AudioPlay, XF86AudioPause +I1E=XF86AudioRaiseVolume +I20=XF86Favorites +I21=XF86Eject +I22=XF86AudioPrev +I24=XF86AudioNext +I25=XF86AudioLowerVolume +I26=XF86Back +I30=XF86WWW +I32=XF86Search + +partial alphanumeric_keys +xkb_symbols=btc9000 +I10=XF86AudioStop +I12=XF86AudioMute +I19=XF86AudioPlay, XF86AudioPause +I1E=XF86AudioRaiseVolume +I20=XF86Favorites +I21=XF86AudioMedia +I22=XF86AudioPrev +I24=XF86AudioNext +I25=XF86AudioLowerVolume +I26=XF86Reload +I2E=XF86Mail +I30=XF86HomePage +I32=XF86Search + +partial alphanumeric_keys +xkb_symbols=btc9000a +I10=XF86AudioStop +I12=XF86AudioMute +I19=XF86AudioPlay, XF86AudioPause +I1E=XF86AudioRaiseVolume +I20=XF86Favorites +I21=XF86Eject +I22=XF86AudioPrev +I24=XF86AudioNext +I25=XF86AudioLowerVolume +I26=XF86HomePage +I2E=Help +I30=XF86WWW +I32=XF86Search + +xkb_symbols=btc9001ah +I02=XF86HomePage +I17=XF86AudioStop +I1E=XF86AudioRaiseVolume +I1F=XF86AudioPlay, XF86AudioPause +I22=XF86AudioNext +I24=XF86AudioPrev +I25=XF86AudioLowerVolume +I26=XF86AudioMute +I6C=XF86Mail +RWIN=XF86Eject + +partial alphanumeric_keys +xkb_symbols=btc5090 +I26=XF86Start +I33=XF86Eject + +partial alphanumeric_keys +xkb_symbols=btc9019u +FK17=XF86Search +I02=XF86HomePage + + + +partial alphanumeric_keys +xkb_symbols=cherryblue +FK16=XF86Reload +I02=XF86HomePage +I17=XF86AudioStop +I1E=XF86AudioRaiseVolume +I1F=XF86AudioPlay, XF86AudioPause +I22=XF86AudioNext +I24=XF86AudioPrev +I25=XF86AudioLowerVolume +I26=XF86AudioMute +I63=XF86Standby +PRSC=XF86Terminal +IR7C=XF86Go + +partial alphanumeric_keys +xkb_symbols=cherryblueb +FK16=XF86Reload +I02=XF86HomePage +I07=XF86Forward +I08=XF86Back +I0A=XF86Copy +I0B=XF86ScrollUp +I12=XF86ScrollDown +I17=XF86Cut +I18=XF86Paste +I1E=XF86AudioRaiseVolume +I25=XF86AudioLowerVolume +I26=XF86AudioMute +I2C=XF86Book +I32=XF86Finance +I63=XF86Standby +I67=XF86AudioRewind +I70=XF86Eject +I71=XF86Book +I72=XF86Book +PRSC=XF86Terminal +IR7C=XF86Go + +partial alphanumeric_keys +xkb_symbols=cherrybluea +I6D=XF86Go + +partial alphanumeric_keys +xkb_symbols=cherrycyboard +FK17=XF86Search +I02=XF86HomePage +K67=XF86Terminal +IR7C=XF86AudioMedia + +partial alphanumeric_keys +xkb_symbols=cherrycmexpert +FK15=XF86Mail + + + +partial alphanumeric_keys +xkb_symbols=chicony +I12=XF86AudioMute +I17=XF86Mail +I19=XF86AudioLowerVolume +I1E=XF86Forward +I20=XF86AudioNext +I21=XF86AudioPlay, XF86AudioPause +I22=XF86AudioPrev +I23=XF86AudioRaiseVolume +I24=XF86AudioStop +I25=XF86Back +I26=XF86LaunchB +I2E=XF86LaunchC +I30=XF86LaunchA +I32=XF86WWW +I5F=XF86ContrastAdjust +I63=XF86BrightnessAdjust + +partial alphanumeric_keys +xkb_symbols=chicony0108 + +partial alphanumeric_keys +xkb_symbols=chicony0420 +I01=XF86AudioMedia +K67=XF86MyComputer + +partial alphanumeric_keys +xkb_symbols=chicony9885 +I12=XF86AudioMute +I17=XF86Mail +I19=XF86AudioLowerVolume +I1E=XF86Forward +I20=XF86AudioNext +I21=XF86AudioPlay, XF86AudioPause +I22=XF86AudioPrev +I23=XF86AudioRaiseVolume +I24=XF86AudioStop +I25=XF86Back +I26=XF86LaunchB +I2E=XF86LaunchC +I30=XF86LaunchA +I32=XF86WWW + + + +partial alphanumeric_keys +xkb_symbols=compaqeak8 +I13=XF86Community +I14=XF86Market +I15=XF86Meeting +I1A=XF86Search +I1B=XF86News +I1E=XF86Mail +I1F=XF86HomePage +I23=XF86WWW + +partial alphanumeric_keys +xkb_symbols=compaqik7 +I12=XF86LightBulb +I1E=XF86Mail +I21=XF86Search +I23=Help +I25=XF86VendorHome +I26=XF86HomePage +I32=XF86Shop + +partial alphanumeric_keys +xkb_symbols=compaqik13 +I1E=XF86Mail +I1F=XF86Go +I21=XF86Search +I23=XF86WWW +I32=XF86Shop + +partial alphanumeric_keys +xkb_symbols=compaqik18 +I12=XF86LightBulb +I18=XF86Eject +I1E=XF86Mail +I1F=XF86Go +I21=XF86Search +I23=XF86WWW +I25=XF86VendorHome +I26=XF86Community +I32=XF86Shop +I68=Print + +partial alphanumeric_keys +xkb_symbols=armada +I1A=XF86Search +I1E=XF86Mail +I1F=XF86HomePage +I23=XF86WWW +I6F=XF86AudioMedia + +partial alphanumeric_keys +xkb_symbols=presario +I14=XF86Q +I18=XF86Launch2 +I1E=XF86Mail +I1F=XF86Launch1 +I23=XF86WWW +I32=XF86Shop +I75=XF86AudioMedia + +partial alphanumeric_keys +xkb_symbols=ipaq +FK16=XF86Shop +I02=XF86Standby +I65=XF86Search +I66=XF86Travel +I69=XF86BackForward +I6A=XF86Q +I6C=XF86Mail + + + +partial alphanumeric_keys +xkb_symbols=dell +I12=XF86Mail +I1E=XF86Search +I26=XF86HomePage + +partial alphanumeric_keys +xkb_symbols=dellm65 +I04=XF86PowerOff +LWIN=Super_L + +partial alphanumeric_keys +xkb_symbols=inspiron +I02=XF86AudioStop +I04=XF86AudioNext +I21=XF86Eject +I56=XF86Display +IR7D=XF86AudioPrev +IR7C=XF86AudioPlay, XF86AudioPause + +partial alphanumeric_keys +xkb_symbols=dellusbmm +I02=XF86HomePage +K67=XF86MyComputer +IR7C=XF86AudioMedia + + + +partial alphanumeric_keys +xkb_symbols=diamond +I6D=XF86Go + + + +partial alphanumeric_keys +xkb_symbols=ennyah_dkb1008 +IR7C=XF86AudioMedia + + + +partial alphanumeric_keys +xkb_symbols=genius +I12=XF86AudioRaiseVolume +I17=XF86Calculator +I19=XF86AudioLowerVolume +I1E=XF86Forward +I21=XF86AudioNext +I23=XF86AudioPrev +I25=XF86Back +I26=XF86ScreenSaver +I2E=XF86Mail +I30=XF86Eject +I32=XF86WWW + +partial alphanumeric_keys +xkb_symbols=geniuscomfy2 +I23=Return + + + +partial alphanumeric_keys +xkb_symbols=gyration +FK16=XF86Reload +I02=XF86HomePage +I17=XF86AudioStop +I1E=XF86AudioRaiseVolume +I1F=XF86AudioPlay, XF86AudioPause +I22=XF86AudioNext +I24=XF86AudioPrev +I25=XF86AudioLowerVolume +I26=XF86AudioMute + + + +partial alphanumeric_keys +xkb_symbols=hpi6 +I02=XF86HomePage +I12=XF86Search +I14=XF86VendorHome +I15=XF86Community +I16=XF86AudioMedia +I18=XF86Eject +I1E=XF86Shop +I1F=XF86Launch1 +I26=Help +I27=XF86Finance +I39=Print +I75=Help + +partial alphanumeric_keys +xkb_symbols=hp250x +I12=XF86Tools +I17=XF86Search +I18=XF86Eject +I1E=XF86Mail +I20=XF86AudioMute +I21=XF86Launch5 +I22=XF86Launch3 +I23=XF86Launch2 +I24=XF86Launch4 +I25=XF86Standby +I26=Help +I2E=XF86AudioLowerVolume +I30=XF86AudioRaiseVolume +I32=XF86WWW + +partial alphanumeric_keys +xkb_symbols=hpxe3gc +I71=Help +I72=XF86Launch1 +I73=XF86WWW +I74=XF86Mail + +partial alphanumeric_keys +xkb_symbols=hpxe3gf +I73=Help +I74=XF86Launch1 + +partial alphanumeric_keys +xkb_symbols=hpxt1000 +I71=XF86Launch3 +I72=Help +I73=XF86Launch2 +I74=XF86Launch1 + +partial alphanumeric_keys +xkb_symbols=hpzt11xx +I71=XF86Launch3 +I72=Help +I73=XF86Launch2 +I74=XF86Launch1 + +partial alphanumeric_keys +xkb_symbols=hpdv5 +I12=XF86ScreenSaver +I32=XF86WWW +I75=Help +K6D=XF86Launch1 + +partial alphanumeric_keys +xkb_symbols=hpxe4xxx +I70=Help +I71=XF86Launch2 +I73=XF86Launch1 + +partial alphanumeric_keys +xkb_symbols=hp500fa +I73=Help +I74=XF86Launch1 + +partial alphanumeric_keys +xkb_symbols=hp5xx +I73=Help +I74=XF86Launch1 + + + +partial alphanumeric_keys +xkb_symbols=honeywell_euroboard +I10=XF86Game +I12=XF86AudioPrev +I17=XF86Eject +I18=XF86Launch2 +I19=XF86AudioPlay, XF86AudioPause +I1E=XF86Launch1 +I20=XF86AudioMute +I22=XF86AudioNext +I23=XF86AudioStop +I24=XF86Mail +I25=XF86ScreenSaver +I26=XF86Calculator +I2E=XF86AudioLowerVolume +I30=XF86AudioRaiseVolume +I32=XF86WWW + + + +partial alphanumeric_keys +xkb_symbols=rapidaccess +I12=XF86AudioMute +I17=XF86Launch2 +I1E=XF86AudioLowerVolume +I20=XF86AudioRaiseVolume +I21=XF86AudioNext +I22=XF86AudioPause +I22=XF86AudioPlay, XF86AudioPause +I23=XF86AudioPrev +I24=XF86AudioStop +I25=XF86Standby +I26=Help +I2E=XF86Launch4 +I30=XF86Launch3 +I32=XF86Launch1 + +partial alphanumeric_keys +xkb_symbols=rapidaccess2 +I12=XF86AudioNext +I17=XF86Favorites +I1E=XF86AudioMute +I20=XF86AudioStop +I21=XF86AudioLowerVolume +I22=XF86AudioPlay, XF86AudioPause +I23=XF86AudioRaiseVolume +I24=XF86AudioPrev +I25=XF86HomePage +I26=XF86Shop +I2E=XF86Search +I30=XF86MyComputer +I32=XF86VendorHome + +partial alphanumeric_keys +xkb_symbols=thinkpad60 +I1F=XF86VendorHome + +partial alphanumeric_keys +xkb_symbols=ibm_spacesaver +NMLK=type="ONE_LEVEL", +symbols[Group1]= [ Num_Lock ] + + + + +hidden partial alphanumeric_keys +xkb_symbols=logitech_base +I02=XF86HomePage +I15=XF86Community +I16=XF86ScrollClick +I21=XF86VendorHome +I3B=XF86New +I3C=XF86Reply +I43=XF86MyComputer +I44=XF86Documents +I57=XF86Pictures +I58=XF86Music + +hidden partial alphanumeric_keys +xkb_symbols=logitech_set3 +I17=XF86AudioStop +I1E=XF86AudioRaiseVolume +I1F=XF86AudioPlay, XF86AudioPause +I22=XF86AudioNext +I24=XF86AudioPrev +I25=XF86AudioLowerVolume +I26=XF86AudioMute +I69=XF86Go +IR7C=XF86AudioMedia + +partial alphanumeric_keys +xkb_symbols=logiaccess +FK13=XF86MailForward +FK14=XF86Send +I11=XF86Messenger +I12=XF86WebCam + +partial alphanumeric_keys +xkb_symbols=logicda + +partial alphanumeric_keys +xkb_symbols=logicink +I11=XF86Shop +I12=XF86VendorHome +I13=XF86Finance +I14=XF86Start + +partial alphanumeric_keys +xkb_symbols=logiex110 + +partial alphanumeric_keys +xkb_symbols=logiinkse +I11=XF86Messenger +I12=XF86WebCam +I13=XF86VendorHome +I14=XF86Shop + +partial alphanumeric_keys +xkb_symbols=logiinkseusb + +partial alphanumeric_keys +xkb_symbols=logiitc +I2F=XF86AudioRaiseVolume + +I30=XF86Launch1 + +partial alphanumeric_keys +xkb_symbols=logiik +I12=Find +I17=Print +I18=XF86Favorites +I19=XF86Reload +I1E=XF86Search +I20=XF86HotLinks +I22=XF86Forward +I23=XF86HomePage +I24=XF86Stop +I25=XF86OpenURL +I26=XF86AddFavorite +I32=XF86History +I7A=XF86WWW + +partial alphanumeric_keys +xkb_symbols=itouch +I1F=XF86AudioMute +I2B=XF86AudioLowerVolume +I2D=XF86AudioRaiseVolume + +partial alphanumeric_keys +xkb_symbols=logiultraxc +FK16=XF86AudioMute +FK17=XF86AudioLowerVolume +I2B=XF86AudioNext +I2D=XF86AudioPrev +I2C=XF86AudioPlay, XF86AudioPause +KPDC=XF86AudioRaiseVolume + +partial alphanumeric_keys +xkb_symbols=logidinovo +I02=XF86HomePage +I12=XF86Standby +I17=XF86Search +I21=XF86AudioRaiseVolume +K66=XF86AudioLowerVolume +KPDC=XF86AudioMute +IR7C=XF86AudioMedia + +partial alphanumeric_keys +xkb_symbols=logidinovoedge +I02=XF86HomePage +I6C=XF86Mail +FK17=XF86Search +IR7C=XF86AudioMedia + +partial alphanumeric_keys +xkb_symbols=logitech_g15 +AE13=XF86Messenger +HKTG=XF86Launch7 +key Date: Sun, 23 Feb 2020 22:49:18 -0600 Subject: [PATCH 03/43] - Added 7 more levels for mac_gui symbols, app switching wip, added G remap for sublime text. --- .xkb/symbols/mac_gui | 206 +++++++++++++++++++++++++++++++----- .xkb/types/mac_gui | 36 +++++-- references/symbol_names.txt | 8 +- 3 files changed, 209 insertions(+), 41 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 005649b..9ca87a5 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -1,40 +1,147 @@ +// Template +// replace key { +// type[Group1]= "ONE_LEVEL_CTRL", +// symbols[Group1]= [ +// Base, +// Alt, +// Shift Alt, +// Control, +// Shift Control, +// Super, +// Shift Super, +// Control Alt, +// Super Control", +// Super Alt, +// Super Control Alt +// ], +// actions[Group1]= [ +// NoAction(), +// RedirectKey(key=,modifiers=NewMod,clearmods=Mod1), +// RedirectKey(key=,modifiers=NewMod,clearmods=Mod1+Shift), +// RedirectKey(key=,modifiers=NewMod,clearmods=Control), +// RedirectKey(key=,modifiers=NewMod,clearmods=Control+Shift), +// RedirectKey(key=,modifiers=NewMod,clearmods=Super), +// RedirectKey(key=,modifiers=NewMod,clearmods=Super+Shift), +// RedirectKey(key=,modifiers=NewMod,clearmods=Control+Alt), +// RedirectKey(key=,modifiers=NewMod,clearmods=Super+Control), +// RedirectKey(key=,modifiers=NewMod,clearmods=Super+Mod1), +// RedirectKey(key=,modifiers=NewMod,clearmods=Control+Mod1) +// ] +// }; default partial xkb_symbols "mac_levelssym" { + // Fix the G key for Sublime Text + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + g, + G, + g, + G, + g, + G, + NoSymbol, + NoSymbol, + g, + g, + g, + g + ], + actions[Group1]= [ + NoAction(), + NoAction(), + // Pass G Normally + RedirectKey(key=), + RedirectKey(key=), + // Find Next + RedirectKey(key=,clearmods=Control), + // Find Previous + RedirectKey(key=,clearmods=Control), + // Sublime Goto Line + RedirectKey(key=,modifiers=Control,clearmods=Super), + NoAction(), + // Sublime Quick Find + RedirectKey(key=,clearmods=Mod1), + // Sublime Select All Matches + RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control), + NoAction(), + NoAction() + ] + }; // LEFT to Begin Line or Beginning of word replace key { type[Group1]= "ONE_LEVEL_CTRL", - symbols[Group1]= [ Left, Left, NoSymbol,NoSymbol,Left ], + symbols[Group1]= [ + Left, + Left, + Left, + Left, + NoSymbol, + NoSymbol, + Left + ], actions[Group1]= [ NoAction(), - RedirectKey(key=,modifiers=Control,clearmods=Mod1), + NoAction(), + // Wordwise + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), RedirectKey(key=,clearmods=Control), - RedirectKey(key=,modifiers=Shift,clearmods=Control+Mod1), - RedirectKey(key=,modifiers=Shift+Control,clearmods=Mod1) + RedirectKey(key=,clearmods=Control), + // Change workspace + NoAction(), + // Wordwise - Sublime? + RedirectKey(key=,modifiers=Mod1,clearmods=Super) ] }; // Right to End of Line or end of word replace key { type[Group1]= "ONE_LEVEL_CTRL", - symbols[Group1]= [ Right, Right, NoSymbol, NoSymbol,Right ], + symbols[Group1]= [ + Right, + Right, + Right, + Right, + NoSymbol, + NoSymbol, + Right + ], actions[Group1]= [ NoAction(), - RedirectKey(key=,modifiers=Control,clearmods=Mod1), + NoAction(), + // Wordwise + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), RedirectKey(key=,clearmods=Control), - RedirectKey(key=,modifiers=Shift,clearmods=Control+Mod1), - RedirectKey(key=,modifiers=Shift+Control,clearmods=Mod1) + RedirectKey(key=,clearmods=Control), + // Change workspace + NoAction(), + // Wordwise - Sublime? + RedirectKey(key=,modifiers=Mod1,clearmods=Super) ] }; - // Up to Mac Home + //Up to Mac Home replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ Up, Up, - NoSymbol + Up, + Up, + NoSymbol, + NoSymbol, + Up ], actions[Group1]= [ NoAction(), NoAction(), - RedirectKey(key=) + // Wordwise + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=), + RedirectKey(key=), + // Wordwise - Sublime? + RedirectKey(key=,clearmods=Super), + RedirectKey(key=,modifiers=Mod1,clearmods=Super) ] }; // Down to Mac End @@ -43,28 +150,67 @@ default partial xkb_symbols "mac_levelssym" { symbols[Group1]= [ Down, Down, - NoSymbol + Down, + Down, + NoSymbol, + NoSymbol, + Down ], actions[Group1]= [ NoAction(), NoAction(), - RedirectKey(key=) + // Wordwise + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=), + RedirectKey(key=), + // Wordwise - Sublime? + RedirectKey(key=,clearmods=Super), + RedirectKey(key=,modifiers=Mod1,clearmods=Super) ] }; // Alt BKSP to DELETE replace key { - type[Group1]= "ONE_LEVEL_CTRL", - symbols[Group1]= [ - BackSpace, - BackSpace, - NoSymbol - ], - actions[Group1]= [ - NoAction(), - RedirectKey(key=,clearmods=Mod1), - NoAction() - ] + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + BackSpace, + BackSpace, + BackSpace + ], + actions[Group1]= [ + NoAction(), + NoAction(), + RedirectKey(key=,clearmods=Mod1) + ] }; + // Cycle App and In App Tab Switching + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + Tab, + Tab, + NoSymbol, + NoSymbol, + slash, + slash, + Tab, + Tab + ], + actions[Group1]= [ + NoAction(), + NoAction(), + // FK18 is just to clear Alt + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), + // Also need to remap on the DE level + // to backslash \ for Cmd+Tab + RedirectKey(key=), + RedirectKey(key=), + RedirectKey(key=,modifiers=Control,clearmods=Mod4), + RedirectKey(key=,modifiers=Control+Shift,clearmods=Mod4) + ] + }; + // // Full Print Screen // // GalliumOS // replace key { @@ -101,11 +247,15 @@ partial xkb_symbols "mac_chrome" { symbols[Group1]= [ Left, Left, + NoSymbol, + NoSymbol, Left ], actions[Group1]= [ NoAction(), - RedirectKey(key=), + NoAction(), + RedirectKey(key=), + RedirectKey(key=), RedirectKey(key=,modifiers=Mod1,clearmods=Control) ] }; @@ -115,11 +265,15 @@ partial xkb_symbols "mac_chrome" { symbols[Group1]= [ Right, Right, + NoSymbol, + NoSymbol, Right ], actions[Group1]= [ NoAction(), - RedirectKey(key=), + NoAction(), + RedirectKey(key=), + RedirectKey(key=), RedirectKey(key=,modifiers=Mod1,clearmods=Control) ] }; diff --git a/.xkb/types/mac_gui b/.xkb/types/mac_gui index 3074610..fbd227a 100644 --- a/.xkb/types/mac_gui +++ b/.xkb/types/mac_gui @@ -1,15 +1,29 @@ default partial xkb_types "addmac_levels" { + Virtual_modifiers Super; type "ONE_LEVEL_CTRL" { - modifiers= Mod1+Control+Shift; - map[Mod1]= Level2; - map[Control]= Level3; - map[Mod1+Control]= Level3; - map[Shift+Control]= Level4; - map[Shift+Mod1] = Level5; - level_name[Level1]= "Base"; - level_name[Level2]= "Alt"; - level_name[Level3]= "Control"; - level_name[Level4]= "Shift with Control"; - level_name[Level5] = "Shift Alt"; + modifiers = Shift+Mod1+Super+Control; + map[Shift] = Level2; + map[Mod1] = Level3; + map[Shift+Mod1] = Level4; + map[Control] = Level5; + map[Shift+Control] = Level6; + map[Super] = Level7; + map[Shift+Super] = Level8; + map[Mod1+Control] = 9; + map[Super+Control] = 10; + map[Super+Mod1] = 11; + map[Super+Mod1+Control] = 12; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "Control"; + level_name[Level6] = "Shift Control"; + level_name[Level7] = "Super"; + level_name[Level8] = "Shift Super"; + level_name[9] = "Control Alt"; + level_name[10] = "Super Control"; + level_name[11] = "Super Alt"; + level_name[12] = "Super Control Alt"; }; }; diff --git a/references/symbol_names.txt b/references/symbol_names.txt index 0c2c517..e07ff75 100644 --- a/references/symbol_names.txt +++ b/references/symbol_names.txt @@ -22,8 +22,8 @@ AD07=u,U AD08=i,I AD09=o,O AD10=p,P -AD11=racketleft,braceleft -AD12=racketright,braceright +AD11=bracketleft,braceleft +AD12=bracketright,braceright AC01=a,A AC02=s,S AC03=d,D @@ -45,7 +45,7 @@ AB07=m,M AB08=comma,less AB09=period,greater AB10=slash,question -BKSL=ackslash,bar +BKSL=backslash,bar hidden partial alphanumeric_keys xkb_symbols=media_common @@ -1361,7 +1361,7 @@ partial alphanumeric_keys xkb_symbols=pc105 -partial alphanumeric_keys +partial alphanumeric_keysf xkb_symbols=htcdream BKSP=BackSpace RTRN=Return From 9b97bd9ea6827462ebe5a9ba7e89c2597fa71f1f Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 24 Feb 2020 00:02:40 -0600 Subject: [PATCH 04/43] - Updated mac_term for the changes in added GUI and DE support --- .xkb/symbols/mac_term | 27 +++++++++++++++++++++++++++ .xkb/types/mac_term | 33 ++++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index 514e788..50d8388 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -27,6 +27,33 @@ partial xkb_symbols "mac_win" { }; }; partial xkb_symbols "mac_global" { + // Cycle App and In App Tab Switching + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + Tab, + Tab, + slash, + NoSymbol, + NoSymbol, + slash, + Tab, + Tab + ], + actions[Group1]= [ + NoAction(), + NoAction(), + RedirectKey(key=,clearmods=Shift), + // FK18 is just to clear Alt + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), + // Also need to remap on the DE level + // to backslash \ for Cmd+Tab + RedirectKey(key=), + RedirectKey(key=,modifiers=Control,clearmods=Mod4), + RedirectKey(key=,modifiers=Control+Shift,clearmods=Mod4) + ] + }; // Page Up replace key { type[Group1]= "ONE_LEVEL_CTRL", diff --git a/.xkb/types/mac_term b/.xkb/types/mac_term index 533e933..0be72de 100644 --- a/.xkb/types/mac_term +++ b/.xkb/types/mac_term @@ -1,10 +1,29 @@ default partial xkb_types "addmac_levels" { + Virtual_modifiers Super; type "ONE_LEVEL_CTRL" { - modifiers= Shift+Control; - map[Shift]= Level2; - map[Shift+Control]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Alt"; - level_name[Level3]= "With Control"; + modifiers = Shift+Mod1+Super+Control; + map[Shift] = Level2; + map[Shift+Control] = Level3; + map[Mod1] = Level4; + map[Shift+Mod1] = Level5; + map[Control] = Level6; + map[Super] = Level7; + map[Shift+Super] = Level8; + map[Mod1+Control] = 9; + map[Super+Control] = 10; + map[Super+Mod1] = 11; + map[Super+Mod1+Control] = 12; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Shift Control"; + level_name[Level4] = "Alt"; + level_name[Level5] = "Shift Alt"; + level_name[Level6] = "Control"; + level_name[Level7] = "Super"; + level_name[Level8] = "Shift Super"; + level_name[9] = "Control Alt"; + level_name[10] = "Super Control"; + level_name[11] = "Super Alt"; + level_name[12] = "Super Control Alt"; }; -}; \ No newline at end of file +}; From 5152c0ee6ee21f0a29ea6f500338cffd9a1b8c3b Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 24 Feb 2020 01:06:26 -0600 Subject: [PATCH 05/43] - Corrected backslash for mac_gui --- .xkb/symbols/mac_gui | 4 ++-- .xkb/symbols/mac_term | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 9ca87a5..88d7eda 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -191,8 +191,8 @@ default partial xkb_symbols "mac_levelssym" { Tab, NoSymbol, NoSymbol, - slash, - slash, + backslash, + backslash, Tab, Tab ], diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index 50d8388..009c67b 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -33,10 +33,10 @@ partial xkb_symbols "mac_global" { symbols[Group1]= [ Tab, Tab, - slash, + backslash, NoSymbol, NoSymbol, - slash, + backslash, Tab, Tab ], From 470541d5f8ac2846337fbc0b09bde585f734e971 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Tue, 25 Feb 2020 00:12:44 -0600 Subject: [PATCH 06/43] - Added script for detecting OS and updated xactive.sh for debug reasons --- system-config/system.sh | 66 ++++++++++++++++++++++++++++++++++++++++ system-config/xactive.sh | 10 ++++-- 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100755 system-config/system.sh diff --git a/system-config/system.sh b/system-config/system.sh new file mode 100755 index 0000000..5608d2c --- /dev/null +++ b/system-config/system.sh @@ -0,0 +1,66 @@ +#!/bin/sh + +lowercase(){ + echo "$1" | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/" +} + +getOS(){ + OS=$(lowercase `uname`) + kernel=`uname -r` + arch=`uname -m` + + OS=`uname` + if [ "${OS}" = "SunOS" ] ; then + OS=Solaris + arch=`uname -p` + OSSTR="${OS} ${version}(${arch} `uname -v`)" + elif [ "${OS}" = "AIX" ] ; then + OSSTR="${OS} `oslevel` (`oslevel -r`)" + elif [ "${OS}" = "Linux" ] ; then + if [ -f /etc/redhat-release ] ; then + distro=`cat /etc/redhat-release |sed s/\ release.*//` + codename=`cat /etc/redhat-release | sed s/.*\(// | sed s/\)//` + version=`cat /etc/redhat-release | sed s/.*release\ // | sed s/\ .*//` + base='RedHat' + elif [ -f /etc/SuSE-release ] ; then + codename=`cat /etc/SuSE-release | tr "\n" ' '| sed s/VERSION.*//` + version=`cat /etc/SuSE-release | tr "\n" ' ' | sed s/.*=\ //` + base='SuSe' + elif [ -f /etc/debian_version ] ; then + if [ -f /etc/lsb-release ] ; then + distro=`cat /etc/lsb-release | grep '^DISTRIB_ID' | awk -F= '{ print $2 }'` + codename=`cat /etc/lsb-release | grep '^DISTRIB_CODENAME' | awk -F= '{ print $2 }'` + version=`cat /etc/lsb-release | grep '^DISTRIB_RELEASE' | awk -F= '{ print $2 }'` + fi + base='Debian' + fi + if [ -f /etc/UnitedLinux-release ] ; then + distro="${distro}[`cat /etc/UnitedLinux-release | tr "\n" ' ' | sed s/VERSION.*//`]" + fi + OS=`lowercase $OS` + base=`lowercase $base` + readonly OS + readonly distro + readonly base + readonly codename + readonly version + readonly kernel + readonly arch + fi +} +getOS + +# echo "OS: $OS" +# echo "base: $base" +# echo "distro: $distro" +# echo "codename: $codename" +# echo "version: $version" +# echo "kernel: $kernel" +# echo "arch: $arch" +# echo "" + +# if [ "${distro}" = "Ubuntu" ] ; then +# echo "Apply Ubuntu Tweaks" +# fi + + diff --git a/system-config/xactive.sh b/system-config/xactive.sh index dcc1a4d..bf6de8f 100755 --- a/system-config/xactive.sh +++ b/system-config/xactive.sh @@ -1,4 +1,10 @@ #!/bin/bash -./caret_status.sh & -./kintox11 \ No newline at end of file +if [ $# -eq 0 ] + then + # No arguments + ./kintox11 +else + ./caret_status.sh & + ./kintox11 +fi From c6292ee34af6da0a45fc9e3dfed1219b20ddedba Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Tue, 25 Feb 2020 02:21:22 -0600 Subject: [PATCH 07/43] - Disabled Alt mod keymap on terminals for now, causing issues with numerics --- .xkb/symbols/mac_term | 4 ++-- .xkb/types/mac_term | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index 009c67b..4620e3d 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -34,7 +34,7 @@ partial xkb_symbols "mac_global" { Tab, Tab, backslash, - NoSymbol, + // NoSymbol, NoSymbol, backslash, Tab, @@ -45,7 +45,7 @@ partial xkb_symbols "mac_global" { NoAction(), RedirectKey(key=,clearmods=Shift), // FK18 is just to clear Alt - RedirectKey(key=,clearmods=Mod1), + // RedirectKey(key=,clearmods=Mod1), RedirectKey(key=,clearmods=Mod1), // Also need to remap on the DE level // to backslash \ for Cmd+Tab diff --git a/.xkb/types/mac_term b/.xkb/types/mac_term index 0be72de..7817c8e 100644 --- a/.xkb/types/mac_term +++ b/.xkb/types/mac_term @@ -4,7 +4,7 @@ default partial xkb_types "addmac_levels" { modifiers = Shift+Mod1+Super+Control; map[Shift] = Level2; map[Shift+Control] = Level3; - map[Mod1] = Level4; + // map[Mod1] = Level4; map[Shift+Mod1] = Level5; map[Control] = Level6; map[Super] = Level7; @@ -16,7 +16,7 @@ default partial xkb_types "addmac_levels" { level_name[Level1] = "Base"; level_name[Level2] = "Shift"; level_name[Level3] = "Shift Control"; - level_name[Level4] = "Alt"; + // level_name[Level4] = "Alt"; level_name[Level5] = "Shift Alt"; level_name[Level6] = "Control"; level_name[Level7] = "Super"; From c4db31bdf00509748bf1d03f90768421da5ab7d1 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 26 Feb 2020 18:15:46 -0600 Subject: [PATCH 08/43] - Added early support for app switching on Gnome --- .xkb/symbols/mac_gui | 54 ++++++++++++++++----------------- .xkb/symbols/mac_term | 54 ++++++++++++++++----------------- system-config/cleanup.sh | 3 ++ system-config/system_hotkeys.sh | 10 ++++++ 4 files changed, 67 insertions(+), 54 deletions(-) create mode 100755 system-config/system_hotkeys.sh diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 88d7eda..63a9b72 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -183,33 +183,33 @@ default partial xkb_symbols "mac_levelssym" { RedirectKey(key=,clearmods=Mod1) ] }; - // Cycle App and In App Tab Switching - replace key { - type[Group1]= "ONE_LEVEL_CTRL", - symbols[Group1]= [ - Tab, - Tab, - NoSymbol, - NoSymbol, - backslash, - backslash, - Tab, - Tab - ], - actions[Group1]= [ - NoAction(), - NoAction(), - // FK18 is just to clear Alt - RedirectKey(key=,clearmods=Mod1), - RedirectKey(key=,clearmods=Mod1), - // Also need to remap on the DE level - // to backslash \ for Cmd+Tab - RedirectKey(key=), - RedirectKey(key=), - RedirectKey(key=,modifiers=Control,clearmods=Mod4), - RedirectKey(key=,modifiers=Control+Shift,clearmods=Mod4) - ] - }; + // // Cycle App and In App Tab Switching + // replace key { + // type[Group1]= "ONE_LEVEL_CTRL", + // symbols[Group1]= [ + // Tab, + // Tab, + // NoSymbol, + // NoSymbol, + // backslash, + // backslash, + // Tab, + // Tab + // ], + // actions[Group1]= [ + // NoAction(), + // NoAction(), + // // FK18 is just to clear Alt + // RedirectKey(key=,clearmods=Mod1), + // RedirectKey(key=,clearmods=Mod1), + // // Also need to remap on the DE level + // // to backslash \ for Cmd+Tab + // RedirectKey(key=), + // RedirectKey(key=), + // RedirectKey(key=,modifiers=Control,clearmods=Mod4), + // RedirectKey(key=,modifiers=Control+Shift,clearmods=Mod4) + // ] + // }; // // Full Print Screen // // GalliumOS diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index 4620e3d..9898f02 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -27,33 +27,33 @@ partial xkb_symbols "mac_win" { }; }; partial xkb_symbols "mac_global" { - // Cycle App and In App Tab Switching - replace key { - type[Group1]= "ONE_LEVEL_CTRL", - symbols[Group1]= [ - Tab, - Tab, - backslash, - // NoSymbol, - NoSymbol, - backslash, - Tab, - Tab - ], - actions[Group1]= [ - NoAction(), - NoAction(), - RedirectKey(key=,clearmods=Shift), - // FK18 is just to clear Alt - // RedirectKey(key=,clearmods=Mod1), - RedirectKey(key=,clearmods=Mod1), - // Also need to remap on the DE level - // to backslash \ for Cmd+Tab - RedirectKey(key=), - RedirectKey(key=,modifiers=Control,clearmods=Mod4), - RedirectKey(key=,modifiers=Control+Shift,clearmods=Mod4) - ] - }; + // // Cycle App and In App Tab Switching + // replace key { + // type[Group1]= "ONE_LEVEL_CTRL", + // symbols[Group1]= [ + // Tab, + // Tab, + // backslash, + // // NoSymbol, + // NoSymbol, + // backslash, + // Tab, + // Tab + // ], + // actions[Group1]= [ + // NoAction(), + // NoAction(), + // RedirectKey(key=,clearmods=Shift), + // // FK18 is just to clear Alt + // // RedirectKey(key=,clearmods=Mod1), + // RedirectKey(key=,clearmods=Mod1), + // // Also need to remap on the DE level + // // to backslash \ for Cmd+Tab + // RedirectKey(key=), + // RedirectKey(key=,modifiers=Control,clearmods=Mod4), + // RedirectKey(key=,modifiers=Control+Shift,clearmods=Mod4) + // ] + // }; // Page Up replace key { type[Group1]= "ONE_LEVEL_CTRL", diff --git a/system-config/cleanup.sh b/system-config/cleanup.sh index fe99548..62efa16 100755 --- a/system-config/cleanup.sh +++ b/system-config/cleanup.sh @@ -4,3 +4,6 @@ setxkbmap -option # force command to run silently and report true killall xbindkeys > /dev/null 2>&1 || : # rm /tmp/kinto/caret + +gsettings set org.gnome.desktop.wm.keybindings switch-applications "['Tab']" +gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['Tab']" diff --git a/system-config/system_hotkeys.sh b/system-config/system_hotkeys.sh new file mode 100755 index 0000000..dc04fe6 --- /dev/null +++ b/system-config/system_hotkeys.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ "$1" = "term" ]; + then + gsettings set org.gnome.desktop.wm.keybindings switch-applications "['Tab']" + gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['']" +else + gsettings set org.gnome.desktop.wm.keybindings switch-applications "['Tab']" + gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['Tab']" +fi From e8a8c0ed569b6e650b1bafbdc582b5caba7f5d00 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 26 Feb 2020 20:54:23 -0600 Subject: [PATCH 09/43] - Updated mac_gui and term files to better map keys that only concern shift and/or control. --- .xkb/symbols/mac_term | 42 ++++++++++++++++++++++++------------------ .xkb/types/mac_gui | 8 ++++++++ .xkb/types/mac_term | 8 ++++++++ 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index 9898f02..e8dd37b 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -27,49 +27,55 @@ partial xkb_symbols "mac_win" { }; }; partial xkb_symbols "mac_global" { - // // Cycle App and In App Tab Switching + // Cycle App and In App Tab Switching // replace key { // type[Group1]= "ONE_LEVEL_CTRL", // symbols[Group1]= [ // Tab, // Tab, - // backslash, - // // NoSymbol, + // // backslash, + // Tab, + // // NoSymbol, // NoSymbol, - // backslash, + // // backslash, + // Tab, // Tab, // Tab // ], // actions[Group1]= [ // NoAction(), // NoAction(), - // RedirectKey(key=,clearmods=Shift), + // // RedirectKey(key=,clearmods=Shift), + // NoAction(), // // FK18 is just to clear Alt // // RedirectKey(key=,clearmods=Mod1), + // // Clears Alt + Shift // RedirectKey(key=,clearmods=Mod1), // // Also need to remap on the DE level // // to backslash \ for Cmd+Tab - // RedirectKey(key=), + // // RedirectKey(key=), + // NoAction(), // RedirectKey(key=,modifiers=Control,clearmods=Mod4), // RedirectKey(key=,modifiers=Control+Shift,clearmods=Mod4) // ] // }; // Page Up replace key { - type[Group1]= "ONE_LEVEL_CTRL", - symbols[Group1]= [ - Up, - Up, - NoSymbol ], - actions[Group1]= [ + type[Group1]= "ONE_LEVEL_CMD", + symbols[Group1]= [ + Up, + Up, + NoSymbol + ], + actions[Group1]= [ NoAction(), NoAction(), - RedirectKey(key=,clearmods=Shift+Control) + RedirectKey(key=,clearmods=Shift+Control) ] }; // Page Down replace key { - type[Group1]= "ONE_LEVEL_CTRL", + type[Group1]= "ONE_LEVEL_CMD", symbols[Group1]= [ Down, Down, @@ -83,7 +89,7 @@ partial xkb_symbols "mac_global" { }; // HOME replace key { - type[Group1]= "ONE_LEVEL_CTRL", + type[Group1]= "ONE_LEVEL_CMD", symbols[Group1]= [ Left, Left, @@ -97,7 +103,7 @@ partial xkb_symbols "mac_global" { }; // END replace key { - type[Group1]= "ONE_LEVEL_CTRL", + type[Group1]= "ONE_LEVEL_CMD", symbols[Group1]= [ Right, Right, @@ -112,7 +118,7 @@ partial xkb_symbols "mac_global" { // Full Print Screen // Standard Ubuntu replace key { - type[Group1]= "ONE_LEVEL_CTRL", + type[Group1]= "ONE_LEVEL_CMD", symbols[Group1]= [ 3, numbersign, @@ -127,7 +133,7 @@ partial xkb_symbols "mac_global" { // Region Print Screen // Standard Ubuntu replace key { - type[Group1]= "ONE_LEVEL_CTRL", + type[Group1]= "ONE_LEVEL_CMD", symbols[Group1]= [ 4, dollar, diff --git a/.xkb/types/mac_gui b/.xkb/types/mac_gui index fbd227a..36935da 100644 --- a/.xkb/types/mac_gui +++ b/.xkb/types/mac_gui @@ -26,4 +26,12 @@ default partial xkb_types "addmac_levels" { level_name[11] = "Super Alt"; level_name[12] = "Super Control Alt"; }; + type "ONE_LEVEL_CMD" { + modifiers = Shift+Control; + map[Shift] = Level2; + map[Control] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Control"; + }; }; diff --git a/.xkb/types/mac_term b/.xkb/types/mac_term index 7817c8e..aa0fc4f 100644 --- a/.xkb/types/mac_term +++ b/.xkb/types/mac_term @@ -26,4 +26,12 @@ default partial xkb_types "addmac_levels" { level_name[11] = "Super Alt"; level_name[12] = "Super Control Alt"; }; + type "ONE_LEVEL_CMD" { + modifiers = Shift+Control; + map[Shift] = Level2; + map[Shift+Control] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Shift Control"; + }; }; From 393f45d1d3f10ef0f083144fcb2f7dfa53ead6bc Mon Sep 17 00:00:00 2001 From: Ryan Reaves Date: Thu, 27 Feb 2020 22:59:12 -0600 Subject: [PATCH 10/43] - Added shortcut notes for galliumOS/xfce --- references/shortcuts | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 references/shortcuts diff --git a/references/shortcuts b/references/shortcuts new file mode 100644 index 0000000..6cb8263 --- /dev/null +++ b/references/shortcuts @@ -0,0 +1,29 @@ +# GalliumOS Notes + +xfconf-query -c xfce4-keyboard-shortcuts -lv | grep "show_desktop_key\|cycle_windows_key\|cycle_reverse_windows_key\|close_window_key\|maximize_window_key\|xfce4-popup-whiskermenu\|move_window_next_workspace_key\|move_window_prev_workspace_key\|hide" | grep -v "default\|m" + +# Show Desktop +xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/d" --create --type string --set "show_desktop_key" + +# Undo show desktop +xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/d" --reset + +# GUI Alt Tab - Window Switching +xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Tab" --set "cycle_reverse_windows_key" +xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Tab" --set "cycle_windows_key" + +# Term Alt Tab - Window Switching +xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Tab" --set "cycle_windows_key" +xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Tab" --set "cycle_reverse_windows_key" + +# Hide/minimize Window +xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/h" --create --type string --set "hide_window_key" + +# Spotlight +xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/space" --create --type string --set "xfce4-popup-whiskermenu" + +# Change workspace to left +xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Left" --create --type string --set "move_window_prev_workspace_key" + +# Change workspace to right +xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Right" --create --type string --set "move_window_next_workspace_key" \ No newline at end of file From 998c9bdf2885da78734298f59c7866971841d6aa Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Thu, 27 Feb 2020 23:39:24 -0600 Subject: [PATCH 11/43] - Added more shortcut notes --- references/shortcuts | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/references/shortcuts b/references/shortcuts index 6cb8263..535428f 100644 --- a/references/shortcuts +++ b/references/shortcuts @@ -26,4 +26,36 @@ xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/Left" --create --type string --set "move_window_prev_workspace_key" # Change workspace to right -xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Right" --create --type string --set "move_window_next_workspace_key" \ No newline at end of file +xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Right" --create --type string --set "move_window_next_workspace_key" + +# PopOS + +# Close App Alt+F4 (Super+w) +gsettings set org.gnome.desktop.wm.keybindings close "['F4','w']" +# Undo +gsettings set org.gnome.desktop.wm.keybindings close "['w']" + +# Maximize Window +gsettings set org.gnome.desktop.wm.keybindings toggle-maximized "['F10','Up']" +# Undo +gsettings set org.gnome.desktop.wm.keybindings toggle-maximized "['Up']" + +# Ubuntu 19.10 +# Change Workspace +gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left "['Left','Left']" +gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right "['Right','Right']" + +# ElementaryOS +# Show Desktop +gsettings set org.gnome.desktop.wm.keybindings show-desktop "['d','Down']" +# Maximize Window +gsettings set org.gnome.desktop.wm.keybindings toggle-maximized "['F10','Up']" +# Spotlight +gsettings set org.gnome.desktop.wm.keybindings panel-main-menu "['Space','Space']" + +# Fedora 31 +# Show Desktop +gsettings set org.gnome.desktop.wm.keybindings show-desktop "['d']" +# Change Workspace +gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left "['Left','Left']" +gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right "['Right','Right']" \ No newline at end of file From 0f064360a49056c62af1cc08df6dcb3aaaa701eb Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 28 Feb 2020 00:36:49 -0600 Subject: [PATCH 12/43] - All initial system level shortcuts documented --- references/shortcuts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/references/shortcuts b/references/shortcuts index 535428f..698a9eb 100644 --- a/references/shortcuts +++ b/references/shortcuts @@ -58,4 +58,18 @@ gsettings set org.gnome.desktop.wm.keybindings panel-main-menu "['d']" # Change Workspace gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left "['Left','Left']" -gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right "['Right','Right']" \ No newline at end of file +gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right "['Right','Right']" + +# Manjaro/Arch KDE +# Maximize +kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" \ +--key "Maximize Window" "Alt+F10,Meta+PgUp,Maximize Window" +# Minimize +kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" \ +--key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window" +# Switch Desktops +kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" \ +--key "Switch to Next Desktop" "Meta+Right,Meta+Right,Switch to Next Desktop" +kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" \ +--key "Switch to Previous Desktop" "Meta+Left,Meta+Left,Switch to Previous Desktop" +kquitapp5 kglobalaccel && sleep 2s && kglobalaccel5 & \ No newline at end of file From 8c2c53cdcd7637c46b2e0ad2f120556e048fe9bf Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 28 Feb 2020 13:26:08 -0600 Subject: [PATCH 13/43] - Updated setup.py with DE hotkey defaults --- setup.py | 42 ++++++++++- system-config/dename.sh | 151 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+), 2 deletions(-) create mode 100755 system-config/dename.sh diff --git a/setup.py b/setup.py index d425aa8..688d679 100755 --- a/setup.py +++ b/setup.py @@ -78,11 +78,49 @@ if len(check_xdotool) == 0: if runpkg != 0: requirements(pkgm) +distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").lower() +distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").lower() +dename = cmdline("./system-config/dename.sh") + +print("Detected\nOS: " + distro + " " + distroVersion + "\nDE: " + dename + "\n") +addhotkeys = yn_choice("Do you want to apply system level shortcuts?\nThis will add standardized shortcuts for Kinto to fully operate.\n") +if(addhotkeys): + if distro == "ubuntu" and dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") + elif distro == "pop!_os" and dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings close \"['F4','w']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") + elif distro == "elementaryos" and dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d','Down']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + elif distro == "galliumos" and dename == "xfce": + cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/d\" --create --type string --set \"show_desktop_key\"") + cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Tab\" --set \"cycle_reverse_windows_key\"") + cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Tab\" --set \"cycle_windows_key\"") + cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Tab\" --set \"cycle_windows_key\"") + cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Tab\" --set \"cycle_reverse_windows_key\"") + cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/h\" --create --type string --set \"hide_window_key\"") + cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/commands/custom/space\" --create --type string --set \"xfce4-popup-whiskermenu\"") + cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Left\" --create --type string --set \"move_window_prev_workspace_key\"") + cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Right\" --create --type string --set \"move_window_next_workspace_key\"") + elif distro == "fedora" and dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") + elif distro == "manjaro linux" and dename == "kde": + cmdline("kwriteconfig5 --file \"$HOME/.config/kglobalshortcutsrc\" --group \"kwin\" --key \"Maximize Window\" \"Alt+F10,Meta+PgUp,Maximize Window\"") + cmdline("kwriteconfig5 --file \"$HOME/.config/kglobalshortcutsrc\" --group \"kwin\" --key \"Minimize Window\" \"Meta+h,Meta+PgDown,Minimize Window\"") + cmdline("kwriteconfig5 --file \"$HOME/.config/kglobalshortcutsrc\" --group \"kwin\" --key \"Switch to Next Desktop\" \"Meta+Right,Meta+Right,Switch to Next Desktop\"") + cmdline("kwriteconfig5 --file \"$HOME/.config/kglobalshortcutsrc\" --group \"kwin\" --key \"Switch to Previous Desktop\" \"Meta+Left,Meta+Left,Switch to Previous Desktop\"") + cmdline("kquitapp5 kglobalaccel && sleep 2s && kglobalaccel5 &") + else: + print("A supported OS and DE was not found, you may not have full system level shortcuts installed.") + if os.path.exists(homedir + '/.config/ibus/bus') and cmdline("ls ~/.config/ibus/bus -1rt") == "": install_ibus() - - try: f = open("defaults.json") except IOError: diff --git a/system-config/dename.sh b/system-config/dename.sh new file mode 100755 index 0000000..7725e2c --- /dev/null +++ b/system-config/dename.sh @@ -0,0 +1,151 @@ +#!/bin/bash + +function detect_gnome() +{ + ps -e | grep -E '^.* gnome-session' > /dev/null + if [ $? -ne 0 ]; + then + return 0 + fi + VERSION=`gnome-session --version | awk '{print $2}'` + DESKTOP="gnome" + return 1 +} + +function detect_kde() +{ + ps -e | grep -E '^.* kded4$' > /dev/null + if [ $? -ne 0 ]; + then + return 0 + else + VERSION=`kded4 --version | grep -m 1 'KDE' | awk -F ':' '{print $2}' | awk '{print $1}'` + DESKTOP="KDE" + return 1 + fi +} + +function detect_unity() +{ + ps -e | grep -E 'unity-panel' > /dev/null + if [ $? -ne 0 ]; + then + return 0 + fi + VERSION=`unity --version | awk '{print $2}'` + DESKTOP="unity" + return 1 +} + +function detect_xfce() +{ + ps -e | grep -E '^.* xfce4-session$' > /dev/null + if [ $? -ne 0 ]; + then + return 0 + fi + VERSION=`xfce4-session --version | grep xfce4-session | awk '{print $2}'` + DESKTOP="xfce" + return 1 +} + +function detect_cinnamon() +{ + ps -e | grep -E '^.* cinnamon$' > /dev/null + if [ $? -ne 0 ]; + then + return 0 + fi + VERSION=`cinnamon --version | awk '{print $2}'` + DESKTOP="cinnamon" + return 1 +} + +function detect_mate() +{ + ps -e | grep -E '^.* mate-panel$' > /dev/null + if [ $? -ne 0 ]; + then + return 0 + fi + VERSION=`mate-about --version | awk '{print $4}'` + DESKTOP="mate" + return 1 +} + +function detect_lxde() +{ + ps -e | grep -E '^.* lxsession$' > /dev/null + if [ $? -ne 0 ]; + then + return 0 + fi + + # We can detect LXDE version only thru package manager + which apt-cache > /dev/null 2> /dev/null + if [ $? -ne 0 ]; + then + which yum > /dev/null 2> /dev/null + if [ $? -ne 0 ]; + then + VERSION='unknown' + else + # For Fedora + VERSION=`yum list lxde-common | grep lxde-common | awk '{print $2}' | awk -F '-' '{print $1}'` + fi + else + # For Lubuntu and Knoppix + VERSION=`apt-cache show lxde-common /| grep 'Version:' | awk '{print $2}' | awk -F '-' '{print $1}'` + fi + DESKTOP="lxde" + return 1 +} + +function detect_sugar() +{ + if [ "$DESKTOP_SESSION" == "sugar" ]; + then + VERSION=`python -c "from jarabe import config; print config.version"` + DESKTOP="sugar" + else + return 0 + fi +} + + +DESKTOP="unknown" +if detect_unity; +then + if detect_kde; + then + if detect_gnome; + then + if detect_xfce; + then + if detect_cinnamon; + then + if detect_mate; + then + if detect_lxde; + then + detect_sugar + fi + fi + fi + fi + fi + fi +fi + + +if [ "$1" == '-v' ]; +then + echo $VERSION +else + if [ "$1" == '-n' ]; + then + echo $DESKTOP + else + echo $DESKTOP $VERSION + fi +fi \ No newline at end of file From d695c3f7340f24515184e1a7642adeff66527053 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 28 Feb 2020 21:57:50 -0600 Subject: [PATCH 14/43] - Added App Cycle tab switcher --- .xkb/symbols/mac_gui | 76 +++++++++++++++++++++++++++---------------- .xkb/symbols/mac_term | 48 ++++++++++----------------- .xkb/types/mac_gui | 12 +++++-- .xkb/types/mac_term | 12 +++++-- setup.py | 3 ++ 5 files changed, 86 insertions(+), 65 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 63a9b72..ffb4561 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -183,34 +183,6 @@ default partial xkb_symbols "mac_levelssym" { RedirectKey(key=,clearmods=Mod1) ] }; - // // Cycle App and In App Tab Switching - // replace key { - // type[Group1]= "ONE_LEVEL_CTRL", - // symbols[Group1]= [ - // Tab, - // Tab, - // NoSymbol, - // NoSymbol, - // backslash, - // backslash, - // Tab, - // Tab - // ], - // actions[Group1]= [ - // NoAction(), - // NoAction(), - // // FK18 is just to clear Alt - // RedirectKey(key=,clearmods=Mod1), - // RedirectKey(key=,clearmods=Mod1), - // // Also need to remap on the DE level - // // to backslash \ for Cmd+Tab - // RedirectKey(key=), - // RedirectKey(key=), - // RedirectKey(key=,modifiers=Control,clearmods=Mod4), - // RedirectKey(key=,modifiers=Control+Shift,clearmods=Mod4) - // ] - // }; - // // Full Print Screen // // GalliumOS // replace key { @@ -240,6 +212,54 @@ default partial xkb_symbols "mac_levelssym" { // actions[Group1]= [ NoAction(), NoAction(), RedirectKey(key=,clearmods=Control) ] // }; }; +partial xkb_symbols "mac_appcycle" { + // Cycle App and In App Tab Switching + key { [ F13 ] }; + key { [ F14 ] }; + replace key { + type[Group1]= "ONE_LEVEL_CMD", + symbols[Group1]= [ + Tab, + Tab, + F14, + F13, + NoSymbol, + NoSymbol + ], + actions[Group1]= [ + NoAction(), + NoAction(), + Redirect(key=), + Redirect(key=), + Redirect(key=,mods=Control,clearmods=Mod4+Super), + Redirect(key=,mods=Control,clearmods=Mod4+Super) + ] + }; +}; +partial xkb_symbols "mac_browsers" { + // Cycle App and In App Tab Switching + key { [ F13 ] }; + key { [ F14 ] }; + replace key { + type[Group1]= "ONE_LEVEL_CMD", + symbols[Group1]= [ + Tab, + Tab, + F14, + F13, + NoSymbol, + NoSymbol + ], + actions[Group1]= [ + NoAction(), + NoAction(), + Redirect(key=), + Redirect(key=), + Redirect(key=,mods=Control,clearmods=Mod4+Super), + Redirect(key=,mods=Control,clearmods=Mod4+Super+Shift) + ] + }; +}; partial xkb_symbols "mac_chrome" { // Back Button replace key { diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index e8dd37b..ee0f2ae 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -28,37 +28,23 @@ partial xkb_symbols "mac_win" { }; partial xkb_symbols "mac_global" { // Cycle App and In App Tab Switching - // replace key { - // type[Group1]= "ONE_LEVEL_CTRL", - // symbols[Group1]= [ - // Tab, - // Tab, - // // backslash, - // Tab, - // // NoSymbol, - // NoSymbol, - // // backslash, - // Tab, - // Tab, - // Tab - // ], - // actions[Group1]= [ - // NoAction(), - // NoAction(), - // // RedirectKey(key=,clearmods=Shift), - // NoAction(), - // // FK18 is just to clear Alt - // // RedirectKey(key=,clearmods=Mod1), - // // Clears Alt + Shift - // RedirectKey(key=,clearmods=Mod1), - // // Also need to remap on the DE level - // // to backslash \ for Cmd+Tab - // // RedirectKey(key=), - // NoAction(), - // RedirectKey(key=,modifiers=Control,clearmods=Mod4), - // RedirectKey(key=,modifiers=Control+Shift,clearmods=Mod4) - // ] - // }; + key { [ F13 ] }; + key { [ F14 ] }; + replace key { + type[Group1]= "ONE_LEVEL_CMD", + symbols[Group1]= [ + Tab, + Tab, + F13, + NoSymbol + ], + actions[Group1]= [ + NoAction(), + NoAction(), + Redirect(key=), + Redirect(key=,mods=Control,clearmods=Mod4+Super) + ] + }; // Page Up replace key { type[Group1]= "ONE_LEVEL_CMD", diff --git a/.xkb/types/mac_gui b/.xkb/types/mac_gui index 36935da..edad36c 100644 --- a/.xkb/types/mac_gui +++ b/.xkb/types/mac_gui @@ -27,11 +27,17 @@ default partial xkb_types "addmac_levels" { level_name[12] = "Super Control Alt"; }; type "ONE_LEVEL_CMD" { - modifiers = Shift+Control; + modifiers = Shift+Control+Super; map[Shift] = Level2; - map[Control] = Level2; + map[Shift+Control] = Level3; + map[Control] = Level4; + map[Super] = Level5; + map[Shift+Super] = Level6; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Control"; + level_name[Level3] = "Control Shift"; + level_name[Level4] = "Control"; + level_name[Level5] = "Super"; + level_name[Level6] = "Super Shift"; }; }; diff --git a/.xkb/types/mac_term b/.xkb/types/mac_term index aa0fc4f..de34832 100644 --- a/.xkb/types/mac_term +++ b/.xkb/types/mac_term @@ -27,11 +27,17 @@ default partial xkb_types "addmac_levels" { level_name[12] = "Super Control Alt"; }; type "ONE_LEVEL_CMD" { - modifiers = Shift+Control; + modifiers = Shift+Control+Super; map[Shift] = Level2; - map[Shift+Control] = Level2; + map[Shift+Control] = Level3; + map[Control] = Level4; + map[Super] = Level5; + map[Shift+Super] = Level6; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Shift Control"; + level_name[Level3] = "Control Shift"; + level_name[Level4] = "Control"; + level_name[Level5] = "Super"; + level_name[Level6] = "Super Shift"; }; }; diff --git a/setup.py b/setup.py index 688d679..9a767eb 100755 --- a/setup.py +++ b/setup.py @@ -85,6 +85,9 @@ dename = cmdline("./system-config/dename.sh") print("Detected\nOS: " + distro + " " + distroVersion + "\nDE: " + dename + "\n") addhotkeys = yn_choice("Do you want to apply system level shortcuts?\nThis will add standardized shortcuts for Kinto to fully operate.\n") if(addhotkeys): + if dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications \"['F13','F13','Tab']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['F14','F14','Tab']\"") if distro == "ubuntu" and dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") From 2a467f2a26ea84dfc6ef2360a0fd74fde7fdaed5 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 28 Feb 2020 23:49:41 -0600 Subject: [PATCH 15/43] - Removed unneeded files --- system-config/system.sh | 66 --------------------------------- system-config/system_hotkeys.sh | 10 ----- 2 files changed, 76 deletions(-) delete mode 100755 system-config/system.sh delete mode 100755 system-config/system_hotkeys.sh diff --git a/system-config/system.sh b/system-config/system.sh deleted file mode 100755 index 5608d2c..0000000 --- a/system-config/system.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh - -lowercase(){ - echo "$1" | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/" -} - -getOS(){ - OS=$(lowercase `uname`) - kernel=`uname -r` - arch=`uname -m` - - OS=`uname` - if [ "${OS}" = "SunOS" ] ; then - OS=Solaris - arch=`uname -p` - OSSTR="${OS} ${version}(${arch} `uname -v`)" - elif [ "${OS}" = "AIX" ] ; then - OSSTR="${OS} `oslevel` (`oslevel -r`)" - elif [ "${OS}" = "Linux" ] ; then - if [ -f /etc/redhat-release ] ; then - distro=`cat /etc/redhat-release |sed s/\ release.*//` - codename=`cat /etc/redhat-release | sed s/.*\(// | sed s/\)//` - version=`cat /etc/redhat-release | sed s/.*release\ // | sed s/\ .*//` - base='RedHat' - elif [ -f /etc/SuSE-release ] ; then - codename=`cat /etc/SuSE-release | tr "\n" ' '| sed s/VERSION.*//` - version=`cat /etc/SuSE-release | tr "\n" ' ' | sed s/.*=\ //` - base='SuSe' - elif [ -f /etc/debian_version ] ; then - if [ -f /etc/lsb-release ] ; then - distro=`cat /etc/lsb-release | grep '^DISTRIB_ID' | awk -F= '{ print $2 }'` - codename=`cat /etc/lsb-release | grep '^DISTRIB_CODENAME' | awk -F= '{ print $2 }'` - version=`cat /etc/lsb-release | grep '^DISTRIB_RELEASE' | awk -F= '{ print $2 }'` - fi - base='Debian' - fi - if [ -f /etc/UnitedLinux-release ] ; then - distro="${distro}[`cat /etc/UnitedLinux-release | tr "\n" ' ' | sed s/VERSION.*//`]" - fi - OS=`lowercase $OS` - base=`lowercase $base` - readonly OS - readonly distro - readonly base - readonly codename - readonly version - readonly kernel - readonly arch - fi -} -getOS - -# echo "OS: $OS" -# echo "base: $base" -# echo "distro: $distro" -# echo "codename: $codename" -# echo "version: $version" -# echo "kernel: $kernel" -# echo "arch: $arch" -# echo "" - -# if [ "${distro}" = "Ubuntu" ] ; then -# echo "Apply Ubuntu Tweaks" -# fi - - diff --git a/system-config/system_hotkeys.sh b/system-config/system_hotkeys.sh deleted file mode 100755 index dc04fe6..0000000 --- a/system-config/system_hotkeys.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ "$1" = "term" ]; - then - gsettings set org.gnome.desktop.wm.keybindings switch-applications "['Tab']" - gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['']" -else - gsettings set org.gnome.desktop.wm.keybindings switch-applications "['Tab']" - gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['Tab']" -fi From 3cf480d72469e053d9a6da1640cf4561fdeb93aa Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 28 Feb 2020 23:59:16 -0600 Subject: [PATCH 16/43] - Fixed broken wordwise, skip by word. --- .xkb/symbols/mac_gui | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index ffb4561..4690b83 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -83,8 +83,8 @@ default partial xkb_symbols "mac_levelssym" { NoAction(), NoAction(), // Wordwise - RedirectKey(key=,clearmods=Mod1), - RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,mods=Control,clearmods=Mod1), + RedirectKey(key=,mods=Control,clearmods=Mod1), RedirectKey(key=,clearmods=Control), RedirectKey(key=,clearmods=Control), // Change workspace @@ -109,8 +109,8 @@ default partial xkb_symbols "mac_levelssym" { NoAction(), NoAction(), // Wordwise - RedirectKey(key=,clearmods=Mod1), - RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,mods=Control,clearmods=Mod1), + RedirectKey(key=,mods=Control,clearmods=Mod1), RedirectKey(key=,clearmods=Control), RedirectKey(key=,clearmods=Control), // Change workspace From 4140a06d53e3e47b535f7da32c283a3654883ee5 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 29 Feb 2020 00:38:09 -0600 Subject: [PATCH 17/43] - Updated mac_gui and setup for app cycle --- .xkb/symbols/mac_gui | 64 ++++++++++++++++++++++++++++++++++++++++++++ defaults.json | 12 ++++----- setup.py | 8 +++--- 3 files changed, 74 insertions(+), 10 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 4690b83..3e55f07 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -259,6 +259,70 @@ partial xkb_symbols "mac_browsers" { Redirect(key=,mods=Control,clearmods=Mod4+Super+Shift) ] }; + //Up to Mac Home + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + Up, + Up, + Up, + Up, + NoSymbol, + NoSymbol, + Up + ], + actions[Group1]= [ + NoAction(), + NoAction(), + // Wordwise + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=), + RedirectKey(key=), + // Wordwise - Sublime? + RedirectKey(key=,clearmods=Super), + RedirectKey(key=,modifiers=Mod1,clearmods=Super) + ] + }; + // Down to Mac End + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + Down, + Down, + Down, + Down, + NoSymbol, + NoSymbol, + Down + ], + actions[Group1]= [ + NoAction(), + NoAction(), + // Wordwise + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=), + RedirectKey(key=), + // Wordwise - Sublime? + RedirectKey(key=,clearmods=Super), + RedirectKey(key=,modifiers=Mod1,clearmods=Super) + ] + }; + // Alt BKSP to DELETE + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + BackSpace, + BackSpace, + BackSpace + ], + actions[Group1]= [ + NoAction(), + NoAction(), + RedirectKey(key=,clearmods=Mod1) + ] + }; }; partial xkb_symbols "mac_chrome" { // Back Button diff --git a/defaults.json b/defaults.json index f22e501..273f1ad 100644 --- a/defaults.json +++ b/defaults.json @@ -11,7 +11,7 @@ "description":"Standard Windows 104 Keyboards", "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":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)", + "xkb_symbols_gui":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term(mac_win)+mac_term(mac_global)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" @@ -24,7 +24,7 @@ "description":"Standard Mac Keyboards with Apple driver", "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":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)", + "xkb_symbols_gui":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term(mac_win)+mac_term(mac_global)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)", @@ -38,7 +38,7 @@ "description":"Standard Mac Keyboards", "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":"+ctrl(swap_lwin_lctl)+ctrl(swap_rwin_rctl)+mac_gui(mac_levelssym)", + "xkb_symbols_gui":"+ctrl(swap_lwin_lctl)+ctrl(swap_rwin_rctl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(alt_super_win)+mac_term(mac_apple)+mac_term(mac_global)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" @@ -51,7 +51,7 @@ "description":"Standard Chromebook Keyboards", "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_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" @@ -65,7 +65,7 @@ "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.mac.gui $DISPLAY", - "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)", + "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" @@ -78,7 +78,7 @@ "description":"Chromebook with Mac Keyboard", "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_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" diff --git a/setup.py b/setup.py index 9a767eb..75fb109 100755 --- a/setup.py +++ b/setup.py @@ -212,8 +212,8 @@ if os.path.isdir(homedir + "/.xkb/keymap") == False: time.sleep(0.5) os.system('setxkbmap -option') os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui') -os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.nw') os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.chrome') +os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.browsers') os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.term') time.sleep(0.5) @@ -225,9 +225,9 @@ cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1][ cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term') -cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)","") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.nw') -cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)","+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') -cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.nw') +cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') +cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') +cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') From 5003d6fa9b5b80388a87eb6ff7371b8e01ede8e1 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 29 Feb 2020 03:07:50 -0600 Subject: [PATCH 18/43] - Added all shortcuts but minimize and change workspace due to conflict issues --- .xkb/symbols/mac_gui | 97 +++++++++++++++++++++++++++++++++++++++++++ .xkb/symbols/mac_term | 69 ++++++++++++++++++++++++++++++ setup.py | 27 +++++++++--- 3 files changed, 187 insertions(+), 6 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 3e55f07..a289949 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -29,6 +29,103 @@ // ] // }; default partial xkb_symbols "mac_levelssym" { + // // Minimize window Cmd + H = Alt + F9 + // replace key { + // type[Group1]= "ONE_LEVEL_CTRL", + // symbols[Group1]= [ + // h, + // H, + // h, + // H, + // F9 + // ], + // actions[Group1]= [ + // NoAction(), + // NoAction(), + // NoAction(), + // NoAction(), + // RedirectKey(key=,modifiers=Mod1,clearmods=Control) + // ] + // }; + // Maximize Window Ctrl + Cmd + F = Alt+F10 + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + f, + F, + f, + F, + f, + F, + f, + F, + f, + F10 + ], + actions[Group1]= [ + NoAction(), + NoAction(), + NoAction(), + NoAction(), + NoAction(), + NoAction(), + NoAction(), + NoAction(), + NoAction(), + RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control) + ] + }; + // Close App Cmd + Q/W = Alt + F4 + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + q, + Q, + q, + Q, + F4 + ], + actions[Group1]= [ + NoAction(), + NoAction(), + NoAction(), + NoAction(), + RedirectKey(key=,modifiers=Mod1,clearmods=Control) + ] + }; + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + w, + w, + W, + F4 + ], + actions[Group1]= [ + NoAction(), + NoAction(), + NoAction(), + RedirectKey(key=,modifiers=Mod1,clearmods=Control) + ] + }; + // Show Desktop Cmd + F3 = Super + D + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + F3, + F3, + F3, + F3, + d + ], + actions[Group1]= [ + NoAction(), + NoAction(), + NoAction(), + NoAction(), + RedirectKey(key=,modifiers=Super,clearmods=Control) + ] + }; // Fix the G key for Sublime Text replace key { type[Group1]= "ONE_LEVEL_CTRL", diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index ee0f2ae..30f3e46 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -27,6 +27,75 @@ partial xkb_symbols "mac_win" { }; }; partial xkb_symbols "mac_global" { + // // Minimize Window Cmd + H = Alt+F9 + // replace key { + // type[Group1]= "ONE_LEVEL_CTRL", + // symbols[Group1]= [ + // h, + // H, + // H + // ], + // actions[Group1]= [ + // NoAction(), + // NoAction(), + // RedirectKey(key=,modifiers=Super,clearmods=Control+Shift) + // ] + // }; + // Maximize Window Ctrl + Cmd + F = Alt+F10 + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + f, + F, + F + ], + actions[Group1]= [ + NoAction(), + NoAction(), + RedirectKey(key=,modifiers=Mod1,clearmods=Control+Shift) + ] + }; + // Close App Cmd + Q/W = Alt + F4 + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + q, + Q, + F4 + ], + actions[Group1]= [ + NoAction(), + NoAction(), + RedirectKey(key=,modifiers=Mod1,clearmods=Control+Shift) + ] + }; + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + w, + W, + F4 + ], + actions[Group1]= [ + NoAction(), + NoAction(), + RedirectKey(key=,modifiers=Mod1,clearmods=Control+Shift) + ] + }; + // Show Desktop Cmd + F3 = Super + D + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + F3, + F3, + D + ], + actions[Group1]= [ + NoAction(), + NoAction(), + RedirectKey(key=,modifiers=Super,clearmods=Control+Shift) + ] + }; // Cycle App and In App Tab Switching key { [ F13 ] }; key { [ F14 ] }; diff --git a/setup.py b/setup.py index 75fb109..b88344e 100755 --- a/setup.py +++ b/setup.py @@ -78,26 +78,39 @@ if len(check_xdotool) == 0: if runpkg != 0: requirements(pkgm) -distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").lower() -distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").lower() -dename = cmdline("./system-config/dename.sh") +distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip() +distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip() +dename = cmdline("./system-config/dename.sh").replace('"','').strip() -print("Detected\nOS: " + distro + " " + distroVersion + "\nDE: " + dename + "\n") -addhotkeys = yn_choice("Do you want to apply system level shortcuts?\nThis will add standardized shortcuts for Kinto to fully operate.\n") +print("\nIf Kinto is already running it will be stopped...") +print("If you cancel the installer you can re-run Kinto via\n systemctl --user start keyswap") + +cmdline("systemctl --user stop keyswap") +addhotkeys = yn_choice("\nDo you want to apply system level shortcuts?") if(addhotkeys): + print("\nDetected " + distro + " " + distroVersion.strip() + " DE: " + dename) + distro = distro.lower() if dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications \"['F13','F13','Tab']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['F14','F14','Tab']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") if distro == "ubuntu" and dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") elif distro == "pop!_os" and dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings close \"['F4','w']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") elif distro == "elementaryos" and dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d','Down']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") elif distro == "galliumos" and dename == "xfce": cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/d\" --create --type string --set \"show_desktop_key\"") cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Tab\" --set \"cycle_reverse_windows_key\"") @@ -112,6 +125,8 @@ if(addhotkeys): cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") elif distro == "manjaro linux" and dename == "kde": cmdline("kwriteconfig5 --file \"$HOME/.config/kglobalshortcutsrc\" --group \"kwin\" --key \"Maximize Window\" \"Alt+F10,Meta+PgUp,Maximize Window\"") cmdline("kwriteconfig5 --file \"$HOME/.config/kglobalshortcutsrc\" --group \"kwin\" --key \"Minimize Window\" \"Meta+h,Meta+PgDown,Minimize Window\"") @@ -282,7 +297,7 @@ if len(defaultde) != 0: user_config['config'][0]['run'] = keyboardconfigs[defaultkb-1]['gui'] user_config['config'][1]['run'] = keyboardconfigs[defaultkb-1]['term'] -user_config['config'][2]['run'] = keyboardconfigs[defaultkb-1]['gui'] +user_config['config'][2]['run'] = keyboardconfigs[defaultkb-1]['gui'].replace("kbd.mac.gui","kbd.mac.gui.browsers") user_config['config'][3]['run'] = keyboardconfigs[defaultkb-1]['gui'].replace("kbd.mac.gui","kbd.mac.gui.chrome") os.remove(user_file) From f9647a5476473a5a0e45b12f92f7905aad062e2e Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 29 Feb 2020 03:34:44 -0600 Subject: [PATCH 19/43] - Added notes about Cmd+H not being enabled and added sublime text replace hotkey --- .xkb/symbols/mac_gui | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index a289949..2ea4112 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -30,6 +30,9 @@ // }; default partial xkb_symbols "mac_levelssym" { // // Minimize window Cmd + H = Alt + F9 + // // 2 caveats + // // 1 Cmd + H may not pass through on VMs + // // 2 may cause conflicts with apps // replace key { // type[Group1]= "ONE_LEVEL_CTRL", // symbols[Group1]= [ @@ -37,17 +40,18 @@ default partial xkb_symbols "mac_levelssym" { // H, // h, // H, - // F9 + // h // ], // actions[Group1]= [ // NoAction(), // NoAction(), // NoAction(), // NoAction(), - // RedirectKey(key=,modifiers=Mod1,clearmods=Control) + // RedirectKey(key=,modifiers=Super,clearmods=Control) // ] // }; // Maximize Window Ctrl + Cmd + F = Alt+F10 + // Also maps Option + Cmd + F to Control+H for Replace - Sublime replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ @@ -59,7 +63,7 @@ default partial xkb_symbols "mac_levelssym" { F, f, F, - f, + h, F10 ], actions[Group1]= [ @@ -71,7 +75,7 @@ default partial xkb_symbols "mac_levelssym" { NoAction(), NoAction(), NoAction(), - NoAction(), + RedirectKey(key=,clearmods=Mod1), RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control) ] }; From 51e86149bcf628f00001a1f32c0bdbaa5661f6c1 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 29 Feb 2020 03:59:01 -0600 Subject: [PATCH 20/43] - Fixed workspace change on pop! os, need to apply to rest --- .xkb/symbols/mac_gui | 14 ++++---------- setup.py | 2 ++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 2ea4112..1728825 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -177,8 +177,7 @@ default partial xkb_symbols "mac_levelssym" { Left, Left, NoSymbol, - NoSymbol, - Left + NoSymbol ], actions[Group1]= [ NoAction(), @@ -189,9 +188,7 @@ default partial xkb_symbols "mac_levelssym" { RedirectKey(key=,clearmods=Control), RedirectKey(key=,clearmods=Control), // Change workspace - NoAction(), - // Wordwise - Sublime? - RedirectKey(key=,modifiers=Mod1,clearmods=Super) + NoAction() ] }; // Right to End of Line or end of word @@ -203,8 +200,7 @@ default partial xkb_symbols "mac_levelssym" { Right, Right, NoSymbol, - NoSymbol, - Right + NoSymbol ], actions[Group1]= [ NoAction(), @@ -215,9 +211,7 @@ default partial xkb_symbols "mac_levelssym" { RedirectKey(key=,clearmods=Control), RedirectKey(key=,clearmods=Control), // Change workspace - NoAction(), - // Wordwise - Sublime? - RedirectKey(key=,modifiers=Mod1,clearmods=Super) + NoAction() ] }; //Up to Mac Home diff --git a/setup.py b/setup.py index 8fa7926..a4ac404 100755 --- a/setup.py +++ b/setup.py @@ -106,6 +106,8 @@ if(addhotkeys): cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['Up','Left']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['Down','Right']\"") elif distro == "elementaryos" and dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d','Down']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") From 4a9ced9478f92d2f9e77baf08bcf32e490baafd8 Mon Sep 17 00:00:00 2001 From: Ryan Reaves Date: Sat, 29 Feb 2020 14:33:16 -0600 Subject: [PATCH 21/43] - Removed Cmd+W from closing an app, should and already closes tabs --- .xkb/symbols/mac_gui | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 1728825..bce328d 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -79,7 +79,7 @@ default partial xkb_symbols "mac_levelssym" { RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control) ] }; - // Close App Cmd + Q/W = Alt + F4 + // Close App Cmd + Q = Alt + F4 replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ @@ -97,21 +97,6 @@ default partial xkb_symbols "mac_levelssym" { RedirectKey(key=,modifiers=Mod1,clearmods=Control) ] }; - replace key { - type[Group1]= "ONE_LEVEL_CTRL", - symbols[Group1]= [ - w, - w, - W, - F4 - ], - actions[Group1]= [ - NoAction(), - NoAction(), - NoAction(), - RedirectKey(key=,modifiers=Mod1,clearmods=Control) - ] - }; // Show Desktop Cmd + F3 = Super + D replace key { type[Group1]= "ONE_LEVEL_CTRL", From 19381a55284f7f8db729418845cfb1c95b7a1c9f Mon Sep 17 00:00:00 2001 From: Ryan Reaves Date: Sat, 29 Feb 2020 17:48:55 -0600 Subject: [PATCH 22/43] - Updated files to support app switching on chromebooks with xfce --- .xkb/symbols/mac_gui | 36 ++++++++++++++++++++++++++++++++++++ defaults.json | 12 ++++++------ 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index bce328d..b9f2530 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -292,6 +292,36 @@ default partial xkb_symbols "mac_levelssym" { // actions[Group1]= [ NoAction(), NoAction(), RedirectKey(key=,clearmods=Control) ] // }; }; +partial xkb_symbols "mac_appcycle_chromebook" { + // Cycle App and In App Tab Switching + key { [ F13 ] }; + key { [ F14 ] }; + replace key { + type[Group1]= "ONE_LEVEL_CMD", + symbols[Group1]= [ + Tab, + Tab, + F14, + F13, + NoSymbol, + NoSymbol + ], + actions[Group1]= [ + // Alt + Redirect(key=,mods=Control,clearmods=Mod1), + // Alt + Shift + Redirect(key=,mods=Control,clearmods=Mod1), + // Control + Redirect(key=), + // Control + Shift + Redirect(key=), + // Super + NoAction(), + // Super + Shift + NoAction() + ] + }; +}; partial xkb_symbols "mac_appcycle" { // Cycle App and In App Tab Switching key { [ F13 ] }; @@ -307,11 +337,17 @@ partial xkb_symbols "mac_appcycle" { NoSymbol ], actions[Group1]= [ + // Alt NoAction(), + // Alt + Shift NoAction(), + // Control Redirect(key=), + // Control + Shift Redirect(key=), + // Super Redirect(key=,mods=Control,clearmods=Mod4+Super), + // Super + Shift Redirect(key=,mods=Control,clearmods=Mod4+Super) ] }; diff --git a/defaults.json b/defaults.json index 273f1ad..45a8b58 100644 --- a/defaults.json +++ b/defaults.json @@ -45,40 +45,40 @@ }, { "id": 4, - "name":"Chromebook", + "name":"Chromebook (xfce)", "type":"chromebook", "active": false, "description":"Standard Chromebook Keyboards", "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)+mac_gui(mac_appcycle)", + "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" }, { "id": 5, - "name":"Chromebook - Windows", + "name":"Chromebook (xfce) - Windows", "type":"chromebook", "active": false, "description":"Chromebook with Windows 104 Keyboard", "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.mac.gui $DISPLAY", - "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", + "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" }, { "id": 6, - "name":"Chromebook - Mac", + "name":"Chromebook (xfce) - Mac", "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.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)+mac_gui(mac_appcycle)", + "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" From 7cb14dfbf32e91561ccd0c87213df3b652d4333c Mon Sep 17 00:00:00 2001 From: Ryan Reaves Date: Sat, 29 Feb 2020 23:37:56 -0600 Subject: [PATCH 23/43] - Added proper shortcuts for browser tab and app switching, updated installer. Chromebook related, galliumOS, xfce. --- .xkb/symbols/mac_gui | 123 +++++++++++++++++++++++++++++++--- setup.py | 156 +++++++++++++++++++++++++------------------ 2 files changed, 205 insertions(+), 74 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index b9f2530..4d13ea5 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -294,27 +294,29 @@ default partial xkb_symbols "mac_levelssym" { }; partial xkb_symbols "mac_appcycle_chromebook" { // Cycle App and In App Tab Switching - key { [ F13 ] }; - key { [ F14 ] }; replace key { - type[Group1]= "ONE_LEVEL_CMD", + type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ Tab, Tab, - F14, - F13, + Tab, + Tab, + backslash, + backslash, NoSymbol, NoSymbol ], actions[Group1]= [ + NoAction(), + NoAction(), // Alt Redirect(key=,mods=Control,clearmods=Mod1), // Alt + Shift Redirect(key=,mods=Control,clearmods=Mod1), // Control - Redirect(key=), - // Control + Shift - Redirect(key=), + Redirect(key=), + // Control+Shift + Redirect(key=), // Super NoAction(), // Super + Shift @@ -337,9 +339,9 @@ partial xkb_symbols "mac_appcycle" { NoSymbol ], actions[Group1]= [ - // Alt + // Base NoAction(), - // Alt + Shift + // Shift NoAction(), // Control Redirect(key=), @@ -352,6 +354,102 @@ partial xkb_symbols "mac_appcycle" { ] }; }; +partial xkb_symbols "mac_browsers_chromebook" { + // Cycle App and In App Tab Switching + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + Tab, + Tab, + NoSymbol, + NoSymbol, + backslash, + backslash, + NoSymbol, + NoSymbol + ], + actions[Group1]= [ + NoAction(), + NoAction(), + // Alt + Redirect(key=,mods=Control,clearmods=Mod1), + // Alt + Shift + Redirect(key=,mods=Control,clearmods=Mod1+Shift), + // Control + Redirect(key=), + // Control+Shift + Redirect(key=), + // Super + NoAction(), + // Super + Shift + NoAction() + ] + }; + //Up to Mac Home + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + Up, + Up, + Up, + Up, + NoSymbol, + NoSymbol, + Up + ], + actions[Group1]= [ + NoAction(), + NoAction(), + // Wordwise + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=), + RedirectKey(key=), + // Wordwise - Sublime? + RedirectKey(key=,clearmods=Super), + RedirectKey(key=,modifiers=Mod1,clearmods=Super) + ] + }; + // Down to Mac End + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + Down, + Down, + Down, + Down, + NoSymbol, + NoSymbol, + Down + ], + actions[Group1]= [ + NoAction(), + NoAction(), + // Wordwise + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=), + RedirectKey(key=), + // Wordwise - Sublime? + RedirectKey(key=,clearmods=Super), + RedirectKey(key=,modifiers=Mod1,clearmods=Super) + ] + }; + // Alt BKSP to DELETE + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + BackSpace, + BackSpace, + BackSpace + ], + actions[Group1]= [ + NoAction(), + NoAction(), + RedirectKey(key=,clearmods=Mod1) + ] + }; +}; partial xkb_symbols "mac_browsers" { // Cycle App and In App Tab Switching key { [ F13 ] }; @@ -452,10 +550,15 @@ partial xkb_symbols "mac_chrome" { Left ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), + // Alt RedirectKey(key=), + // Alt RedirectKey(key=), + // Control RedirectKey(key=,modifiers=Mod1,clearmods=Control) ] }; diff --git a/setup.py b/setup.py index a4ac404..6756a30 100755 --- a/setup.py +++ b/setup.py @@ -33,8 +33,88 @@ def install_ibus(): input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...") sys.exit() +def setShortcuts(): + distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip() + distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip() + dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")[0] + + print("\nIf Kinto is already running it will be stopped...") + print("If you cancel the installer you can re-run Kinto via\n systemctl --user start keyswap") + + cmdline("systemctl --user stop keyswap") + print("\nDetected " + distro + " " + distroVersion.strip() + " DE: " + dename + "\n") + addhotkeys = yn_choice("\nDo you want to apply system level shortcuts?") + if(addhotkeys): + distro = distro.lower() + if dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications \"['F13','F13','Tab']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['F14','F14','Tab']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + if distro == "ubuntu" and dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + elif distro == "pop!_os" and dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings close \"['F4','w']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['Up','Left']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['Down','Right']\"") + elif distro == "elementaryos" and dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d','Down']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + elif distro == "galliumos" and dename == "xfce": + print("Applying GalliumOS (xfce) shortcuts...") + # Reset Show desktop + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/d" --reset') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/d" --create --type string --set "show_desktop_key"') + # Reset App Cycle + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Tab" --reset') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Tab" --reset') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/backslash" --create --type string --set "cycle_windows_key"') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/backslash" --create --type string --set "cycle_reverse_windows_key"') + # cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/h" --create --type string --set "hide_window_key"') + # Don't need to undo other maps for menu + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/space" --create --type string --set "xfce4-popup-whiskermenu"') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/space" --create --type string --set "xfce4-popup-whiskermenu"') + # Reset move to desktop shortcuts + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Home" --reset') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/End" --reset') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Left" --reset') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Right" --reset') + os.system('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Left" --create --type string --set "move_window_prev_workspace_key"') + os.system('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Right" --create --type string --set "move_window_next_workspace_key"') + # Reset Change Workspace + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Left" --reset') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Right" --reset') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Left" --create --type string --set "left_workspace_key"') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Right" --create --type string --set "right_workspace_key"') + print("\nYou may need to run these commands manually to make sure they are set, if you want to move windows between desktops.\n") + print(' xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Left" --create --type string --set "move_window_prev_workspace_key"') + print(' xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Right" --create --type string --set "move_window_next_workspace_key"\n') + elif distro == "fedora" and dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + elif distro == "manjaro linux" and dename == "kde": + cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Maximize Window" "Alt+F10,Meta+PgUp,Maximize Window"') + cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window"') + cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Next Desktop" "Meta+Right,Meta+Right,Switch to Next Desktop"') + cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Previous Desktop" "Meta+Left,Meta+Left,Switch to Previous Desktop"') + cmdline('kquitapp5 kglobalaccel && sleep 2s && kglobalaccel5 &') + else: + print("A supported OS and DE was not found, you may not have full system level shortcuts installed.") + # check_x11 = cmdline("env | grep -i x11").strip() -check_x11 = cmdline("env | grep -i x11 || loginctl show-session \"$XDG_SESSION_ID\" -p Type | awk -F= '{print $2}'").strip() +check_x11 = cmdline("(env | grep -i x11 || loginctl show-session \"$XDG_SESSION_ID\" -p Type) | awk -F= '{print $2}'").strip() if len(check_x11) == 0: print("You are not using x11, please logout and back in using x11/Xorg") @@ -79,66 +159,6 @@ if len(check_xdotool) == 0: if runpkg != 0: requirements(pkgm) -distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip() -distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip() -dename = cmdline("./system-config/dename.sh").replace('"','').strip() - -print("\nIf Kinto is already running it will be stopped...") -print("If you cancel the installer you can re-run Kinto via\n systemctl --user start keyswap") - -cmdline("systemctl --user stop keyswap") -addhotkeys = yn_choice("\nDo you want to apply system level shortcuts?") -if(addhotkeys): - print("\nDetected " + distro + " " + distroVersion.strip() + " DE: " + dename) - distro = distro.lower() - if dename == "gnome": - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications \"['F13','F13','Tab']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['F14','F14','Tab']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") - if distro == "ubuntu" and dename == "gnome": - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") - elif distro == "pop!_os" and dename == "gnome": - cmdline("gsettings set org.gnome.desktop.wm.keybindings close \"['F4','w']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['Up','Left']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['Down','Right']\"") - elif distro == "elementaryos" and dename == "gnome": - cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d','Down']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") - elif distro == "galliumos" and dename == "xfce": - cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/d\" --create --type string --set \"show_desktop_key\"") - cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Tab\" --set \"cycle_reverse_windows_key\"") - cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Tab\" --set \"cycle_windows_key\"") - cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Tab\" --set \"cycle_windows_key\"") - cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Tab\" --set \"cycle_reverse_windows_key\"") - cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/h\" --create --type string --set \"hide_window_key\"") - cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/commands/custom/space\" --create --type string --set \"xfce4-popup-whiskermenu\"") - cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Left\" --create --type string --set \"move_window_prev_workspace_key\"") - cmdline("xfconf-query --channel xfce4-keyboard-shortcuts --property \"/xfwm4/custom/Right\" --create --type string --set \"move_window_next_workspace_key\"") - elif distro == "fedora" and dename == "gnome": - cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") - elif distro == "manjaro linux" and dename == "kde": - cmdline("kwriteconfig5 --file \"$HOME/.config/kglobalshortcutsrc\" --group \"kwin\" --key \"Maximize Window\" \"Alt+F10,Meta+PgUp,Maximize Window\"") - cmdline("kwriteconfig5 --file \"$HOME/.config/kglobalshortcutsrc\" --group \"kwin\" --key \"Minimize Window\" \"Meta+h,Meta+PgDown,Minimize Window\"") - cmdline("kwriteconfig5 --file \"$HOME/.config/kglobalshortcutsrc\" --group \"kwin\" --key \"Switch to Next Desktop\" \"Meta+Right,Meta+Right,Switch to Next Desktop\"") - cmdline("kwriteconfig5 --file \"$HOME/.config/kglobalshortcutsrc\" --group \"kwin\" --key \"Switch to Previous Desktop\" \"Meta+Left,Meta+Left,Switch to Previous Desktop\"") - cmdline("kquitapp5 kglobalaccel && sleep 2s && kglobalaccel5 &") - else: - print("A supported OS and DE was not found, you may not have full system level shortcuts installed.") - if os.path.exists(homedir + '/.config/ibus/bus') and cmdline("ls ~/.config/ibus/bus -1rt") == "": install_ibus() @@ -205,6 +225,9 @@ print("") keyboardconfigs = [obj for obj in data['defaults'] if(obj['type'] == data['defaulttypes'][default-1])] + +setShortcuts() + # for k in keyboardconfigs: for index, k in enumerate(keyboardconfigs): print(color_arr[default-1] + bcolors.BOLD + str(index+1) + '. ' + k['name'] + bcolors.ENDC) @@ -243,8 +266,13 @@ cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1][ cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term') -cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') -cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') +# Set chrome file accordingly for chromebooks or normal +if default != 3: + cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') + cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') +else: + cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers_chromebook)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') + cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_browsers_chromebook)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') @@ -253,7 +281,7 @@ user_file = homedir + '/.config/kinto/user_config.json' with open(user_file, 'r') as f: user_config = json.load(f) -onetime = yn_choice("One time initialization tweaks are available. Would you like to view them?") +onetime = yn_choice("\nOne time initialization tweaks are available. Would you like to view them?") print("") if(onetime): intents = [obj for obj in user_config['de'] if(obj['intent'] == "init")] From d45b8e29dc045c99cc11a2e75c58f7acd7241326 Mon Sep 17 00:00:00 2001 From: Ryan Reaves Date: Sun, 1 Mar 2020 00:03:04 -0600 Subject: [PATCH 24/43] - Added multicursor fix, particularly for sublime text --- .xkb/symbols/mac_gui | 3 ++- setup.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 4d13ea5..caf77fe 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -216,7 +216,8 @@ default partial xkb_symbols "mac_levelssym" { NoAction(), // Wordwise RedirectKey(key=,clearmods=Mod1), - RedirectKey(key=,clearmods=Mod1), + // RedirectKey(key=), // Chromebook multicursor + RedirectKey(key=,clearmods=Mod1), // Default multicursor RedirectKey(key=), RedirectKey(key=), // Wordwise - Sublime? diff --git a/setup.py b/setup.py index 6756a30..2e13c94 100755 --- a/setup.py +++ b/setup.py @@ -271,6 +271,10 @@ if default != 3: cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') else: + # Fix multicursor in mac_gui + cmdline('sed -i "s/\/\/ RedirectKey(key=), \/\/ C/RedirectKey(key=), \/\/ C/g" ~/.xkb/symbols/mac_gui') + cmdline('sed -i "s/RedirectKey(key=,clearmods=Mod1), \/\/ D/\/\/ RedirectKey(key=,clearmods=Mod1), \/\/ D/g" ~/.xkb/symbols/mac_gui') + # Fix browsers cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers_chromebook)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_browsers_chromebook)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') From 89beeb427b8f0fdc5fae105bb9621037bf347d82 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 1 Mar 2020 18:09:24 -0600 Subject: [PATCH 25/43] - Fixed issue related to the F key trigger Control like behavior when shift is held on terminal. Also updated keymap profiles to be set properly on all installs - chromebook update broke it. --- .xkb/symbols/mac_term | 53 ++++++++++++++++++++----------------------- setup.py | 4 ++-- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index 30f3e46..d07f3c6 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -41,21 +41,30 @@ partial xkb_symbols "mac_global" { // RedirectKey(key=,modifiers=Super,clearmods=Control+Shift) // ] // }; - // Maximize Window Ctrl + Cmd + F = Alt+F10 - replace key { - type[Group1]= "ONE_LEVEL_CTRL", - symbols[Group1]= [ - f, - F, - F - ], - actions[Group1]= [ - NoAction(), - NoAction(), - RedirectKey(key=,modifiers=Mod1,clearmods=Control+Shift) - ] - }; - // Close App Cmd + Q/W = Alt + F4 + + // + // Some sort of glitch occurs on shifting F while this segment is active + // it is like the Control key is being held down when it isn't. + // + // // Maximize Window Ctrl + Cmd + F = Alt+F10 + // replace key { + // type[Group1]= "ONE_LEVEL_CTRL", + // symbols[Group1]= [ + // f, + // F, + // F + // ], + // actions[Group1]= [ + // // Base + // NoAction(), + // // Shift + // NoAction(), + // // Ctrl + Shift + // RedirectKey(key=,modifiers=Mod1,clearmods=Control+Shift) + // ] + // }; + + // Close App Cmd + Q = Alt + F4 replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ @@ -69,19 +78,7 @@ partial xkb_symbols "mac_global" { RedirectKey(key=,modifiers=Mod1,clearmods=Control+Shift) ] }; - replace key { - type[Group1]= "ONE_LEVEL_CTRL", - symbols[Group1]= [ - w, - W, - F4 - ], - actions[Group1]= [ - NoAction(), - NoAction(), - RedirectKey(key=,modifiers=Mod1,clearmods=Control+Shift) - ] - }; + // Show Desktop Cmd + F3 = Super + D replace key { type[Group1]= "ONE_LEVEL_CTRL", diff --git a/setup.py b/setup.py index 2e13c94..52b2595 100755 --- a/setup.py +++ b/setup.py @@ -268,8 +268,8 @@ cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1][ # Set chrome file accordingly for chromebooks or normal if default != 3: - cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') - cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') + cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') + cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') else: # Fix multicursor in mac_gui cmdline('sed -i "s/\/\/ RedirectKey(key=), \/\/ C/RedirectKey(key=), \/\/ C/g" ~/.xkb/symbols/mac_gui') From 68a2d95b724121e0a203e35bc312dcbc7bd13c7f Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 1 Mar 2020 18:38:33 -0600 Subject: [PATCH 26/43] - Added removal of workspace left and right shortcuts for pop!_os, workspaces move up and down so the hotkeys go there now --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 52b2595..a96634a 100755 --- a/setup.py +++ b/setup.py @@ -63,6 +63,8 @@ def setShortcuts(): cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['Up','Left']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['Down','Right']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']") elif distro == "elementaryos" and dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d','Down']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") From 48b3d3f7bdffa81803e1395f9ec2cf55a08670c3 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 1 Mar 2020 18:57:28 -0600 Subject: [PATCH 27/43] - Fixed workspace switching shortcut --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index a96634a..05f6994 100755 --- a/setup.py +++ b/setup.py @@ -52,8 +52,10 @@ def setShortcuts(): cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") if distro == "ubuntu" and dename == "gnome": - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['Up','Left']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['Down','Right']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']") cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") elif distro == "pop!_os" and dename == "gnome": From 2c1fb059203e58dba139a536affb7b99edf743d3 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 1 Mar 2020 20:15:53 -0600 Subject: [PATCH 28/43] - Added ibus-setup since it sometimes needs to be ran if it is not set already, also added elementary epiphany browser. Fixed elementary shortcut install trigger. --- setup.py | 7 +++++-- user_config.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 05f6994..1b8eabb 100755 --- a/setup.py +++ b/setup.py @@ -25,16 +25,19 @@ def requirements(pkgm): def install_ibus(): print(bcolors.CYELLOW + "You need to set IBus as the default Input Method for full word-wise support and re-run this installer.\n" + bcolors.ENDC) + print(bcolors.CYELLOW + "Confirm the IBus Setup by saying Yes and then closing the window.\n" + bcolors.ENDC) + print("ibus-setup\n") print("im-config -n ibus\n") run_install = yn_choice(bcolors.CYELLOW + "Would you like to run it now? (Will require logoff and logon.)\n" + bcolors.ENDC) if(run_install): + os.system("ibus-setup") os.system("im-config -n ibus") print("\n") input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...") sys.exit() def setShortcuts(): - distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip() + distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip().split(" ")[0] distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip() dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")[0] @@ -67,7 +70,7 @@ def setShortcuts(): cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['Down','Right']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']") - elif distro == "elementaryos" and dename == "gnome": + elif distro == "elementary" and dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d','Down']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") diff --git a/user_config.json b/user_config.json index 17bbbff..9652547 100644 --- a/user_config.json +++ b/user_config.json @@ -36,7 +36,7 @@ "symbols": "", "types": "", "de": [], - "appnames": [ "Chromium","Chromium-browser","Google-chrome" ] + "appnames": [ "Chromium","Chromium-browser","Google-chrome","Epiphany" ] }], "init": [], "detypes":["gnome2","gnome3","kde4","kde5","xfce","i3wm"], From c8ab5eb4bac942c32f410266cb42d25f3d8583ab Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 2 Mar 2020 02:16:05 -0600 Subject: [PATCH 29/43] - Fixed tab switching issue under elementary Pantheon Terminal --- .xkb/symbols/mac_term | 22 ++++++++++++++++------ setup.py | 14 +++++++++----- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index d07f3c6..e7faaa0 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -102,13 +102,15 @@ partial xkb_symbols "mac_global" { Tab, Tab, F13, - NoSymbol + // Right // Elementary + NoSymbol // Default ], actions[Group1]= [ NoAction(), NoAction(), Redirect(key=), - Redirect(key=,mods=Control,clearmods=Mod4+Super) + // Redirect(key=,mods=Control+Shift,clearmods=Mod4+Super) // Elementary + Redirect(key=,mods=Control,clearmods=Mod4+Super) // Default ] }; // Page Up @@ -145,12 +147,16 @@ partial xkb_symbols "mac_global" { symbols[Group1]= [ Left, Left, - NoSymbol + NoSymbol // Default + // Left // Elementary + // Left // Elementary ], actions[Group1]= [ NoAction(), NoAction(), - RedirectKey(key=,clearmods=Shift+Control) + RedirectKey(key=,clearmods=Shift+Control) // Default + // Left // Elementary + // RedirectKey(key=,mods=Super,clearmods=Control) // Elementary ] }; // END @@ -159,12 +165,16 @@ partial xkb_symbols "mac_global" { symbols[Group1]= [ Right, Right, - NoSymbol + NoSymbol // Default + // Right, // Elementary + // Right // Elementary ], actions[Group1]= [ NoAction(), NoAction(), - RedirectKey(key=,clearmods=Shift+Control) + RedirectKey(key=,clearmods=Shift+Control) // Default + // NoAction(), // Elementary + // RedirectKey(key=,mods=Super,clearmods=Control) // Elementary ] }; // Full Print Screen diff --git a/setup.py b/setup.py index 1b8eabb..9f3db48 100755 --- a/setup.py +++ b/setup.py @@ -71,11 +71,17 @@ def setShortcuts(): cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']") elif distro == "elementary" and dename == "gnome": + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications \"['F13','F13','Tab']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['F14','F14','Tab']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d','Down']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['F10','Up']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Elementary)/\$2\$3/g" ~/.xkb/symbols/mac_term') + cmdline('perl -pi -e "s/(\w.*)(\/\/ Default)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_term') + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Elementary)/\$2\$3/g" ~/.xkb/symbols/mac_gui') + cmdline('perl -pi -e "s/(\w.*)(\/\/ Default)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui') elif distro == "galliumos" and dename == "xfce": print("Applying GalliumOS (xfce) shortcuts...") # Reset Show desktop @@ -232,9 +238,6 @@ print("") keyboardconfigs = [obj for obj in data['defaults'] if(obj['type'] == data['defaulttypes'][default-1])] - -setShortcuts() - # for k in keyboardconfigs: for index, k in enumerate(keyboardconfigs): print(color_arr[default-1] + bcolors.BOLD + str(index+1) + '. ' + k['name'] + bcolors.ENDC) @@ -279,14 +282,15 @@ if default != 3: cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') else: # Fix multicursor in mac_gui - cmdline('sed -i "s/\/\/ RedirectKey(key=), \/\/ C/RedirectKey(key=), \/\/ C/g" ~/.xkb/symbols/mac_gui') - cmdline('sed -i "s/RedirectKey(key=,clearmods=Mod1), \/\/ D/\/\/ RedirectKey(key=,clearmods=Mod1), \/\/ D/g" ~/.xkb/symbols/mac_gui') + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Chromebook)/\$2\$3/g" ~/.xkb/symbols/mac_gui') + cmdline('perl -pi -e "s/(\w.*)(\/\/ Default)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui') # Fix browsers cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers_chromebook)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_browsers_chromebook)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') +setShortcuts() user_file = homedir + '/.config/kinto/user_config.json' with open(user_file, 'r') as f: From 4078094e3306fd185336e5c405037ee819c34424 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 2 Mar 2020 03:20:31 -0600 Subject: [PATCH 30/43] - Updated files for fedora and gnome compatibility --- .xkb/symbols/mac_gui | 5 ++++- .xkb/symbols/mac_term | 20 ++++++++------------ setup.py | 10 ++++++++-- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index caf77fe..1f058b5 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -162,7 +162,8 @@ default partial xkb_symbols "mac_levelssym" { Left, Left, NoSymbol, - NoSymbol + NoSymbol, + Left ], actions[Group1]= [ NoAction(), @@ -173,6 +174,8 @@ default partial xkb_symbols "mac_levelssym" { RedirectKey(key=,clearmods=Control), RedirectKey(key=,clearmods=Control), // Change workspace + NoAction(), + // Super - Change workspace NoAction() ] }; diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index e7faaa0..a48d571 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -147,16 +147,14 @@ partial xkb_symbols "mac_global" { symbols[Group1]= [ Left, Left, - NoSymbol // Default - // Left // Elementary - // Left // Elementary + NoSymbol, + Left ], actions[Group1]= [ NoAction(), NoAction(), - RedirectKey(key=,clearmods=Shift+Control) // Default - // Left // Elementary - // RedirectKey(key=,mods=Super,clearmods=Control) // Elementary + RedirectKey(key=,clearmods=Shift+Control), + RedirectKey(key=,mods=Super,clearmods=Control) ] }; // END @@ -165,16 +163,14 @@ partial xkb_symbols "mac_global" { symbols[Group1]= [ Right, Right, - NoSymbol // Default - // Right, // Elementary - // Right // Elementary + NoSymbol, + Right ], actions[Group1]= [ NoAction(), NoAction(), - RedirectKey(key=,clearmods=Shift+Control) // Default - // NoAction(), // Elementary - // RedirectKey(key=,mods=Super,clearmods=Control) // Elementary + RedirectKey(key=,clearmods=Shift+Control), + RedirectKey(key=,mods=Super,clearmods=Control) ] }; // Full Print Screen diff --git a/setup.py b/setup.py index 9f3db48..402447d 100755 --- a/setup.py +++ b/setup.py @@ -113,10 +113,16 @@ def setShortcuts(): print(' xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Right" --create --type string --set "move_window_next_workspace_key"\n') elif distro == "fedora" and dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['Left','Left']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['Right','Right']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['Page_Up','Left']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['Page_Down','Right']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']") + cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-right \"['Right']\"") + cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-left \"['Left']\"") + # org.gnome.mutter.keybindings toggle-tiled-right ['Right'] + # org.gnome.mutter.keybindings toggle-tiled-left ['Left'] elif distro == "manjaro linux" and dename == "kde": cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Maximize Window" "Alt+F10,Meta+PgUp,Maximize Window"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window"') From df9b8d974ef68734acde2fa8c4fe78efa95b14ab Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 6 Mar 2020 13:43:51 -0600 Subject: [PATCH 31/43] - Fixed workspace switching shortcut for ubuntu and elementaryos --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 402447d..89e2525 100755 --- a/setup.py +++ b/setup.py @@ -113,12 +113,12 @@ def setShortcuts(): print(' xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/Right" --create --type string --set "move_window_next_workspace_key"\n') elif distro == "fedora" and dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['d']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['Page_Up','Left']\"") - cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['Page_Down','Right']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['Up','Left']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['Down','Right']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']") + cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") + cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-right \"['Right']\"") cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-left \"['Left']\"") # org.gnome.mutter.keybindings toggle-tiled-right ['Right'] From 1d59d8d6439c850524c744170bbc648edfa5185e Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 7 Mar 2020 14:26:37 -0600 Subject: [PATCH 32/43] - Closes ticket #52, adds Ctrl+a/e begin/end to gui --- .xkb/symbols/mac_gui | 60 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 1f058b5..a013176 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -52,6 +52,66 @@ default partial xkb_symbols "mac_levelssym" { // }; // Maximize Window Ctrl + Cmd + F = Alt+F10 // Also maps Option + Cmd + F to Control+H for Replace - Sublime + // AD03=e,E + // AC01=a,A + // Ctrl + E - End of Line + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + // Base + a, + // Shift + A, + // Alt + a, + // Shift Alt + A, + // Super + NoSymbol, + // Shift Super + NoSymbol + + ], + actions[Group1]= [ + NoAction(), + NoAction(), + NoAction(), + NoAction(), + NoAction(), + NoAction(), + RedirectKey(key=,clearmods=Super), + RedirectKey(key=,clearmods=Super) + ] + }; + // Ctrl + E - End of Line + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + // Base + e, + // Shift + E, + // Alt + e, + // Shift Alt + E, + // Super + NoSymbol, + // Shift Super + NoSymbol + + ], + actions[Group1]= [ + NoAction(), + NoAction(), + NoAction(), + NoAction(), + NoAction(), + NoAction(), + RedirectKey(key=,clearmods=Super), + RedirectKey(key=,clearmods=Super) + ] + }; replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ From b9042356536bfd3835be4ac4af0a0349fccd6354 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 9 Mar 2020 17:59:46 -0500 Subject: [PATCH 33/43] - Separating xkb types to avoid select-all chrome bug on Super(ctrl)+a --- .xkb/symbols/mac_gui | 24 +++--------------------- .xkb/types/mac_gui | 10 ++++++++++ 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index a013176..2996749 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -54,29 +54,20 @@ default partial xkb_symbols "mac_levelssym" { // Also maps Option + Cmd + F to Control+H for Replace - Sublime // AD03=e,E // AC01=a,A - // Ctrl + E - End of Line + // Ctrl + A - Beginning of Line replace key { - type[Group1]= "ONE_LEVEL_CTRL", + type[Group1]= "ONE_LEVEL_SUPER", symbols[Group1]= [ // Base a, // Shift A, - // Alt - a, - // Shift Alt - A, // Super NoSymbol, // Shift Super NoSymbol - ], actions[Group1]= [ - NoAction(), - NoAction(), - NoAction(), - NoAction(), NoAction(), NoAction(), RedirectKey(key=,clearmods=Super), @@ -85,27 +76,18 @@ default partial xkb_symbols "mac_levelssym" { }; // Ctrl + E - End of Line replace key { - type[Group1]= "ONE_LEVEL_CTRL", + type[Group1]= "ONE_LEVEL_SUPER", symbols[Group1]= [ // Base e, // Shift E, - // Alt - e, - // Shift Alt - E, // Super NoSymbol, // Shift Super NoSymbol - ], actions[Group1]= [ - NoAction(), - NoAction(), - NoAction(), - NoAction(), NoAction(), NoAction(), RedirectKey(key=,clearmods=Super), diff --git a/.xkb/types/mac_gui b/.xkb/types/mac_gui index edad36c..9c747d0 100644 --- a/.xkb/types/mac_gui +++ b/.xkb/types/mac_gui @@ -40,4 +40,14 @@ default partial xkb_types "addmac_levels" { level_name[Level5] = "Super"; level_name[Level6] = "Super Shift"; }; + type "ONE_LEVEL_SUPER" { + modifiers = Shift+Super; + map[Shift] = Level2; + map[Super] = Level3; + map[Shift+Super] = Level4; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Super"; + level_name[Level4] = "Super Shift"; + }; }; From c6605c68cfe63c32041b044cf5b10b7337ec6e8f Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 28 Mar 2020 15:55:33 -0500 Subject: [PATCH 34/43] - Fixes Kinto startup delay on cold boots. Closes #65 --- keyswap_service.sh | 6 ++++-- system-config/keyswap.timer | 11 +++++++++++ system-config/kinto.desktop | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 system-config/keyswap.timer diff --git a/keyswap_service.sh b/keyswap_service.sh index aea1719..0832156 100755 --- a/keyswap_service.sh +++ b/keyswap_service.sh @@ -8,6 +8,7 @@ mkdir -p ~/.config/systemd/user mkdir -p ~/.config/autostart cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service cp ./system-config/kinto.desktop ~/.config/autostart/kinto.desktop +cp ./system-config/keyswap.timer ~/.config/systemd/user/keyswap.timer cp ./kintox11/binary/kintox11 ~/.config/kinto/kintox11 cp ./system-config/xactive.sh ~/.config/kinto/xactive.sh cp ./system-config/caret_status.sh ~/.config/kinto/caret_status.sh @@ -20,5 +21,6 @@ if [ "${#DISPLAY}" -gt 2 ] sed -i "s/#Environment/Environment/g" ~/.config/systemd/user/keyswap.service fi systemctl --user daemon-reload -systemctl --user enable keyswap -systemctl --user start keyswap +sed -i "s/ExecStart=/ExecStart=${swapcmd}/g" ~/.config/systemd/user/keyswap.service +systemctl --user enable keyswap.timer +systemctl --user start keyswap.timer diff --git a/system-config/keyswap.timer b/system-config/keyswap.timer new file mode 100644 index 0000000..e2232c1 --- /dev/null +++ b/system-config/keyswap.timer @@ -0,0 +1,11 @@ +# keyswap.timer +[Unit] +Description=Runs the keyswap.service 5 seconds after boot up + +[Timer] +#OnBootSec=5s +OnActiveSec=5s +Unit=keyswap.service + +[Install] +WantedBy=default.target diff --git a/system-config/kinto.desktop b/system-config/kinto.desktop index 86dba86..c3c139c 100644 --- a/system-config/kinto.desktop +++ b/system-config/kinto.desktop @@ -2,7 +2,7 @@ Name=Kinto GenericName=Kinto Comment=Make Linux Type Like it's a Mac -Exec=/usr/bin/systemctl --user start keyswap +Exec=/bin/sleep 5 /usr/bin/systemctl --user start keyswap Terminal=false Type=Application X-GNOME-Autostart-enabled=true \ No newline at end of file From b1851316de535100163a4a4f31b7f3beaf8cf41a Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 30 Mar 2020 23:13:35 -0500 Subject: [PATCH 35/43] - Prep work for proper KDE Plasma 5 hotkey support in KDE Neon --- setup.py | 3 ++- system-config/dename.sh | 50 +++++++++++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/setup.py b/setup.py index 01b3770..b6a25ef 100755 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ def install_ibus(): def setShortcuts(): distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip().split(" ")[0] distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip() - dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")[0] + dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")[0].lower() print("\nIf Kinto is already running it will be stopped...") print("If you cancel the installer you can re-run Kinto via\n systemctl --user start keyswap") @@ -130,6 +130,7 @@ def setShortcuts(): cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Previous Desktop" "Meta+Left,Meta+Left,Switch to Previous Desktop"') cmdline('kquitapp5 kglobalaccel && sleep 2s && kglobalaccel5 &') else: + print('distro: ' + distro + ' de: ' + dename) print("A supported OS and DE was not found, you may not have full system level shortcuts installed.") # check_x11 = cmdline("env | grep -i x11").strip() diff --git a/system-config/dename.sh b/system-config/dename.sh index 7725e2c..ae2392c 100755 --- a/system-config/dename.sh +++ b/system-config/dename.sh @@ -12,7 +12,7 @@ function detect_gnome() return 1 } -function detect_kde() +function detect_kde4() { ps -e | grep -E '^.* kded4$' > /dev/null if [ $? -ne 0 ]; @@ -25,6 +25,19 @@ function detect_kde() fi } +function detect_kde() +{ + ps -e | grep -E '^.* kded5$' > /dev/null + if [ $? -ne 0 ]; + then + return 0 + else + VERSION=`kded5 --version | grep -m 1 'KDE' | awk -F ':' '{print $2}' | awk '{print $1}'` + DESKTOP="KDE" + return 1 + fi +} + function detect_unity() { ps -e | grep -E 'unity-panel' > /dev/null @@ -118,22 +131,25 @@ if detect_unity; then if detect_kde; then - if detect_gnome; - then - if detect_xfce; - then - if detect_cinnamon; - then - if detect_mate; - then - if detect_lxde; - then - detect_sugar - fi - fi - fi - fi - fi + if detect_kde4; + then + if detect_gnome; + then + if detect_xfce; + then + if detect_cinnamon; + then + if detect_mate; + then + if detect_lxde; + then + detect_sugar + fi + fi + fi + fi + fi + fi fi fi From a6688ffc4400a5fbf6573dac76822fdce8a884d3 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 00:00:30 -0500 Subject: [PATCH 36/43] - Added comments to mac_gui --- .xkb/symbols/mac_gui | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 49e73d8..469a967 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -111,28 +111,52 @@ default partial xkb_symbols "mac_levelssym" { replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base f, + // Shift F, + // Alt f, + // Shift Alt F, + // Control f, + // Shift Control F, + // Super f, + // Shift Super F, + // Control Alt h, + // Super Control F10 + // Super Alt + // Super Control Alt ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), + // Alt NoAction(), + // Shift Alt NoAction(), + // Control NoAction(), + // Shift Control NoAction(), + // Super NoAction(), + // Shift Super NoAction(), + // Control Alt RedirectKey(key=,clearmods=Mod1), + // Super Control RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control) + // Super Alt + // Super Control Alt ] }; // Close App Cmd + Q = Alt + F4 @@ -626,17 +650,27 @@ partial xkb_symbols "mac_chrome" { replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base Right, + // Shift Right, + // Alt NoSymbol, + // Shift Alt NoSymbol, + // Control Right ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), + // Alt RedirectKey(key=), + // Shift Alt RedirectKey(key=), + // Control RedirectKey(key=,modifiers=Mod1,clearmods=Control) ] }; From 3b9ce890dc47f7150d690dabee748e0b05c63045 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 00:06:40 -0500 Subject: [PATCH 37/43] - Corrected merge of setup.py --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py index f625333..96c6449 100755 --- a/setup.py +++ b/setup.py @@ -36,7 +36,6 @@ def install_ibus(): input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...") sys.exit() -<<<<<<< HEAD def setShortcuts(): distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip().split(" ")[0] distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip() @@ -133,7 +132,7 @@ def setShortcuts(): else: print('distro: ' + distro + ' de: ' + dename) print("A supported OS and DE was not found, you may not have full system level shortcuts installed.") -======= + def windows_setup(): keymaps = ["Apple keyboard standard", "Apple keyboard w/ Caps lock as Esc", "Windows keyboard standard", "Windows keyboard w/ Caps lock as Esc","Uninstall"] for index, item in enumerate(keymaps): @@ -166,8 +165,6 @@ def windows_setup(): else: os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"") ->>>>>>> master - # check_x11 = cmdline("env | grep -i x11").strip() check_x11 = cmdline("(env | grep -i x11 || loginctl show-session \"$XDG_SESSION_ID\" -p Type) | awk -F= '{print $2}'").strip() From 3bd45bc627583ec1cd76a195b66a5f2a34acdb7c Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 02:43:40 -0500 Subject: [PATCH 38/43] - Resolved instability issue under KDE and xkb keymaps --- .xkb/symbols/mac_gui | 118 ++++++++++++++++++++++++++++++++++++++---- .xkb/symbols/mac_term | 8 ++- .xkb/types/mac_term | 10 ++++ 3 files changed, 124 insertions(+), 12 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 469a967..8e76041 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -1,4 +1,19 @@ // Template +// +// ONE_LEVEL_CTRL +// Base +// Shift +// Alt +// Shift Alt +// Control +// Shift Control +// Super +// Shift Super +// Control Alt +// Super Control +// Super Alt +// Super Control Alt +// // replace key { // type[Group1]= "ONE_LEVEL_CTRL", // symbols[Group1]= [ @@ -163,17 +178,27 @@ default partial xkb_symbols "mac_levelssym" { replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base q, + // Shift Q, + // Alt q, + // Shift Alt Q, + // Control F4 ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), + // Alt NoAction(), + // Shift Alt NoAction(), + // Control RedirectKey(key=,modifiers=Mod1,clearmods=Control) ] }; @@ -181,10 +206,15 @@ default partial xkb_symbols "mac_levelssym" { replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base F3, + // Shift F3, + // Alt F3, + // Shift Alt F3, + // Control d ], actions[Group1]= [ @@ -199,17 +229,29 @@ default partial xkb_symbols "mac_levelssym" { replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base g, + // Shift G, + // Alt g, + // Shift Alt G, + // Control g, + // Shift Control G, + // Super NoSymbol, + // Shift Super NoSymbol, + // Control Alt g, + // Super Control g, + // Super Alt g, + // Super Control Alt g ], actions[Group1]= [ @@ -237,99 +279,155 @@ default partial xkb_symbols "mac_levelssym" { replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base Left, + // Shift Left, + // Alt Left, + // Shift Alt Left, + // Control NoSymbol, + // Shift Control NoSymbol, + // Super Left ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), - // Wordwise + // Alt - Wordwise RedirectKey(key=,mods=Control,clearmods=Mod1), + // Shift Alt RedirectKey(key=,mods=Control,clearmods=Mod1), + // Control RedirectKey(key=,clearmods=Control), + // Shift Control RedirectKey(key=,clearmods=Control), - // Change workspace - NoAction(), // Super - Change workspace NoAction() ] }; + // Right to End of Line or end of word replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base Right, + // Shift Right, + // Alt Right, + // Shift Alt Right, + // Control NoSymbol, - NoSymbol + // Shift Control + NoSymbol, + // Super + Right ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), - // Wordwise + // Alt - Wordwise RedirectKey(key=,mods=Control,clearmods=Mod1), + // Shift Alt RedirectKey(key=,mods=Control,clearmods=Mod1), + // Control RedirectKey(key=,clearmods=Control), + // Shift Control RedirectKey(key=,clearmods=Control), - // Change workspace + // Super - Change workspace NoAction() ] }; + //Up to Mac Home replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base Up, + // Shift Up, + // Alt Up, + // Shift Alt Up, + // Control NoSymbol, + // Shift Control NoSymbol, + // Super + Up, + // Shift Super Up ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), - // Wordwise + // Alt - Wordwise RedirectKey(key=,clearmods=Mod1), + // Shift Alt // RedirectKey(key=), // Chromebook multicursor RedirectKey(key=,clearmods=Mod1), // Default multicursor + // Control RedirectKey(key=), + // Shift Control RedirectKey(key=), - // Wordwise - Sublime? + // Super - Wordwise - Sublime? RedirectKey(key=,clearmods=Super), + // Shift Super RedirectKey(key=,modifiers=Mod1,clearmods=Super) ] }; + // Down to Mac End replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base Down, + // Shift Down, + // Alt Down, + // Shift Alt Down, + // Control NoSymbol, + // Shift Control NoSymbol, + // Super + Down, + // Shift Super Down ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), - // Wordwise + // Alt - Wordwise RedirectKey(key=,clearmods=Mod1), + // Shift Alt RedirectKey(key=,clearmods=Mod1), + // Control RedirectKey(key=), + // Shift Control RedirectKey(key=), - // Wordwise - Sublime? + // Super - Wordwise - Sublime? RedirectKey(key=,clearmods=Super), + // Shift Super RedirectKey(key=,modifiers=Mod1,clearmods=Super) ] }; diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index a48d571..73e38cc 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -93,9 +93,11 @@ partial xkb_symbols "mac_global" { RedirectKey(key=,modifiers=Super,clearmods=Control+Shift) ] }; + // Cycle App and In App Tab Switching key { [ F13 ] }; key { [ F14 ] }; + replace key { type[Group1]= "ONE_LEVEL_CMD", symbols[Group1]= [ @@ -113,9 +115,10 @@ partial xkb_symbols "mac_global" { Redirect(key=,mods=Control,clearmods=Mod4+Super) // Default ] }; + // Page Up replace key { - type[Group1]= "ONE_LEVEL_CMD", + type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ Up, Up, @@ -127,9 +130,10 @@ partial xkb_symbols "mac_global" { RedirectKey(key=,clearmods=Shift+Control) ] }; + // Page Down replace key { - type[Group1]= "ONE_LEVEL_CMD", + type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ Down, Down, diff --git a/.xkb/types/mac_term b/.xkb/types/mac_term index de34832..10fa367 100644 --- a/.xkb/types/mac_term +++ b/.xkb/types/mac_term @@ -40,4 +40,14 @@ default partial xkb_types "addmac_levels" { level_name[Level5] = "Super"; level_name[Level6] = "Super Shift"; }; + type "ONE_LEVEL_SUPER" { + modifiers = Shift+Super; + map[Shift] = Level2; + map[Super] = Level3; + map[Shift+Super] = Level4; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Super"; + level_name[Level4] = "Super Shift"; + }; }; From 9c87cb27744e2b2be5b58ef9cdd490580b301ccd Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 03:17:07 -0500 Subject: [PATCH 39/43] - Fullscreen shortcut removed, glitches Cmd+F --- .xkb/symbols/mac_gui | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 8e76041..628b272 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -143,9 +143,9 @@ default partial xkb_symbols "mac_levelssym" { // Shift Super F, // Control Alt - h, + h // Super Control - F10 + // F10 // Super Alt // Super Control Alt ], @@ -167,9 +167,9 @@ default partial xkb_symbols "mac_levelssym" { // Shift Super NoAction(), // Control Alt - RedirectKey(key=,clearmods=Mod1), - // Super Control - RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control) + RedirectKey(key=,clearmods=Mod1) + // Super Control - Fullscreen - glitches Ctrl+F + // RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control) // Super Alt // Super Control Alt ] From e35e92fdbd000afa3f6f3ef6249ec9ad9abb1c62 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 14:26:13 -0500 Subject: [PATCH 40/43] - Corrected KDE key remap, but maximize is not fully enabled. It could break Cmd+F under KDE. --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 96c6449..3889e7e 100755 --- a/setup.py +++ b/setup.py @@ -124,7 +124,9 @@ def setShortcuts(): # org.gnome.mutter.keybindings toggle-tiled-right ['Right'] # org.gnome.mutter.keybindings toggle-tiled-left ['Left'] elif distro == "manjaro linux" and dename == "kde": - cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Maximize Window" "Alt+F10,Meta+PgUp,Maximize Window"') + # Remove Alt+F3 Operations Menu - Sublimetext Select-All + cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Operations Menu","none,Alt+F3,Window Operations Menu"') + cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Alt+F10,Meta+PgUp,Maximize Window"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Next Desktop" "Meta+Right,Meta+Right,Switch to Next Desktop"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Previous Desktop" "Meta+Left,Meta+Left,Switch to Previous Desktop"') From 9f3b4b0072648ca80ec4852a9bec41e13f86632b Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 14:52:27 -0500 Subject: [PATCH 41/43] - Added possible fix for maximize in KDE --- .xkb/symbols/mac_gui | 8 +++++--- setup.py | 11 +++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 628b272..5019f23 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -145,7 +145,8 @@ default partial xkb_symbols "mac_levelssym" { // Control Alt h // Super Control - // F10 + // ,F10 // Default maximize + // // Nothing // KDE maximize // Super Alt // Super Control Alt ], @@ -168,8 +169,9 @@ default partial xkb_symbols "mac_levelssym" { NoAction(), // Control Alt RedirectKey(key=,clearmods=Mod1) - // Super Control - Fullscreen - glitches Ctrl+F - // RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control) + // Super Control - Fullscreen + // ,RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control) // Default maximize + // // Nothing // KDE maximize // Super Alt // Super Control Alt ] diff --git a/setup.py b/setup.py index 3889e7e..2bd94ef 100755 --- a/setup.py +++ b/setup.py @@ -15,6 +15,8 @@ def cmdline(command): ) return process.communicate()[0] +dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")[0].lower() + def requirements(pkgm): print(bcolors.CYELLOW + "You need to install some packages, " +run_pkg+ ", for Kinto to fully remap browsers during input focus.\n" + bcolors.ENDC) print("sudo " + pkgm + " " + run_pkg + "\n") @@ -39,7 +41,6 @@ def install_ibus(): def setShortcuts(): distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip().split(" ")[0] distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip() - dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")[0].lower() print("\nIf Kinto is already running it will be stopped...") print("If you cancel the installer you can re-run Kinto via\n systemctl --user start keyswap") @@ -126,7 +127,7 @@ def setShortcuts(): elif distro == "manjaro linux" and dename == "kde": # Remove Alt+F3 Operations Menu - Sublimetext Select-All cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Operations Menu","none,Alt+F3,Window Operations Menu"') - cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Alt+F10,Meta+PgUp,Maximize Window"') + cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Meta+Ctrl+F,Meta+PgUp,Maximize Window"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Next Desktop" "Meta+Right,Meta+Right,Switch to Next Desktop"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Previous Desktop" "Meta+Left,Meta+Left,Switch to Previous Desktop"') @@ -338,6 +339,12 @@ else: # Fix browsers cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers_chromebook)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_browsers_chromebook)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') +if dename == "kde": + # Fix maximize shortcut + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ KDE maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui') +else: + # Fix maximize shortcut + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Default maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') From 65df97e8bf9f796c5678f1e8d677afdc5a7a17f3 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 16:31:55 -0500 Subject: [PATCH 42/43] - Fixed Cmd+Tab App Switching for KDE --- .xkb/symbols/mac_gui | 4 ++-- .xkb/symbols/mac_term | 6 ++++-- setup.py | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 5019f23..9865b9a 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -527,9 +527,9 @@ partial xkb_symbols "mac_appcycle" { NoAction(), // Shift NoAction(), - // Control - Redirect(key=), // Control + Shift + Redirect(key=), + // Control Redirect(key=), // Super Redirect(key=,mods=Control,clearmods=Mod4+Super), diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index 73e38cc..97f1391 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -103,14 +103,16 @@ partial xkb_symbols "mac_global" { symbols[Group1]= [ Tab, Tab, - F13, + // F13, // Default cmdtab + // F14, // KDE cmdtab // Right // Elementary NoSymbol // Default ], actions[Group1]= [ NoAction(), NoAction(), - Redirect(key=), + // Redirect(key=), // Default cmdtab + // Redirect(key=), // KDE cmdtab // Redirect(key=,mods=Control+Shift,clearmods=Mod4+Super) // Elementary Redirect(key=,mods=Control,clearmods=Mod4+Super) // Default ] diff --git a/setup.py b/setup.py index 2bd94ef..4ea79f2 100755 --- a/setup.py +++ b/setup.py @@ -125,8 +125,11 @@ def setShortcuts(): # org.gnome.mutter.keybindings toggle-tiled-right ['Right'] # org.gnome.mutter.keybindings toggle-tiled-left ['Left'] elif distro == "manjaro linux" and dename == "kde": + # cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "krunner.desktop" --key "_launch","Alt+Space\tAlt+F2\tSearch,Alt+Space\tAlt+F2\tSearch,KRunner"') # Remove Alt+F3 Operations Menu - Sublimetext Select-All cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Operations Menu","none,Alt+F3,Window Operations Menu"') + cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows","Ctrl+F13,Alt+Tab,Walk Through Windows"') + cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows (Reverse)","Ctrl+Shift+F14,Alt+Shift+Backtab,Walk Through Windows (Reverse)"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Meta+Ctrl+F,Meta+PgUp,Maximize Window"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Next Desktop" "Meta+Right,Meta+Right,Switch to Next Desktop"') @@ -342,9 +345,13 @@ else: if dename == "kde": # Fix maximize shortcut cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ KDE maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui') + # term app switching + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ KDE cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term') else: # Fix maximize shortcut cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Default maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui') + # term app switching + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Default cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') From fe8b0a202765da81c9cd972a0eef1113ec10257c Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 16:53:37 -0500 Subject: [PATCH 43/43] - Re-added caps_escape PR to dev --- .xkb/symbols/mac_gui | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 9865b9a..8c19c53 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -49,6 +49,10 @@ xkb_symbols "swapescape" { key { [ Caps_Lock ] }; }; hidden partial modifier_keys +xkb_symbols "caps_escape" { + key { [ Escape ] }; +}; +hidden partial modifier_keys xkb_symbols "caps_shiftlock" { replace key { [ Shift_Lock ] }; modifier_map Shift { Shift_Lock };