diff --git a/xmonad.hs b/xmonad.hs index c4af34b..d7bebf0 100644 --- a/xmonad.hs +++ b/xmonad.hs @@ -29,13 +29,13 @@ baseConfig = desktopConfig , layoutHook = smartBorders $ fullscreenFull $ avoidStruts $ boringWindows $ minimize $ maximize $ onWorkspace "8:media" Full $ onWorkspaces ["2:com", "9:div"] simpleTabbed $ (layoutHook desktopConfig ||| simpleTabbed ) , handleEventHook = handleEventHook desktopConfig <+> fullscreenEventHook } - `removeKeys` - [(m .|. modMask baseConfig , k) - | (k) <- [xK_1 .. xK_9] - , (m) <- [(0), (shiftMask)]] + `removeKeys` + [(m .|. modMask baseConfig , k) + | (k) <- [xK_1 .. xK_9] + , (m) <- [(0), (shiftMask)]] -- `removeKeys` -- [(modMask baseConfig .|. shiftMask, xK_q)] - + baseXPConfig = defaultXPConfig { position = Top @@ -103,30 +103,27 @@ main = do , ((modMask baseConfig, xK_m), focusMaster) -- XMonad.Util.Scratchpad , ((modMask baseConfig, xK_F12), scratchpadSpawnActionCustom "mate-terminal --disable-factory --name scratchpad") - -- Azerty support - , ((modMask baseConfig, xK_semicolon), sendMessage (IncMasterN (-1))) - -- mute button - , ((0, 0x1008FF12), spawn "echo mt | ~/.xmonad/action-manager/command.sh ~/.xmonad/actioncontrol") - -- volumeup button - , ((0, 0x1008FF13), spawn "echo + | ~/.xmonad/action-manager/command.sh ~/.xmonad/actioncontrol") - -- volumedown button - , ((0, 0x1008FF11), spawn "echo - | ~/.xmonad/action-manager/command.sh ~/.xmonad/actioncontrol") + -- Azerty support + , ((modMask baseConfig, xK_semicolon), sendMessage (IncMasterN (-1))) + -- mute button + , ((0, 0x1008FF12), spawn "~/.xmonad/action-manager/command.sh mt ~/.xmonad/actioncontrol") + -- volumeup button + , ((0, 0x1008FF13), spawn "~/.xmonad/action-manager/command.sh + ~/.xmonad/actioncontrol") + -- volumedown button + , ((0, 0x1008FF11), spawn "~/.xmonad/action-manager/command.sh - ~/.xmonad/actioncontrol") -- Media buttons , ((0, 0x1008ff14), spawn "clementine --play-pause") , ((0, 0x1008ff15), spawn "clementine --stop") , ((0, 0x1008ff16), spawn "clementine --restart-or-previous") , ((0, 0x1008ff17), spawn "clementine --next") ] - `additionalKeys` - -- - -- mod-ctrl-[1..9], Switch to workspace N - -- - -- mod-ctrl-[1..9], Switch to workspace N - -- mod-ctrl-shift-[1..9], Move client to workspace N - -- - [((m .|. modMask baseConfig , k), windows $ f i) - | (i, k) <- zip (workspaces baseConfig) [xK_F1 .. xK_F9] - , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]] - - - + `additionalKeys` + -- + -- mod-ctrl-[1..9], Switch to workspace N + -- + -- mod-ctrl-[1..9], Switch to workspace N + -- mod-ctrl-shift-[1..9], Move client to workspace N + -- + [((m .|. modMask baseConfig , k), windows $ f i) + | (i, k) <- zip (workspaces baseConfig) [xK_F1 .. xK_F9] + , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]