From 08db1be957f94f6407cf4239d2bf17ea9d163b92 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Wed, 19 Mar 2025 22:39:44 -0500
Subject: [PATCH] loki | adding tempory overrides whilst fprint build bug
 active

---
 hosts/loki/default.nix | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix
index afc659e..6c54624 100644
--- a/hosts/loki/default.nix
+++ b/hosts/loki/default.nix
@@ -1,6 +1,13 @@
 { inputs, outputs, lib, config, pkgs, ... }: {
   imports = [
-    inputs.nixos-hardware.nixosModules.dell-xps-13-9310
+    # inputs.nixos-hardware.nixosModules.dell-xps-13-9310
+    # FIXME 2025-03-19
+    # https://github.com/NixOS/nixpkgs/pull/389711
+    # https://github.com/NixOS/nixpkgs/issues/389620
+    inputs.nixos-hardware.nixosModules.common-cpu-intel
+    inputs.nixos-hardware.nixosModules.common-pc-laptop
+    inputs.nixos-hardware.nixosModules.common-pc-ssd
+    ##################################################
     ./hardware-configuration.nix
     # ../disko/nvme.nix
     ../workstation
@@ -26,4 +33,28 @@
     kde.enable = false;
     # cosmic.enable = false;
   };
+
+  # FIXME 2025-03-19
+  # https://github.com/NixOS/nixpkgs/pull/389711
+  # https://github.com/NixOS/nixpkgs/issues/389620
+
+  # Includes the Wi-Fi and Bluetooth firmware for the QCA6390.
+  hardware.enableRedistributableFirmware = true;
+
+  # Requires at least 5.12 for working wi-fi and bluetooth.
+  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.12")
+    (lib.mkDefault pkgs.linuxPackages_latest);
+
+  # Touchpad goes over i2c.
+  # Without this we get errors in dmesg on boot and hangs when shutting down.
+  boot.blacklistedKernelModules = [ "psmouse" ];
+
+  # enable finger print sensor.
+  # this has to be configured with `sudo fprintd-enroll <username>`.
+  # services.fprintd.enable = true;
+  # services.fprintd.tod.enable = true;
+  # services.fprintd.tod.driver = pkgs.libfprint-2-tod1-goodix;
+
+  # Allows for updating firmware via `fwupdmgr`.
+  services.fwupd.enable = true;
 }