summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-02-22 14:35:59 +0100
committermakefu <github@syntax-fehler.de>2016-02-22 14:35:59 +0100
commitb25d15573ab10a4b2dd55e46291fbab6adf70162 (patch)
tree1036547a8003c5767565d53d748d83d3614271b6 /lass/2configs
parent5b7039f1f11e7cf2da6f3735cc7d99322a31c7a5 (diff)
parent8393444dce1888d369955e46dd16983a43762bb9 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/browsers.nix2
-rw-r--r--lass/2configs/git.nix2
-rw-r--r--lass/2configs/libvirt.nix3
-rw-r--r--lass/2configs/skype.nix3
-rw-r--r--lass/2configs/xserver/default.nix6
5 files changed, 9 insertions, 7 deletions
diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 61016fed0..eb764068b 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -58,7 +58,7 @@ in {
( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] )
( createChromiumUser "fb" [ ] [ pkgs.chromium ] )
( createChromiumUser "gm" [ ] [ pkgs.chromium ] )
- ( createChromiumUser "flash" [ ] [ pkgs.flash ] )
+ ( createChromiumUser "flash" [ "audio" ] [ pkgs.flash ] )
];
nixpkgs.config.packageOverrides = pkgs : {
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 76b897d1f..0aab298c7 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -42,6 +42,8 @@ let
brain = {
collaborators = with config.krebs.users; [ tv makefu ];
};
+ extraction_webinterface = {};
+ politics-fetching = {};
} //
import <secrets/repos.nix> { inherit config lib pkgs; }
);
diff --git a/lass/2configs/libvirt.nix b/lass/2configs/libvirt.nix
index 7520a0e36..a51ccae58 100644
--- a/lass/2configs/libvirt.nix
+++ b/lass/2configs/libvirt.nix
@@ -2,13 +2,14 @@
let
mainUser = config.users.extraUsers.mainUser;
+ inherit (config.krebs.lib) genid;
in {
virtualisation.libvirtd.enable = true;
users.extraUsers = {
libvirt = {
- uid = lib.genid "libvirt";
+ uid = genid "libvirt";
description = "user for running libvirt stuff";
home = "/home/libvirt";
useDefaultShell = true;
diff --git a/lass/2configs/skype.nix b/lass/2configs/skype.nix
index d62a18a52..5b6da4a95 100644
--- a/lass/2configs/skype.nix
+++ b/lass/2configs/skype.nix
@@ -2,12 +2,13 @@
let
mainUser = config.users.extraUsers.mainUser;
+ inherit (config.krebs.lib) genid;
in {
users.extraUsers = {
skype = {
name = "skype";
- uid = lib.genid "skype";
+ uid = genid "skype";
description = "user for running skype";
home = "/home/skype";
useDefaultShell = true;
diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index 82cfd57bb..203ed0b09 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -93,11 +93,9 @@ let
xmonad-start = pkgs.writeScriptBin "xmonad" ''
#! ${pkgs.bash}/bin/bash
set -efu
- export PATH; PATH=${makeSearchPath "bin" [
- pkgs.alsaUtils
- pkgs.pulseaudioLight
+ export PATH; PATH=${makeSearchPath "bin" ([
pkgs.rxvt_unicode
- ]}:/var/setuid-wrappers
+ ] ++ config.environment.systemPackages)}:/var/setuid-wrappers
settle() {(
# Use PATH for a clean journal
command=''${1##*/}