summaryrefslogtreecommitdiffstats
path: root/tv/2configs/xserver/default.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-12-03 04:59:27 +0100
committerlassulus <lassulus@lassul.us>2018-12-03 04:59:27 +0100
commitd1c7ec94eb0d695ee1a9f0a103ffcc9483d1f8cb (patch)
treefc7c8c5b7b5d0e1cb9bc047a757b1f788521c0cd /tv/2configs/xserver/default.nix
parent2dc617874e001c25c1caceccd14ef7c1f74f73bc (diff)
parent24b07c32840949dbd02a8282d0b5d9cbe1c01bf5 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/2configs/xserver/default.nix')
-rw-r--r--tv/2configs/xserver/default.nix19
1 files changed, 8 insertions, 11 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 22c94f7b1..8d4b13fad 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -24,17 +24,6 @@ in {
pkgs.xlibs.fontschumachermisc
];
- # TODO dedicated group, i.e. with a single user [per-user-setuid]
- # TODO krebs.setuid.slock.path vs /run/wrappers/bin
- krebs.setuid.slock = {
- filename = "${pkgs.slock}/bin/slock";
- group = "wheel";
- envp = {
- DISPLAY = ":${toString config.services.xserver.display}";
- USER = cfg.user.name;
- };
- };
-
services.xserver = {
# Don't install feh into systemPackages
@@ -96,9 +85,12 @@ in {
]);
};
path = [
+ config.tv.slock.package
pkgs.fzmenu
pkgs.pulseaudioLight.out
pkgs.rxvt_unicode
+ pkgs.xcalib
+ "/run/wrappers" # for su
];
serviceConfig = {
SyslogIdentifier = "xmonad";
@@ -154,4 +146,9 @@ in {
User = cfg.user.name;
};
};
+
+ tv.slock = {
+ enable = true;
+ user = cfg.user;
+ };
}