diff options
| author | Profpatsch <mail@profpatsch.de> | 2017-06-01 19:55:06 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2017-06-01 19:55:06 +0200 |
| commit | 49eecfdb966eb02efa5b370cb231eb2fe85a3541 (patch) | |
| tree | 01c7d04637ba7bcd599f0fa05f6312be7b33a329 | |
| parent | e6115ed089075eaa7e2eab430d48a5f51a16ab6e (diff) | |
stackenblocken: add volume option
| -rw-r--r-- | machines/labnet/labtops.nix | 5 | ||||
| -rw-r--r-- | modules/user/openlab/stackenblocken.nix | 11 | ||||
| -rw-r--r-- | pkgs/openlab/stackenblocken/default.nix | 5 |
3 files changed, 17 insertions, 4 deletions
diff --git a/machines/labnet/labtops.nix b/machines/labnet/labtops.nix index 0571476e..64d0c30a 100644 --- a/machines/labnet/labtops.nix +++ b/machines/labnet/labtops.nix @@ -34,7 +34,10 @@ tcp.anonymousClients.allowedIpRanges = [ "172.16.0.0/16" "127.0.0.1" ]; }; - vuizvui.user.openlab.stackenblocken.enable = true; + vuizvui.user.openlab.stackenblocken = { + enable = true; + volume = 30; + }; services.logind.extraConfig = "HandleLidSwitch=ignore"; diff --git a/modules/user/openlab/stackenblocken.nix b/modules/user/openlab/stackenblocken.nix index 6fc3d674..4a5630fe 100644 --- a/modules/user/openlab/stackenblocken.nix +++ b/modules/user/openlab/stackenblocken.nix @@ -4,11 +4,20 @@ with lib; let cfg = config.vuizvui.user.openlab.stackenblocken; + package = lib.getBin pkgs.vuizvui.openlab.stackenblocken.override { + volumePercent = cfg.volume; + }; in { options.vuizvui.user.openlab.stackenblocken = { enable = mkEnableOption "STACKENBLOCKEN EVERY DAY"; + + volume = mkOption { + description = "Volume in percent"; + default = 50; + type = types.addCheck types.int (x: x >= 0 && x <= 100); + }; }; config = mkIf cfg.enable { @@ -18,7 +27,7 @@ in description = "stackenblocken timer"; # wantedBy = [ "default.target" ]; serviceConfig = { - ExecStart = "${lib.getBin pkgs.vuizvui.openlab.stackenblocken}/bin/stackenblocken"; + ExecStart = "${package}/bin/stackenblocken"; }; # everyday at 21:45, except Wednesday (Yoga silence) startAt = [ "Mon,Tue,Thu,Fri,Sat,Sun 21:45" "Wed 22:00" ]; diff --git a/pkgs/openlab/stackenblocken/default.nix b/pkgs/openlab/stackenblocken/default.nix index b8717a45..8049c655 100644 --- a/pkgs/openlab/stackenblocken/default.nix +++ b/pkgs/openlab/stackenblocken/default.nix @@ -1,5 +1,6 @@ { lib, fetchFromGitHub, writeScriptBin, curl, bash, gawk -, haskellPackages, mpg321 }: +, haskellPackages, mpg321 +, volumePercent ? 50 }: let repo = fetchFromGitHub { @@ -75,7 +76,7 @@ let echo "starting .labping bot" ${lib.getBin bot}/bin/stackenblocken & echo "DOING STACKENBLOCKEN" - ${lib.getBin mpg321}/bin/mpg321 --gain 40 -q ${jingle} + ${lib.getBin mpg321}/bin/mpg321 --gain ${toString volumePercent} -q ${jingle} done ''; |