From 479d5ee8f1bee10b2073e323d8971ccec9d94f02 Mon Sep 17 00:00:00 2001
From: Griffin Smith <grfn@gws.fyi>
Date: Thu, 2 Jul 2020 18:44:19 -0400
Subject: refactor: Inline nixos-hardware stuff

As tazjin pointed out, this is little enough code that pulling it from a
global channel is a little silly, so I've just inlined everything.

Change-Id: I8750f139a3124135a72737c381215a6e812ce0c3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/882
Tested-by: BuildkiteCI
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: BuildkiteCI
---
 .../glittershark/system/system/machines/chupacabra.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'users/glittershark/system')

diff --git a/users/glittershark/system/system/machines/chupacabra.nix b/users/glittershark/system/system/machines/chupacabra.nix
index 5a7c00fc68cb..65e93507ce59 100644
--- a/users/glittershark/system/system/machines/chupacabra.nix
+++ b/users/glittershark/system/system/machines/chupacabra.nix
@@ -1,14 +1,13 @@
 { config, lib, pkgs, ... }:
 {
   imports = [
-    <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     ../modules/common.nix
     ../modules/reusable/battery.nix
-    <nixos-hardware/common/cpu/intel>
-    <nixos-hardware/common/pc/laptop>
     ../modules/tvl.nix
   ];
 
+  hardware.enableRedistributableFirmware = true;
+
   networking.hostName = "chupacabra";
 
   powerManagement = {
@@ -78,4 +77,17 @@
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   # High-DPI console
   console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
+
+  # from nixos-hardware TODO sort this around
+  services.tlp.enable = true;
+  boot.kernel.sysctl."vm.swappiness" = 1;
+  services.fstrim.enable = lib.mkDefault true;
+
+  # Intel cpu stuff
+  hardware.opengl.extraPackages = with pkgs; [
+    vaapiIntel
+    vaapiVdpau
+    libvdpau-va-gl
+    intel-media-driver
+  ];
 }
-- 
cgit 1.4.1