Merge branch 'main' into wip_mapping_keycodes

1 files changed, 25 insertions, 25 deletions

diff --git a/src/Rahm/Desktop/Keys.hs b/src/Rahm/Desktop/Keys.hs
index 0d24593..a4415da 100644
--- a/src/Rahm/Desktop/Keys.hs
+++ b/src/Rahm/Desktop/Keys.hs
@@ -738,23 +738,12 @@ bindings = do
     altMod $ spawnX "sudo -A systemctl suspend && xsecurelock"
 
   bind xK_x $ do
-    shiftMod $
-      doc "Reset the holes" $ do
-        logs Debug "reset hole"
-        sendMessage resetHole
-        logs Debug "/reset hole"
-
     justMod $
-      doc "Add hole next to the current window" $ do
-        logs Debug "Add hole"
-        withFocused $ \foc ->
-          withWindowSet $ \ws -> do
-            logs Debug "/Add hole at %s" (show foc)
-            whenJust (W.windowTilePosition foc ws) $ \tp -> do
-              logs Debug "Tile position: %s" (show tp)
-              (X.broadcastMessage . addHole) tp
-              refresh
-        logs Debug "/Add hole"
+      doc "Toggles respect for struts." $
+        sendMessage ToggleStruts
+    shiftMod $
+      doc "Remove the border from the focused window" $
+        withFocused $ setBorderWidth 0 . (: [])
 
   bind xK_space $ do
     justMod $
@@ -800,14 +789,6 @@ bindings = do
               doc "Jump to the middle layout." $
                 sendMessage (toIndexedLayout (nLayouts `div` 2))
 
-          bind xK_x $ do
-            justMod $
-              doc "Toggles respect for struts." $
-                sendMessage ToggleStruts
-            shiftMod $
-              doc "Remove the border from the focused window" $
-                withFocused $ setBorderWidth 0 . (: [])
-
           bind xK_g $
             (noMod -|- justMod) $
               doc
@@ -828,6 +809,25 @@ bindings = do
                           [' '] -> restoreTheater Nothing
                           _ -> return ()
 
+          bind xK_x $ do
+            shiftMod $
+              doc "Reset the holes" $ do
+                logs Debug "reset hole"
+                sendMessage resetHole
+                logs Debug "/reset hole"
+
+            justMod $
+              doc "Add hole next to the current window" $ do
+                logs Debug "Add hole"
+                withFocused $ \foc ->
+                  withWindowSet $ \ws -> do
+                    logs Debug "/Add hole at %s" (show foc)
+                    whenJust (W.windowTilePosition foc ws) $ \tp -> do
+                      logs Debug "Tile position: %s" (show tp)
+                      (X.broadcastMessage . addHole) tp
+                      refresh
+                logs Debug "/Add hole"
+
           let spaceResize = repeatable $ do
                 bind xK_bracketright $ do
                   noMod $
@@ -1456,7 +1456,7 @@ windowSpecificBindings config = do
       noMod $
         emitKey (controlMask, xK_F2)
   where
-    browsers = ["Google-chrome", "Brave-browser", "firefox-default"]
+    browsers = ["Google-chrome", "Brave-browser", "firefox-default", "Firefox"]
     spotify = ["Spotify"]
 
     -- Create a permutation from a list of modifiers.