MasseR/xmonad-masser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: MasseR:b9e180f910bdb7dde3ff6d8da69712b7e40829cb
Branches Tags
MasseR:master
MasseR:views
MasseR:searching
..
compare: MasseR:e80b309569ef81b646665015bf655788043b09d8
Branches Tags
MasseR:master
MasseR:views
MasseR:searching

No commits in common. "b9e180f910bdb7dde3ff6d8da69712b7e40829cb" and "e80b309569ef81b646665015bf655788043b09d8" have entirely different histories.
b9e180f910 ... e80b309569

2 changed files with 9 additions and 17 deletions
Show Stats Expand all files Collapse all files

24
src/XMonad/Config/MasseR.hs
View File

@ -10,7 +10,7 @@ import Control.Lens ((^.))
import Data.Generics.Product (field) import Data.Generics.Product (field)
import qualified Data.List as List import qualified Data.List as List
import XMonad import XMonad
-- import XMonad.Actions.CycleWS (swapNextScreen) import XMonad.Actions.CycleWS (swapNextScreen)
import XMonad.Actions.Search import XMonad.Actions.Search
import XMonad.Hooks.EwmhDesktops (ewmh, ewmhDesktopsStartup) import XMonad.Hooks.EwmhDesktops (ewmh, ewmhDesktopsStartup)
import XMonad.Hooks.SetWMName (setWMName) import XMonad.Hooks.SetWMName (setWMName)
@ -88,12 +88,7 @@ searchSubmaps extraConfig conf =
myNav2d :: Navigation2DConfig myNav2d :: Navigation2DConfig
myNav2d = myNav2d = def { defaultTiledNavigation = lineNavigation }
def { defaultTiledNavigation = nav
, screenNavigation = nav
}
where
nav = hybridOf lineNavigation sideNavigation
showKeybindings :: [((KeyMask, KeySym), NamedAction)] -> NamedAction showKeybindings :: [((KeyMask, KeySym), NamedAction)] -> NamedAction
showKeybindings x = addName "Show keybindings" $ io $ do showKeybindings x = addName "Show keybindings" $ io $ do
@ -179,9 +174,9 @@ myKeys extraConfig conf =
, ("<XF86AudioLowerVolume>", addName "Decrease volume" $ spawn "amixer set Master 2%-") , ("<XF86AudioLowerVolume>", addName "Decrease volume" $ spawn "amixer set Master 2%-")
, ("M-<plus>", addName "Increase volume" $ spawn "amixer set Master 2+") , ("M-<plus>", addName "Increase volume" $ spawn "amixer set Master 2+")
, ("M-<minus>", addName "Decrease volume" $ spawn "amixer set Master 2-") , ("M-<minus>", addName "Decrease volume" $ spawn "amixer set Master 2-")
, ("<XF86AudioPlay>", addName "Play/pause music" $ spawn "mpc toggle") , ("<XF86AudioPlay>", addName "Play/pause mopidy" $ spawn "mpc toggle")
, ("M-m", spotify extraConfig conf) , ("M-m", spotify extraConfig conf)
-- , ("M-S-<Space>", addName "Swap screens" swapNextScreen) , ("M-S-<Space>", addName "Swap screens" swapNextScreen)
, ("M-<Backspace>", addName "Kill window" kill) , ("M-<Backspace>", addName "Kill window" kill)
-- scrot requires `unGrab` -- scrot requires `unGrab`
, ("M-<Print>", addName "Take screenshot" $ spawn (screenshot . applications $ extraConfig))] ^++^ , ("M-<Print>", addName "Take screenshot" $ spawn (screenshot . applications $ extraConfig))] ^++^
@ -195,13 +190,10 @@ myKeys extraConfig conf =
, ("M-k", addName "Go up" $ windowGo U False) , ("M-k", addName "Go up" $ windowGo U False)
, ("M-h", addName "Go left" $ windowGo L False) , ("M-h", addName "Go left" $ windowGo L False)
, ("M-l", addName "Go right" $ windowGo R False) , ("M-l", addName "Go right" $ windowGo R False)
-- Swap screen left or right, don't wrap , ("M-S-j", addName "Shift window down" $ windowSwap D False)
, ("M-S-h", addName "Shift window up" $ screenSwap L True) , ("M-S-k", addName "Shift window up" $ windowSwap U False)
, ("M-S-l", addName "Shift window right" $ screenSwap R True) , ("M-S-h", addName "Shift window left" $ windowSwap L False)
-- , ("M-S-j", addName "Shift window down" $ windowSwap D False) , ("M-S-l", addName "Shift window right" $ windowSwap R False)
-- , ("M-S-k", addName "Shift window up" $ windowSwap U False)
-- , ("M-S-h", addName "Shift window left" $ windowSwap L False)
-- , ("M-S-l", addName "Shift window right" $ windowSwap R False)
, ("M-.", addName "Go to previous window" $ windows W.focusDown) , ("M-.", addName "Go to previous window" $ windows W.focusDown)
, ("M-,", addName "Go to next window" $ windows W.focusUp) , ("M-,", addName "Go to next window" $ windows W.focusUp)
, ("M-S-m", addName "Swap master" $ windows W.swapMaster) , ("M-S-m", addName "Swap master" $ windows W.swapMaster)

2
xmonad-masser.cabal
View File

@ -25,7 +25,7 @@ library
, XMonad.TopicSpace , XMonad.TopicSpace
, XMonad.XMobar , XMonad.XMobar
-- other-extensions: -- other-extensions:
build-depends: base >=4.11 && <4.14 build-depends: base >=4.11 && <4.13
, xmonad , xmonad
, xmonad-contrib , xmonad-contrib
, mtl , mtl