summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2021-08-05 21:20:17 +0200
committermakefu <github@syntax-fehler.de>2021-08-05 21:20:17 +0200
commitc177a49ca38b8c1022638deaff2dc4eefda655f3 (patch)
tree201c4245203da92228c99f0940871a996e2efee7 /tv
parenta072b9a49b6ee50bfdd57f62a3f60087e98c7c02 (diff)
parentba6a5456e8d76b9c1eae7cd81dca3f2b16359ba2 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/2configs/default.nix1
-rw-r--r--tv/3modules/charybdis/default.nix1
-rw-r--r--tv/3modules/ejabberd/default.nix1
-rw-r--r--tv/5pkgs/simple/xtoggledpms.nix16
4 files changed, 18 insertions, 1 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 19e191b7b..8e8d0a468 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -123,7 +123,6 @@ with import <stockholm/lib>;
pkgs.hashPassword
pkgs.htop
pkgs.kpaste
- pkgs.krebspaste
pkgs.nix-prefetch-scripts
pkgs.ovh-zone
pkgs.push
diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix
index a0638e1eb..9c5ce2731 100644
--- a/tv/3modules/charybdis/default.nix
+++ b/tv/3modules/charybdis/default.nix
@@ -84,6 +84,7 @@ in {
users.users.${cfg.user.name} = {
inherit (cfg.user) home name uid;
createHome = true;
+ isSystemUser = true;
};
};
}
diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix
index aaf262fa1..2ca88732b 100644
--- a/tv/3modules/ejabberd/default.nix
+++ b/tv/3modules/ejabberd/default.nix
@@ -119,6 +119,7 @@ in {
users.users.${cfg.user.name} = {
inherit (cfg.user) home name uid;
createHome = true;
+ isSystemUser = true;
};
};
}
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
+''