diff options
author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-08 21:47:23 -0400 |
---|---|---|
committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-08 21:47:23 -0400 |
commit | f5a674f640f5bafc1c3ed04553f5bb99cdb5ec3d (patch) | |
tree | 26b0e9cdf902075983e7b904c68221ed75ab1850 /xmonad/xmonad.hs | |
parent | c8935f56285a37cabe4d74a8444a7e0679a19906 (diff) | |
parent | 1fc6cad10440b4bea761a69080e9571e0423ad2d (diff) |
Merge branch 'master' of sabaki.qlic.orbekk.com:/storage/projects/dotfiles
Diffstat (limited to 'xmonad/xmonad.hs')
-rw-r--r-- | xmonad/xmonad.hs | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index b64dbb7..6b8e0f3 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -22,9 +22,14 @@ myConfig = , modMask = mod4Mask , terminal = "$TERMINAL" , borderWidth = 2 - , workspaces = pure <$> "\"<>PYAOEU" + , normalBorderColor = "#000000" + , workspaces = pure <$> "\"<>PYFAOEU" } +muteCommand = "pactl set-sink-mute @DEFAULT_SINK@ toggle" +increaseVolumeCommand = "sh -c \"pactl set-sink-mute 0 false ; pactl set-sink-volume @DEFAULT_SINK@ +5%\"" +decreaseVolumeCommand = "sh -c \"pactl set-sink-mute 0 false ; pactl set-sink-volume @DEFAULT_SINK@ -- -5%\"" + myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ -- launch a terminal @@ -83,6 +88,10 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ -- , ((modm , xK_period), sendMessage (IncMasterN (-1))) , ((modm .|. shiftMask, xK_Tab ), sendMessage (IncMasterN (-1))) + , ((modm , xK_w ), spawn muteCommand) + , ((modm , xK_v ), spawn decreaseVolumeCommand) + , ((modm , xK_z ), spawn increaseVolumeCommand) + -- This is redundant because it's added by the statusBar function. -- , ((modm , xK_b ), sendMessage ToggleStruts) @@ -101,10 +110,10 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ -- mod-[1..9], Switch to workspace N -- mod-shift-[1..9], Move client to workspace N -- - [((m .|. modm, k), windows $ f i) - | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9] - , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]] - ++ + -- [((m .|. modm, k), windows $ f i) + -- | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9] + -- , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]] + -- ++ [((m .|. modm, k), windows $ f i) | (i, k) <- zip (XMonad.workspaces conf) [ @@ -113,10 +122,12 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ , xK_period , xK_p , xK_y + , xK_f , xK_a , xK_o , xK_e - , xK_u] + , xK_u + , xK_i] , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]] ++ |