From 1ad2bf21b747128bec0ce90a7c45f43334b81fdc Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Wed, 10 Apr 2024 19:19:47 -0400
Subject: [PATCH] switch to fw16 branch, flake update

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 flake.lock                                      | 17 +++++++++++++++++
 flake.nix                                       |  4 ++++
 .../alice/systems/artemision/configuration.nix  | 12 ++++++------
 users/alice/systems/artemision/default.nix      |  2 +-
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 341d1cf..a9a7f73 100644
--- a/flake.lock
+++ b/flake.lock
@@ -256,6 +256,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware-fw16": {
+      "locked": {
+        "lastModified": 1711646850,
+        "narHash": "sha256-obXZfJVIPJl7wfO1WrcHqcIGLm7mSsQ4MjcUu9PqIPM=",
+        "ref": "add-framework-16",
+        "rev": "cf73a64b8cb9f0a4c86b53a645a8d35f1b7bc246",
+        "revCount": 1603,
+        "type": "git",
+        "url": "https://github.com/jkoking/nixos-hardware"
+      },
+      "original": {
+        "ref": "add-framework-16",
+        "type": "git",
+        "url": "https://github.com/jkoking/nixos-hardware"
+      }
+    },
     "nixos-modules": {
       "inputs": {
         "flake-utils": [
@@ -371,6 +387,7 @@
         "nix-index-database": "nix-index-database",
         "nix-pre-commit": "nix-pre-commit",
         "nixos-hardware": "nixos-hardware",
+        "nixos-hardware-fw16": "nixos-hardware-fw16",
         "nixos-modules": "nixos-modules",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable_2",
diff --git a/flake.nix b/flake.nix
index a5bac79..ab3cdc8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,6 +99,10 @@
       url = "github:NixOS/nixos-hardware";
     };
 
+    nixos-hardware-fw16 = {
+      url = "git+https://github.com/jkoking/nixos-hardware?ref=add-framework-16";
+    };
+
     attic = {
       url = "github:zhaofengli/attic";
       inputs = {
diff --git a/users/alice/systems/artemision/configuration.nix b/users/alice/systems/artemision/configuration.nix
index 4178afd..91136bd 100644
--- a/users/alice/systems/artemision/configuration.nix
+++ b/users/alice/systems/artemision/configuration.nix
@@ -52,13 +52,13 @@
 
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
-  services.fwupd.package =
-    (import (builtins.fetchTarball {
-      url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz";
-      sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk";
-    }) { inherit (pkgs) system; }).fwupd;
+#  services.fwupd.package =
+#    (import (builtins.fetchTarball {
+#      url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz";
+#      sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk";
+#    }) { inherit (pkgs) system; }).fwupd;
 
-  services.fprintd.enable = false;
+  services.fprintd.enable = true;
 
   services.spotifyd = {
     enable = true;
diff --git a/users/alice/systems/artemision/default.nix b/users/alice/systems/artemision/default.nix
index 9b7e617..ce96045 100644
--- a/users/alice/systems/artemision/default.nix
+++ b/users/alice/systems/artemision/default.nix
@@ -4,7 +4,7 @@
   home = true;
   sops = true;
   modules = [
-    inputs.nixos-hardware.nixosModules.framework-13-7040-amd
+    inputs.nixos-hardware-fw16.nixosModules.framework-16-7040-amd
     #({ pkgs, ... }: {
     #  nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ];
     #  environment.systemPackages = [ rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {