diff options
| author | miefda <miefda@miefda.de> | 2015-12-30 18:24:44 +0100 |
|---|---|---|
| committer | miefda <miefda@miefda.de> | 2015-12-30 18:24:44 +0100 |
| commit | c562e447ba927ea20bf7d2dfff9a4f4807ee4463 (patch) | |
| tree | 57f5496e7acbc9dfeec7f406a6857687219625d0 /lass/5pkgs | |
| parent | b96fd072e1ac5e5b6b5b3e92c678dc4bb4cb7e1f (diff) | |
| parent | 9b890750e24f43182ebf1732871a60d9e0c74c89 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/5pkgs')
| -rw-r--r-- | lass/5pkgs/newsbot-js/default.nix | 4 | ||||
| -rw-r--r-- | lass/5pkgs/xmonad-lass/Main.hs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lass/5pkgs/newsbot-js/default.nix b/lass/5pkgs/newsbot-js/default.nix index ace2a976f..cabd7422c 100644 --- a/lass/5pkgs/newsbot-js/default.nix +++ b/lass/5pkgs/newsbot-js/default.nix @@ -26,8 +26,8 @@ in nodePackages.buildNodePackage { src = fetchgit { url = "http://cgit.echelon/newsbot-js/"; - rev = "b22729670236bfa6491207d57c5d7565137625ca"; - sha256 = "8ff00de56d85543399776c82d41d92ccc68000e5dce0f008d926748e188f3c69"; + rev = "802b172d0eed6c9625a9cb5db408f5cc8c01784e"; + sha256 = "794fc7845aca311f7cf7b6bdc109b5a25d0e2299322bc6612edadc477b2536e2"; }; phases = [ diff --git a/lass/5pkgs/xmonad-lass/Main.hs b/lass/5pkgs/xmonad-lass/Main.hs index ce5afe33a..faaa00aab 100644 --- a/lass/5pkgs/xmonad-lass/Main.hs +++ b/lass/5pkgs/xmonad-lass/Main.hs @@ -125,6 +125,8 @@ myKeyMap = --, ("M4-r", spawn "exe=$(yeganesh -x) && eval \"exec $exe\"") , ("<XF86AudioRaiseVolume>", spawn "pactl -- set-sink-volume 0 +4%") , ("<XF86AudioLowerVolume>", spawn "pactl -- set-sink-volume 0 -4%") + , ("<XF86AudioMute>", spawn "pactl -- set-sink-mute 0 toggle") + , ("<XF86AudioMicMute>", spawn "pactl -- set-source-mute 1 toggle") , ("<XF86Launch1>", gridselectWorkspace myWSConfig W.view) , ("M4-a", focusUrgent) |