summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-11-07 19:24:46 +0100
committertv <tv@shackspace.de>2015-11-07 19:24:46 +0100
commita1c3f26b040ee1919c24491f4f3cb3a6e895fbce (patch)
tree5008ffe89bf2b2c7a7bf0e0c45ca984f9753dec4 /tv/2configs
parentbbcdef021a9197ff4b6ae597600b649b9a7b998b (diff)
parente35e3b5eb05cea1e3c033423c2f6ee4e0a511817 (diff)
Merge remote-tracking branch 'nomic/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/sub/xr.nix22
-rw-r--r--tv/2configs/xserver/default.nix1
-rw-r--r--tv/2configs/z.nix11
3 files changed, 24 insertions, 10 deletions
diff --git a/tv/2configs/sub/xr.nix b/tv/2configs/sub/xr.nix
new file mode 100644
index 000000000..6c9cbb93e
--- /dev/null
+++ b/tv/2configs/sub/xr.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ krebs.per-user.xr.packages = [
+ pkgs.cr
+ ];
+
+ security.sudo.extraConfig = "tv ALL=(xr) NOPASSWD: ALL";
+
+ users.users.xr = {
+ extraGroups = [
+ "audio"
+ "video"
+ ];
+ group = "subusers";
+ home = "/home/xr";
+ uid = 1660006127; # genid xr
+ useDefaultShell = true;
+ };
+}
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 7a48db6b8..afc2d699c 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -40,6 +40,7 @@ let
pkgs.pavucontrol
pkgs.slock
pkgs.sxiv
+ pkgs.xsel
pkgs.zathura
];
diff --git a/tv/2configs/z.nix b/tv/2configs/z.nix
index e5494ecc9..3acd168d4 100644
--- a/tv/2configs/z.nix
+++ b/tv/2configs/z.nix
@@ -4,16 +4,7 @@ with lib;
{
krebs.per-user.z.packages = [
- (pkgs.writeScriptBin "cr" ''
- #! /bin/sh
- set -efu
- export LC_TIME=de_DE.utf8
- exec ${pkgs.chromium}/bin/chromium \
- --ssl-version-min=tls1 \
- --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
- --disk-cache-size=50000000 \
- "%@"
- '')
+ pkgs.cr
];
programs.bash.interactiveShellInit = ''