Merge remote-tracking branch 'ni/master'

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 = ''

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
+''