diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-21 12:03:41 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-21 12:03:41 +0100 |
| commit | 68936edfb3142b0e308ff8428e1c19d6bcd30843 (patch) | |
| tree | 7f31407c203325a5c57996d534fc49b201493b92 /nixos | |
| parent | 15b07f4b8e23ef40b9bc84543d1f73f3c3e9cf79 (diff) | |
| parent | c2192c664ae25f82d8e06de4694aad7a806969b9 (diff) | |
| download | nixlib-68936edfb3142b0e308ff8428e1c19d6bcd30843.tar nixlib-68936edfb3142b0e308ff8428e1c19d6bcd30843.tar.gz nixlib-68936edfb3142b0e308ff8428e1c19d6bcd30843.tar.bz2 nixlib-68936edfb3142b0e308ff8428e1c19d6bcd30843.tar.lz nixlib-68936edfb3142b0e308ff8428e1c19d6bcd30843.tar.xz nixlib-68936edfb3142b0e308ff8428e1c19d6bcd30843.tar.zst nixlib-68936edfb3142b0e308ff8428e1c19d6bcd30843.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/hardware/video/amdgpu.nix | 9 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/continuous-integration/hydra/default.nix | 9 |
3 files changed, 18 insertions, 3 deletions
diff --git a/nixos/modules/hardware/video/amdgpu.nix b/nixos/modules/hardware/video/amdgpu.nix new file mode 100644 index 000000000000..42fc8fa362de --- /dev/null +++ b/nixos/modules/hardware/video/amdgpu.nix @@ -0,0 +1,9 @@ +{ config, lib, ... }: + +with lib; +{ + config = mkIf (elem "amdgpu" config.services.xserver.videoDrivers) { + boot.blacklistedKernelModules = [ "radeon" ]; + }; +} + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 41615a8a9dc3..eb89ff83e2ce 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -37,9 +37,10 @@ ./hardware/network/rtl8192c.nix ./hardware/opengl.nix ./hardware/pcmcia.nix + ./hardware/video/amdgpu.nix + ./hardware/video/ati.nix ./hardware/video/bumblebee.nix ./hardware/video/nvidia.nix - ./hardware/video/ati.nix ./hardware/video/webcam/facetimehd.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index c8edfaf18537..b1b3404add09 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -166,7 +166,7 @@ in buildMachinesFiles = mkOption { type = types.listOf types.path; - default = []; + default = [ "/etc/nix/machines" ]; example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ]; description = "List of files containing build machines."; }; @@ -193,7 +193,9 @@ in config = mkIf cfg.enable { - users.extraGroups.hydra = { }; + users.extraGroups.hydra = { + gid = config.ids.gids.hydra; + }; users.extraUsers.hydra = { description = "Hydra"; @@ -201,6 +203,7 @@ in createHome = true; home = baseDir; useDefaultShell = true; + uid = config.ids.uids.hydra; }; users.extraUsers.hydra-queue-runner = @@ -208,12 +211,14 @@ in group = "hydra"; useDefaultShell = true; home = "${baseDir}/queue-runner"; # really only to keep SSH happy + uid = config.ids.uids.hydra-queue-runner; }; users.extraUsers.hydra-www = { description = "Hydra web server"; group = "hydra"; useDefaultShell = true; + uid = config.ids.uids.hydra-www; }; nix.trustedUsers = [ "hydra-queue-runner" ]; |