about summary refs log tree commit diff
diff options
context:
space:
mode:
authordevhell <^@regexmail.net>2016-06-11 06:18:05 +0100
committerdevhell <^@regexmail.net>2016-06-11 06:18:05 +0100
commit29f68da8f412ce6b1144e80cb1ea11ae5f602b2c (patch)
tree48090e394372755e299283476346e2e296478f04
parentc019da975622e1d1fb6c7fd32236fbb06a22a54a (diff)
{machine,services}_eris: Modify
Just like with titan.
-rw-r--r--machines/machine_eris.nix10
-rw-r--r--services/services_eris.nix1
2 files changed, 8 insertions, 3 deletions
diff --git a/machines/machine_eris.nix b/machines/machine_eris.nix
index ece8cebd..60b6944c 100644
--- a/machines/machine_eris.nix
+++ b/machines/machine_eris.nix
@@ -5,9 +5,9 @@
 
   boot = {
     loader = {
-      gummiboot = {
+      timeout = 2;
+      systemd-boot = {
         enable = true;
-        timeout = 2;
       };
 
       efi.canTouchEfiVariables = true;
@@ -25,6 +25,12 @@
     extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
   };
 
+  hardware = {
+    opengl = {
+      extraPackages = [ pkgs.vaapiIntel ];
+    };
+  };
+
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/4788e218-db0f-4fd6-916e-e0c484906eb0";
     fsType = "btrfs";
diff --git a/services/services_eris.nix b/services/services_eris.nix
index 7f01cd46..2021853e 100644
--- a/services/services_eris.nix
+++ b/services/services_eris.nix
@@ -32,7 +32,6 @@
     enable = true;
     layout = "gb";
     videoDrivers = [ "intel" ];
-    vaapiDrivers = [ pkgs.vaapiIntel ];
 
     synaptics = {
       enable = true;