about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2023-05-06 11:26:30 -0700
committerFranck Cuny <franck@fcuny.net>2023-05-06 11:26:30 -0700
commit1b4d88a7a1be94ea73af24344e2f0eceff72058e (patch)
tree1d424c38a57f3d2591ae25cd1c455f22fd0204ac
parentprofiles/workstation: move sway to the workstation profile (diff)
downloadworld-1b4d88a7a1be94ea73af24344e2f0eceff72058e.tar.gz
profiles/xps9300: add more settings
Coming from https://github.com/NixOS/nixos-hardware/blob/51559e691f1493a26f94f1df1aaf516bb507e78b/dell/xps/13-9300/default.nix
Diffstat (limited to '')
-rw-r--r--profiles/hardware/xps9300.nix28
-rw-r--r--profiles/laptop.nix1
-rw-r--r--profiles/workstation.nix2
3 files changed, 29 insertions, 2 deletions
diff --git a/profiles/hardware/xps9300.nix b/profiles/hardware/xps9300.nix
index 3e58c88..72a8b5e 100644
--- a/profiles/hardware/xps9300.nix
+++ b/profiles/hardware/xps9300.nix
@@ -1,12 +1,36 @@
-{ ... }:
+{ config, pkgs, ... }:
 {
   imports = [
     ./intel.nix
   ];
 
-  boot.kernelParams = [ "mem_sleep_default=deep" ];
+  boot.kernelParams = [
+    "mem_sleep_default=deep"
+  ];
+
+  # Touchpad goes over i2c, and the psmouse module interferes with it
+  boot.blacklistedKernelModules = [ "psmouse" ];
+
+  # Includes the Wi-Fi and Bluetooth firmware for the QCA6390.
+  hardware.enableRedistributableFirmware = true;
 
   networking.wireless.iwd.enable = true;
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
+
+  boot.initrd.kernelModules = [ "i915" "acpi_call" ];
+
+  environment.variables = {
+    VDPAU_DRIVER = "va_gl";
+  };
+
+  hardware.opengl.extraPackages = with pkgs; [
+    vaapiIntel
+    libvdpau-va-gl
+    intel-media-driver
+  ];
+
+  boot = {
+    extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
+  };
 }
diff --git a/profiles/laptop.nix b/profiles/laptop.nix
index 43726f3..7fd5b98 100644
--- a/profiles/laptop.nix
+++ b/profiles/laptop.nix
@@ -5,6 +5,7 @@
   ];
 
   services.thermald.enable = true;
+
   services.tlp.enable = true;
 
   services.tlp.settings = {
diff --git a/profiles/workstation.nix b/profiles/workstation.nix
index 7ed2a3f..d27262f 100644
--- a/profiles/workstation.nix
+++ b/profiles/workstation.nix
@@ -84,6 +84,8 @@
     easyeffects
   ];
 
+  hardware.opengl.enable = true;
+
   # Use systemd-resolved
   services.resolved.enable = true;
   services.resolved.dnssec = "false";