Merge remote-tracking branch 'nomic/master'

This commit is contained in:
tv 2015-11-07 19:24:46 +01:00
commit a1c3f26b04
6 changed files with 41 additions and 26 deletions

View File

@ -12,6 +12,7 @@ with lib;
../2configs/mail-client.nix
../2configs/xserver
../2configs/z.nix
../2configs/sub/xr.nix
{
environment.systemPackages = with pkgs; [
@ -120,6 +121,8 @@ with lib;
#xkill
#xl2tpd
#xsel
unison
];
}
{
@ -234,14 +237,6 @@ with lib;
];
};
xr = {
uid = 13370061;
extraGroups = [
"audio"
"video"
];
};
"23" = {
uid = 13370023;
};

View File

@ -5,6 +5,9 @@ with lib;
{
krebs.build.host = config.krebs.hosts.xu;
krebs.build.source.git.nixpkgs.rev =
"7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
imports = [
../2configs/hw/x220.nix
#../2configs/consul-client.nix
@ -12,6 +15,7 @@ with lib;
../2configs/mail-client.nix
../2configs/xserver
../2configs/z.nix
../2configs/sub/xr.nix
{
environment.systemPackages = with pkgs; [
@ -236,14 +240,6 @@ with lib;
];
};
xr = {
uid = 13370061;
extraGroups = [
"audio"
"video"
];
};
"23" = {
uid = 13370023;
};

22
tv/2configs/sub/xr.nix Normal file
View File

@ -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;
};
}

View File

@ -40,6 +40,7 @@ let
pkgs.pavucontrol
pkgs.slock
pkgs.sxiv
pkgs.xsel
pkgs.zathura
];

View File

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

View File

@ -1,6 +1,16 @@
{ pkgs, ... }:
{
cr = 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 \
"%@"
'';
ff = pkgs.callPackage ./ff {};
viljetic-pages = pkgs.callPackage ./viljetic-pages {};
xmonad-tv =