summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-05-17 15:27:55 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2016-05-17 15:27:55 +0200
commit18c7a6dee53dde21e0f736c3fad070df67cdd746 (patch)
tree0a303b5958be147ba888ab7205594d86615b9416
parent55d65a8ea264f612ceda46c91a63f3f2cdabc1b6 (diff)
parent743af014a307153c017077d255c7b3a181237e35 (diff)
downloadnixos-18c7a6dee53dde21e0f736c3fad070df67cdd746.tar
nixos-18c7a6dee53dde21e0f736c3fad070df67cdd746.tar.gz
nixos-18c7a6dee53dde21e0f736c3fad070df67cdd746.tar.bz2
nixos-18c7a6dee53dde21e0f736c3fad070df67cdd746.tar.xz
nixos-18c7a6dee53dde21e0f736c3fad070df67cdd746.zip
Merge branch 'master' of git:nixos
-rw-r--r--hel.nix5
-rw-r--r--users/gkleen@hel.nix4
2 files changed, 9 insertions, 0 deletions
diff --git a/hel.nix b/hel.nix
index 0cb94323..82730878 100644
--- a/hel.nix
+++ b/hel.nix
@@ -196,6 +196,11 @@
196 196
197 sound.enable = true; 197 sound.enable = true;
198 198
199 hardware.opengl = {
200 enable = true;
201 extraPackages = with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ];
202 };
203
199 nix.gc = { 204 nix.gc = {
200 automatic = true; 205 automatic = true;
201 dates = "daily"; 206 dates = "daily";
diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix
index 43a8fd0f..472d07a1 100644
--- a/users/gkleen@hel.nix
+++ b/users/gkleen@hel.nix
@@ -17,4 +17,8 @@
17 enableWideVine = true; 17 enableWideVine = true;
18 hiDPI = true; 18 hiDPI = true;
19 }; 19 };
20
21 mpv = {
22 vaapiSupport = true;
23 };
20} 24}