makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse source
This commit is contained in:
lassulus 2020-04-18 09:35:03 +02:00
parent fae3c95c6c b20942d07d
commit c398fa1465
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
krebs/5pkgs/haskell/reaktor2.nix
View file

@ -1,17 +1,18 @@
{ mkDerivation, aeson, async, attoparsec, base, blessings { mkDerivation, aeson, async, attoparsec, base, blessings
, bytestring, containers, data-default, fetchgit, filepath , bytestring, containers, data-default, fetchgit, filepath
, hashable, lens, lens-aeson, network, network-simple , hashable, lens, lens-aeson, network, network-simple
, network-simple-tls, pcre-light, process, random, stdenv , network-simple-tls, network-uri, pcre-light, process, random
, string-conversions, stringsearch, text, time, transformers , servant-server, stdenv, string-conversions, stringsearch, text
, unagi-chan, unix, unordered-containers, vector , time, transformers, unagi-chan, unix, unordered-containers
, vector, wai, warp
}: }:
mkDerivation { mkDerivation {
pname = "reaktor2"; pname = "reaktor2";
version = "0.2.2"; version = "0.3.0";
src = fetchgit { src = fetchgit {
url = "https://cgit.krebsco.de/reaktor2"; url = "https://cgit.krebsco.de/reaktor2";
sha256 = "1kyr5i5zdzvc7fcyac1i1yvi88kcxafrgp8p79c1b9l4g9sjnv78"; sha256 = "02hqpq8wcfd6rvi8qk10zy3f3lrzzqnjwqal4cbvksjn3vahz36h";
rev = "9f4e2644188f985d7cd806c13e2c0dee1688b9f0"; rev = "a6893c00f78a8acd0a4bfe7da87ab6889eabcf21";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = false; isLibrary = false;
@ -19,9 +20,9 @@ mkDerivation {
executableHaskellDepends = [ executableHaskellDepends = [
aeson async attoparsec base blessings bytestring containers aeson async attoparsec base blessings bytestring containers
data-default filepath hashable lens lens-aeson network data-default filepath hashable lens lens-aeson network
network-simple network-simple-tls pcre-light process random network-simple network-simple-tls network-uri pcre-light process
string-conversions stringsearch text time transformers unagi-chan random servant-server string-conversions stringsearch text time
unix unordered-containers vector transformers unagi-chan unix unordered-containers vector wai warp
]; ];
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
} }

3
tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
View file

@ -12,6 +12,9 @@ pactl = findExecutable "pactl"
passmenu :: FilePath passmenu :: FilePath
passmenu = findExecutable "passmenu" passmenu = findExecutable "passmenu"
pavucontrol :: FilePath
pavucontrol = findExecutable "pavucontrol"
slock :: FilePath slock :: FilePath
slock = findExecutable "slock" slock = findExecutable "slock"

3
tv/5pkgs/haskell/xmonad-tv/src/main.hs
View file

@ -160,6 +160,7 @@ myKeys conf = Map.fromList $
, ((0, xF86XK_AudioLowerVolume), audioLowerVolume) , ((0, xF86XK_AudioLowerVolume), audioLowerVolume)
, ((0, xF86XK_AudioRaiseVolume), audioRaiseVolume) , ((0, xF86XK_AudioRaiseVolume), audioRaiseVolume)
, ((0, xF86XK_AudioMute), audioMute) , ((0, xF86XK_AudioMute), audioMute)
, ((_4, xF86XK_AudioMute), pavucontrol [])
, ((_4, xK_Prior), forkFile Paths.xcalib ["-invert", "-alter"] Nothing) , ((_4, xK_Prior), forkFile Paths.xcalib ["-invert", "-alter"] Nothing)
] ]
@ -175,6 +176,8 @@ myKeys conf = Map.fromList $
_4SM = _4 .|. _S .|. _M _4SM = _4 .|. _S .|. _M
pactl args = forkFile Paths.pactl args Nothing pactl args = forkFile Paths.pactl args Nothing
pavucontrol args = forkFile Paths.pavucontrol args Nothing
audioLowerVolume = pactl ["--", "set-sink-volume", "@DEFAULT_SINK@", "-5%"] audioLowerVolume = pactl ["--", "set-sink-volume", "@DEFAULT_SINK@", "-5%"]
audioRaiseVolume = pactl ["--", "set-sink-volume", "@DEFAULT_SINK@", "+5%"] audioRaiseVolume = pactl ["--", "set-sink-volume", "@DEFAULT_SINK@", "+5%"]
audioMute = pactl ["--", "set-sink-mute", "@DEFAULT_SINK@", "toggle"] audioMute = pactl ["--", "set-sink-mute", "@DEFAULT_SINK@", "toggle"]