diff options
author | lassulus <lassulus@lassul.us> | 2018-12-03 04:59:27 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2018-12-03 04:59:27 +0100 |
commit | c473636b778cc22afa09ae93cd4e69fdf8d9878f (patch) | |
tree | dd4fe201bac79e7e1d9e79c15cb2569539f11d62 /tv/2configs/xserver/default.nix | |
parent | 11aea15ec0207cbd081c0c1a8ba205f95308c7ae (diff) | |
parent | 0fe643ba5050e05991ac1c1e8a9cc7f8038ca2e1 (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/2configs/xserver/default.nix')
-rw-r--r-- | tv/2configs/xserver/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 22c94f7..8d4b13f 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; + }; } |