diff options
| author | makefu <github@syntax-fehler.de> | 2015-12-04 10:16:09 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-12-04 10:16:09 +0100 |
| commit | 65cc52e01e18c823016a3043b8cf41822934cc3c (patch) | |
| tree | 58aa8971a4e571234a762eee20c7ec7f57a2b4d4 /tv/5pkgs | |
| parent | 597f9e8597c95ac9e4cba1689322c433bb0c9a75 (diff) | |
| parent | b5ffb88ba3a77d4f399d7a2815e2c61d53545f5d (diff) | |
Merge branch 'master' of pnp:stockholm
Conflicts:
makefu/1systems/gum.nix
Diffstat (limited to 'tv/5pkgs')
| -rw-r--r-- | tv/5pkgs/xmonad-tv/Main.hs | 4 | ||||
| -rw-r--r-- | tv/5pkgs/xmonad-tv/xmonad.cabal | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tv/5pkgs/xmonad-tv/Main.hs b/tv/5pkgs/xmonad-tv/Main.hs index 2258b34a6..6482d9cc8 100644 --- a/tv/5pkgs/xmonad-tv/Main.hs +++ b/tv/5pkgs/xmonad-tv/Main.hs @@ -7,6 +7,7 @@ module Main where import Control.Exception +import Graphics.X11.ExtraTypes.XF86 import Text.Read (readEither) import XMonad import System.IO (hPutStrLn, stderr) @@ -187,6 +188,9 @@ myKeys conf = Map.fromList $ --, (_4 , xK_v ) & \k -> (k, gridselectWorkspace wsGSConfig { gs_navigate = makeGSNav k } W.view) --, (_4S , xK_v ) & \k -> (k, gridselectWorkspace wsGSConfig { gs_navigate = makeGSNav k } W.shift) --, (_4 , xK_b ) & \k -> (k, goToSelected wGSConfig { gs_navigate = makeGSNav k }) + , ((noModMask, xF86XK_AudioLowerVolume), spawn "amixer sset Master 5%-") + , ((noModMask, xF86XK_AudioRaiseVolume), spawn "amixer sset Master 5%+") + , ((noModMask, xF86XK_AudioMute), spawn "amixer sset Master toggle") ] where _4 = mod4Mask diff --git a/tv/5pkgs/xmonad-tv/xmonad.cabal b/tv/5pkgs/xmonad-tv/xmonad.cabal index 2246524fc..f9ea4dd7d 100644 --- a/tv/5pkgs/xmonad-tv/xmonad.cabal +++ b/tv/5pkgs/xmonad-tv/xmonad.cabal @@ -10,6 +10,7 @@ Executable xmonad base, containers, unix, + X11, xmonad, xmonad-contrib, xmonad-stockholm |