Merge pull request #454 from RedBearAK/dev_beta

Update keymaps for Pantheon/elementary
RedBearAK · Nov 30, 2024 · 33ee642 · 33ee642
2 parents d64b34e + a3ee05e
commit 33ee642
Showing 1 changed file with 20 additions and 19 deletions.
diff --git a/default-toshy-config/toshy_config.py b/default-toshy-config/toshy_config.py
@@ -4266,15 +4266,6 @@ def getDK():
 
 # Overrides to General Terminals shortcuts for specific distros (or are they really just desktop environments?)
 
-if DISTRO_ID == 'elementary':
-    keymap("GenTerms overrides: elementary OS", {
-        C("LC-Right"):              [bind,C("Super-Right")],        # SL - Change workspace (elementary)
-        C("LC-Left"):               [bind,C("Super-Left")],         # SL - Change workspace (elementary)
-    }, when = lambda ctx:
-        cnfg.screen_has_focus and
-        matchProps(clas=termStr)(ctx)
-    )
-
 if DISTRO_ID in ['fedora', 'almalinux'] and DESKTOP_ENV == 'gnome':
     keymap("GenTerms overrides: Fedora GNOME", {
         C("RC-H"):                  C("Super-h"),                   # Hide Window/Minimize app (gnome/fedora)
@@ -4352,6 +4343,15 @@ def getDK():
         matchProps(clas=termStr)(ctx)
     )
 
+if DESKTOP_ENV == 'pantheon':
+    keymap("GenTerms overrides: elementary OS", {
+        C("LC-Right"):              [bind,C("Super-Right")],        # SL - Change workspace (elementary)
+        C("LC-Left"):               [bind,C("Super-Left")],         # SL - Change workspace (elementary)
+    }, when = lambda ctx:
+        cnfg.screen_has_focus and
+        matchProps(clas=termStr)(ctx)
+    )
+
 if DESKTOP_ENV == 'sway':
     keymap("GenTerms overrides: swaywm", {
         C("RC-Q"):                  C("Shift-C-Q"),                 # Override sway GenGUI Cmd+Q
@@ -4497,16 +4497,6 @@ def getDK():
         matchProps(not_clas=remoteStr)(ctx)
     )
 
-if DISTRO_ID == 'elementary':
-    keymap("GenGUI overrides: elementary OS", {
-        C("RC-F3"):                 C("Super-d"),                   # Default SL - Show Desktop (gnome/kde,elementary)
-        C("RC-Space"):             [iEF2NT(),C("Super-Space")],     # SL - Launch Application Menu (elementary)
-        C("RC-LC-f"):               C("Super-Up"),                  # SL- Maximize app elementary
-    }, when = lambda ctx:
-        cnfg.screen_has_focus and
-        matchProps(not_clas=remoteStr)(ctx)
-    )
-
 if DISTRO_ID in ['fedora', 'almalinux'] and DESKTOP_ENV == 'gnome':
     keymap("GenGUI overrides: Fedora GNOME", {
         C("Super-RC-Q"):            C("Super-L"),                   # Lock screen (fedora)
@@ -4739,6 +4729,17 @@ def getDK():
         matchProps(not_clas=remoteStr)(ctx)
     )
 
+if DESKTOP_ENV == 'pantheon':
+    keymap("GenGUI overrides: Pantheon", {
+        C("RC-F3"):                 C("Super-d"),                   # Show Desktop (gnome/kde,elementary)
+        # C("RC-Space"):             [iEF2NT(),C("Super-Space")],     # Launch Application Menu (elementary)
+        C("RC-Space"):             [iEF2NT(),C("Alt-F2")],          # Launch Application Menu (elementary OS 8)
+        C("RC-LC-f"):               C("Super-Up"),                  # Maximize app elementary
+    }, when = lambda ctx:
+        cnfg.screen_has_focus and
+        matchProps(not_clas=remoteStr)(ctx)
+    )
+
 if DESKTOP_ENV == 'sway':
     keymap("GenGUI overrides: swaywm", {
         C("RC-Space"):             [iEF2NT(),C("Super-d")],         # Open sway launcher