diff --git a/setup.py b/setup.py index 24f1543..6952486 100755 --- a/setup.py +++ b/setup.py @@ -150,7 +150,8 @@ def setShortcuts(): # Too slow on appearing, compared to the app menu # # if dename != "budgie": - cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu") + # cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") # else: # cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['F1']\"") # cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-run-dialog \"['Space','Space']\"") @@ -163,12 +164,14 @@ 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 ['']") 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 reset org.gnome.desktop.wm.keybindings panel-main-menu") + # 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 reset org.gnome.desktop.wm.keybindings panel-main-menu") + # 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 ['']") @@ -182,7 +185,8 @@ def setShortcuts(): 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 reset org.gnome.desktop.wm.keybindings panel-main-menu") + # 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']\"") if(kintotype == 2): @@ -205,8 +209,11 @@ def setShortcuts(): 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"') + # 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"') + cmdline('xfconf-query --reset --channel xfce4-keyboard-shortcuts --property "/commands/custom/space"') + cmdline('xfconf-query --reset --channel xfce4-keyboard-shortcuts --property "/commands/custom/space"') + cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/default/Escape" --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') @@ -229,7 +236,8 @@ 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 ['']") 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 panel-main-menu \"['Space','Space']\"") + cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu") 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'] diff --git a/xkeysnail-config/kinto.py b/xkeysnail-config/kinto.py index 4fd35e5..190d4c0 100644 --- a/xkeysnail-config/kinto.py +++ b/xkeysnail-config/kinto.py @@ -91,8 +91,8 @@ define_keymap(re.compile("jetbrains-idea", re.IGNORECASE),{ K("C-Super-g"): K("C-M-Shift-j"), # Select all occurrences K("Super-Shift-g"): K("M-Shift-j"), # Unselect occurrence # Editing - K("Super-Space"): K("C-Space"), # Basic code completion - K("Super-Shift-Space"): K("C-Shift-Space"), # Smart code completion + K("Super-Space"): K("LC-Space"), # Basic code completion + K("Super-Shift-Space"): K("LC-Shift-Space"),# Smart code completion K("Super-j"): K("C-q"), # Quick documentation lookup K("C-n"): K("M-Insert"), # Generate code... K("Super-o"): K("C-o"), # Override methods @@ -170,6 +170,9 @@ define_keymap(re.compile(browserStr, re.IGNORECASE),{ }) define_keymap(None,{ + # Launch Application Menu + # K("RC-Space"): K("Alt-F1"), # gnome/kde + # K("RC-Space"): K("LC-Esc"), # xfce4 # Basic App hotkey functions K("RC-Q"): K("Alt-F4"), K("RC-H"): K("Alt-F9"), @@ -213,7 +216,6 @@ define_keymap(None,{ }) define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{ - K("Super-Space"): K("C-Space"), # Basic code completion # Wordwise remaining - for Everything but VS Code K("M-Left"): K("C-Left"), # Left of Word K("M-Shift-Left"): K("C-Shift-Left"), # Select Left of Word @@ -238,6 +240,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{ # Keybindings for VS Code define_keymap(re.compile(codeStr, re.IGNORECASE),{ + K("Super-Space"): K("LC-Space"), # Basic code completion # Wordwise remaining - for VS Code # Alt-F19 hack fixes Alt menu activation K("M-Left"): [K("M-F19"),K("C-Left")], # Left of Word diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index bbe8ce9..702c90e 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -60,13 +60,13 @@ function uninstall { fi elif [ "$dename" == "kde" ]; then echo "Restoring DE hotkeys..." - kwinkeys = $(ls | grep -m1 "kwinrc") - kdekeys = $(ls | grep -m1 "kglobalshortcutsrc") + kwinkeys=$(ls | grep -m1 "kwinrc") + kdekeys=$(ls | grep -m1 "kglobalshortcutsrc") cp ./"$kdekeys" ~/.config/kglobalshortcutsrc cp ./"$kwinkeys" ~/.config/kwinrc elif [ "$dename" == "xfce" ]; then echo "Restoring DE hotkeys..." - xfcekeys = $(ls | grep -m1 "xfce4-keyboard") + xfcekeys=$(ls | grep -m1 "xfce4-keyboard") cp ./"$xfcekeys" ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml fi fi @@ -269,6 +269,14 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 fi fi +if [[ $dename == "gnome" || dename == "budgie" ]]; then + perl -pi -e "s/(# )(.*)(# gnome)/\$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 +fi +if [[ $dename == "kde" ]]; then + echo "Applying Cmd-Space to open App Launcher for KDE..." + perl -pi -e "s/(# )(.*)(#.*kde)/\$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 +fi + if [[ $1 == "1" || $1 == "winmac" ]]; then if ls /sys/module | grep hid_apple >/dev/null 2>&1 ; then echo '1' | sudo tee /sys/module/hid_apple/parameters/swap_opt_cmd;echo 'options hid_apple swap_opt_cmd=1' | sudo tee /etc/modprobe.d/hid_apple.conf;sudo update-initramfs -u -k all @@ -296,6 +304,11 @@ elif [[ $1 == "3" || $1 == "chromebook" ]]; then perl -pi -e "s/(# )(.*)(# xfce4)/\$2\$3/g" ./xkeysnail-config/kinto.py.new perl -pi -e "s/(\w.*)(# Default)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new fi +if [[ $dename == "xfce" ]] && ls /etc/apt/sources.list.d/enso* 1> /dev/null 2>&1; then + echo "enso OS detected, applying Cmd-Space for Launchy..." + perl -pi -e "s/(K\(\"RC-Space)(.*)(# )(xfce4)/\$3\$1\$2\$3\$4/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 + xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/space" --create --type string --set "launchy" +fi if $rightalt ; then perl -pi -e "s/(\w.*)(Multi-language)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1