From c76823483ab9dd6fb2ea42d20de7c039885ca7ba Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Fri, 19 Jul 2024 18:04:38 -0400
Subject: [PATCH] Shura: Remove workaround for fingerprint build bug

---
 flake.lock                   | 11 ++++++-----
 hosts/Shura/default.nix      |  4 ----
 modules/system/bluetooth.nix | 14 --------------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 198f3ec..5bcbca9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -248,15 +248,16 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1721221863,
-        "narHash": "sha256-kWPoGIiAG6gYBukAQRTeG9U5eFmdSqQeeAiv/nydzfE=",
-        "owner": "8bitbuddhist",
+        "lastModified": 1721413321,
+        "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=",
+        "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "13dee7858df0a2fb963b25157229b24188fc94e6",
+        "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f",
         "type": "github"
       },
       "original": {
-        "owner": "8bitbuddhist",
+        "owner": "NixOS",
+        "ref": "master",
         "repo": "nixos-hardware",
         "type": "github"
       }
diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix
index d69cb6e..e568829 100644
--- a/hosts/Shura/default.nix
+++ b/hosts/Shura/default.nix
@@ -33,10 +33,6 @@ in
   system.stateVersion = stateVersion;
   networking.hostName = hostName;
 
-  # FIXME: disabling fingerprints due to fprintd-tod build error
-  # Fix queued and coming: https://github.com/NixOS/nixpkgs/pull/327289
-  services.fprintd.enable = lib.mkForce false;
-
   aux.system = {
     apps = {
       development.enable = true;
diff --git a/modules/system/bluetooth.nix b/modules/system/bluetooth.nix
index b2b3d37..8eecd22 100644
--- a/modules/system/bluetooth.nix
+++ b/modules/system/bluetooth.nix
@@ -33,19 +33,5 @@ in
 
     # Add Bluetooth LE audio support
     environment.systemPackages = with pkgs; [ liblc3 ];
-
-    # FIXME: Create systemd service to manually start the adapter on boot.
-    # This is a workaround for hardware.bluetooth.powerOnBoot not working as expected.
-    systemd.services.startBluetooth = {
-      description = "Manually starts the Bluetooth service on boot";
-      after = [ "bluetooth.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        type = "simple";
-        ExecStart = "${pkgs.bluez}/bin/bluetoothctl -- power on";
-        Restart = "always";
-        RestartSec = "5s";
-      };
-    };
   };
 }