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

Compare commits

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

4 Commits
e80b309569 ... b9e180f910

Author SHA1 Message Date
Mats Rauhala
b9e180f910 Bump base version 2020-03-02 10:17:21 +02:00
Mats Rauhala
d88a4aa7a0 Use the swap screen from linenavigation2d 2020-02-12 13:45:08 +02:00
Mats Rauhala
93e4e9f930 Comment out shifting windows 
I'm pretty sure I've never used these mappings except by accident, now
then knowing how to undo it. I'm commenting them out for now to see if I
end up missing them for whatever reason
 2020-02-12 13:27:22 +02:00
Mats Rauhala
30d3f4ea2c Navigate to different screens better 2020-02-12 13:25:26 +02:00
2 changed files with 17 additions and 9 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 qualified Data.List as List
import XMonad
import XMonad.Actions.CycleWS (swapNextScreen)
-- import XMonad.Actions.CycleWS (swapNextScreen)
import XMonad.Actions.Search
import XMonad.Hooks.EwmhDesktops (ewmh, ewmhDesktopsStartup)
import XMonad.Hooks.SetWMName (setWMName)
@ -88,7 +88,12 @@ searchSubmaps extraConfig conf =
myNav2d :: Navigation2DConfig
myNav2d = def { defaultTiledNavigation = lineNavigation }
myNav2d =
def { defaultTiledNavigation = nav
, screenNavigation = nav
}
where
nav = hybridOf lineNavigation sideNavigation
showKeybindings :: [((KeyMask, KeySym), NamedAction)] -> NamedAction
showKeybindings x = addName "Show keybindings" $ io $ do
@ -174,9 +179,9 @@ myKeys extraConfig conf =
, ("<XF86AudioLowerVolume>", addName "Decrease 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-")
, ("<XF86AudioPlay>", addName "Play/pause mopidy" $ spawn "mpc toggle")
, ("<XF86AudioPlay>", addName "Play/pause music" $ spawn "mpc toggle")
, ("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)
-- scrot requires `unGrab`
, ("M-<Print>", addName "Take screenshot" $ spawn (screenshot . applications $ extraConfig))] ^++^
@ -190,10 +195,13 @@ myKeys extraConfig conf =
, ("M-k", addName "Go up" $ windowGo U False)
, ("M-h", addName "Go left" $ windowGo L False)
, ("M-l", addName "Go right" $ windowGo R False)
, ("M-S-j", addName "Shift window down" $ windowSwap D 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)
-- Swap screen left or right, don't wrap
, ("M-S-h", addName "Shift window up" $ screenSwap L True)
, ("M-S-l", addName "Shift window right" $ screenSwap R True)
-- , ("M-S-j", addName "Shift window down" $ windowSwap D 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 next window" $ windows W.focusUp)
, ("M-S-m", addName "Swap master" $ windows W.swapMaster)

2
xmonad-masser.cabal
View File

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