summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-07-27 23:33:32 +0200
committerlassulus <lassulus@lassul.us>2021-07-27 23:33:32 +0200
commitd14077b06e82d7e4beb078d781a312c84f0a16db (patch)
tree54e24720d18bfccbb638e10ab8076a5b9763addf
parent1380200b30f2fd1dfce55a2ba28dc256fef951c6 (diff)
parent34c7d727afd14a82330dd6e53dee3591f01a5462 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--krebs/5pkgs/simple/htgen/default.nix7
-rw-r--r--tv/5pkgs/simple/xtoggledpms.nix16
2 files changed, 20 insertions, 3 deletions
diff --git a/krebs/5pkgs/simple/htgen/default.nix b/krebs/5pkgs/simple/htgen/default.nix
index 9ed97242c..14b6f4c58 100644
--- a/krebs/5pkgs/simple/htgen/default.nix
+++ b/krebs/5pkgs/simple/htgen/default.nix
@@ -1,12 +1,13 @@
{ fetchgit, lib, pkgs, stdenv }:
stdenv.mkDerivation rec {
pname = "htgen";
- version = "1.3.0";
+ version = "1.3.1";
+ #src = <htgen>;
src = fetchgit {
url = "http://cgit.krebsco.de/htgen";
- rev = "refs/tags/v${version}";
- sha256 = "0p3517wkfpvip4z0axh0b4v1jm1nqpppldnhq4806c0p33vrjxnf";
+ rev = "refs/tags/${version}";
+ sha256 = "0ml8kp89bwkrwy6iqclzyhxgv2qn9dcpwaafbmsr4mgcl70zx22r";
};
installPhase = ''
diff --git a/tv/5pkgs/simple/xtoggledpms.nix b/tv/5pkgs/simple/xtoggledpms.nix
new file mode 100644
index 000000000..d164ad712
--- /dev/null
+++ b/tv/5pkgs/simple/xtoggledpms.nix
@@ -0,0 +1,16 @@
+{ pkgs }:
+
+let
+ grep = "${pkgs.gnugrep}/bin/grep";
+ xset = "${pkgs.xorg.xset}/bin/xset";
+in
+
+pkgs.writeDashBin "xtoggledpms" ''
+ # usage: xtoggledpms
+ set -efu
+ if ${xset} q | ${grep} -qF 'DPMS is Disabled'; then
+ ${xset} dpms force off
+ else
+ ${xset} s off -dpms
+ fi
+''