From 21dd05415e0380fd8b2cd2a62b154601fa3698af Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 23 Oct 2020 22:06:09 -0500 Subject: [PATCH] - Added more hotkey fixes for multiple OS's --- xkeysnail-config/kinto.py | 30 +++++++++++++++++----------- xkeysnail_service.sh | 42 +++++++++++++++++++++++++++++---------- 2 files changed, 49 insertions(+), 23 deletions(-) diff --git a/xkeysnail-config/kinto.py b/xkeysnail-config/kinto.py index b7c8f4c..3b4d59d 100644 --- a/xkeysnail-config/kinto.py +++ b/xkeysnail-config/kinto.py @@ -205,8 +205,8 @@ define_keymap(None,{ K("RC-Space"): K("Alt-F1"), # Default SL - Launch Application Menu (gnome/kde) K("RC-F3"):K("Super-d"), # Default SL - Show Desktop (gnome/kde,eos) K("RC-LC-f"):K("M-F10"), # Default SL - Maximize app (gnome/kde) - # K("Super-Right"):K("C-M-Right"), # Default SL - Change workspace (budgie) not-kde_neon - # K("Super-Left"):K("C-M-Left"), # Default SL - Change workspace (budgie) not-kde_neon + # K("Super-Right"):K("C-M-Right"), # Default SL - Change workspace (budgie) + # K("Super-Left"):K("C-M-Left"), # Default SL - Change workspace (budgie) K("RC-Q"): K("M-F4"), # Default SL - not-popos K("RC-H"):K("Super-h"), # Default SL - Minimize app (gnome/budgie/popos/fedora) K("M-Tab"): pass_through_key, # Default not-xfce4 - Cmd Tab - App Switching Default @@ -222,17 +222,13 @@ define_keymap(None,{ # K("RC-Space"): K("Super-Space"), # SL - Launch Application Menu (eos) # K("RC-H"): K("Super-Page_Down"), # SL - Minimize app (kde_neon) # SL - Default SL - Change workspace (kde_neon) - # K("RC-Space"): K("LC-Esc"), # xfce4 - Launch Application Menu - # K("RC-F3"):K("C-M-d"), # xfce4 - Show Desktop - # K("RC-LC-f"):K("Super-Up"), # eos - Maximize app - # K("RC-LC-f"):K("Super-PAGE_UP"), # manjaro - Maximize app - # K("LC-Left"):K("C-M-End"), # xfce4 - Change workspace - # K("LC-Left"):K("Super-Left"), # eos - Change workspace - # K("LC-Right"):K("C-M-Home"), # xfce4 - Change workspace - # K("LC-Right"):K("Super-Right"), # eos - Change workspace + # K("RC-Space"): K("LC-Esc"), # SL- Launch Application Menu xfce4 + # K("RC-F3"):K("C-M-d"), # SL- Show Desktop xfce4 + # K("RC-LC-f"):K("Super-Up"), # SL- Maximize app eos + # K("RC-LC-f"):K("Super-PAGE_UP"), # SL- Maximize app manjaro # Basic App hotkey functions - # K("RC-H"):K("M-F9"), # xfce4 - Minimize app - # K("RC-LC-f"):K("Super-PAGE_DOWN"), # manjaro - Minimize app + # K("RC-H"):K("M-F9"), # SL - Minimize app xfce4 + # K("RC-LC-f"):K("Super-PAGE_DOWN"), # SL - Minimize app manjaro # Cmd Tab - App Switching Default # K("RC-Tab"): K("RC-backslash"), # xfce4 # K("RC-Shift-Tab"): K("RC-Shift-backslash"), # xfce4 @@ -410,6 +406,16 @@ define_keymap(re.compile("Io.elementary.terminal|kitty", re.IGNORECASE),{ }, "Elementary Terminal tab switching") define_keymap(re.compile(termStr, re.IGNORECASE),{ + # K("LC-Right"):K("C-M-Right"), # Default SL - Change workspace (budgie) + # K("LC-Left"):K("C-M-Left"), # Default SL - Change workspace (budgie) + # K("LC-Left"):K("C-M-End"), # SL - Change workspace xfce4 + # K("LC-Left"):K("Super-Left"), # SL - Change workspace eos + # K("LC-Right"):K("C-M-Home"), # SL - Change workspace xfce4 + # K("LC-Right"):K("Super-Right"), # SL - Change workspace eos + # K("LC-Right"):K("Super-Page_Up"), # SL - Change workspace (ubuntu/fedora) + # K("LC-Left"):K("Super-Page_Down"), # SL - Change workspace (ubuntu/fedora) + # K("LC-Right"):K("Super-C-Up"), # SL - Change workspace (popos) + # K("LC-Left"):K("Super-C-Down"), # SL - Change workspace (popos) # Ctrl Tab - In App Tab Switching K("LC-Tab") : K("LC-PAGE_DOWN"), K("LC-Shift-Tab") : K("LC-PAGE_UP"), diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index 9a48d3c..4b271f1 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -11,15 +11,17 @@ dename=$(./system-config/dename.sh | cut -d " " -f1) # Add additional shortcuts if needed, does not modify existing ones - if [[ $distro == 'elementaryos' ]];then - if [[ $(gsettings get org.gnome.mutter overlay-key | grep "Super" | wc -l) != 1 ]];then - echo "Overlay key, Super, detected. Will be removing so Super-Space can remap to Cmd-Space for app launching.." - gsettings set org.gnome.mutter overlay-key " " - # echo "Has been set. Please logoff and back on after install for changes to take effect." - fi +if [[ $dename == 'gnome' || $dename == 'budgie' ]];then + if [[ $(gsettings get org.gnome.mutter overlay-key | grep "''\|' '" | wc -l) != 1 ]];then + bound=$(gsettings get org.gnome.mutter overlay-key) + echo "Overlay key, " $bound ", detected. Will be removing so Super-Space can remap to Cmd-Space for app launching.." + echo "Overlay key, Super, detected. Will be removing so Super-Space can remap to Cmd-Space for app launching.." + gsettings set org.gnome.mutter overlay-key '' + fi fi -if ls /etc/apt/sources.list.d/system76* 1> /dev/null 2>&1; then +# if ls /etc/apt/sources.list.d/system76* 1> /dev/null 2>&1; then +if [[ $distro == 'popos' ]]; then pip3 install pillow # Addition, does not overwrite existing if [[ $(gsettings get org.gnome.desktop.wm.keybindings minimize | grep "\[\]" | wc -l) != 1 ]];then @@ -162,7 +164,8 @@ function removeAppleKB { function budgieUninstall { if [ -f /usr/bin/budgie-desktop ];then - read -n 1 -s -r -p "Your system may log you off immediately during the restoration of budgie-daemon. Press any key to continue..." + echo -e "\nYour system may log you off immediately during the restoration of budgie-daemon.\n" + read -n 1 -s -r -p "Press any key to continue..." bdmd5="$(md5sum /usr/bin/budgie-daemon | awk '{ print $1 }')" oldbdmd5=$(md5sum ./budgie-daemon_10.5.1.bak | awk '{ print $1 }') if [ "$bdmd5" != "$oldbdmd5" ]; then @@ -348,11 +351,27 @@ sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ./xkeysnail-config/xkeysnail.service. # sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/kinto/prexk.sh if [[ $dename == "budgie" ]]; then - perl -pi -e "s/\s{4}(# )(K.*)(# Default SL - Change workspace.*budgie.*)/\$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 + perl -pi -e "s/\s{4}(# )(K.*)(# Default SL - Change workspace.*budgie.*)/ \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 +fi + +if [[ $distro == "popos" ]]; then + perl -pi -e "\s{4}(# )(K.*)(# SL - .*popos.*)/ \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 +fi + +if [[ $distro == "fedora" ]]; then + perl -pi -e "\s{4}(# )(K.*)(# SL - .*fedora.*)/ \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 +fi + +if [[ $distro == "elementaryos" ]]; then + perl -pi -e "\s{4}(# )(K.*)(# SL - .*eos.*)/ \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 +fi + +if [[ "$distro" == "manjaro"* ]]; then + perl -pi -e "\s{4}(# )(K.*)(# SL - .*manjaro.*)/ \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 fi if [[ $dename == "gnome" ]]; then - perl -pi -e "\s{4}(# )(K.*)(# SL - .*ubuntu.*)/\$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 + perl -pi -e "\s{4}(# )(K.*)(# SL - .*ubuntu.*)/ \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 fi if [[ $dename == "kde" ]]; then @@ -361,6 +380,7 @@ if [[ $dename == "kde" ]]; then fi if [[ $dename == "xfce" ]]; then + perl -pi -e "\s{4}(# )(K.*)(# SL - .*xfce.*)/ \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 perl -pi -e "s/(# )(.*)(# xfce4)/\$2\$3/g" ./xkeysnail-config/kinto.py.new perl -pi -e "s/(\w.*)(# Default not-xfce4)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new fi @@ -462,7 +482,7 @@ elif [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then sudo rm /usr/local/bin/logoff.sh fi sudo systemctl daemon-reload - sudo systemctl --state=not-found --all | grep xkeysnail + # sudo systemctl --state=not-found --all | grep xkeysnail budgieUninstall exit 0 elif [[ $1 == "budgieUpdate" ]]; then