From 7711077791bb1375792b520769e8640555ad672b Mon Sep 17 00:00:00 2001
From: Kate <kate@deprekated.net>
Date: Wed, 2 Jul 2025 12:12:02 +0200
Subject: [PATCH] re-enable waydroid, add hax tools

---
 flake.nix                       |  1 +
 nixos/configuration.linux.nix   |  4 +++-
 nixos/hosts/hinata.nix          | 35 +++++++++++++++++++++++----------
 nixos/hosts/komashi/default.nix |  3 +++
 nixos/packages/default.pkgs.nix |  1 +
 nixos/packages/flatpak.nix      |  4 ++++
 nixos/packages/offline.pkgs.nix |  3 +++
 7 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index f5386fb..9ea5150 100644
--- a/flake.nix
+++ b/flake.nix
@@ -196,6 +196,7 @@
       # Modules for offline linux machines.
       linuxOfflineModuleSet = [
         ./nixos/packages/offline.nix
+        ./nixos/configs/waydroid.nix
       ];
 
       # Helper functions for creating modules in the defintions below.
diff --git a/nixos/configuration.linux.nix b/nixos/configuration.linux.nix
index 675ccb6..a034b4f 100644
--- a/nixos/configuration.linux.nix
+++ b/nixos/configuration.linux.nix
@@ -92,7 +92,9 @@
   #
   # Services
   #
-  services.pcscd.enable = true;
+  services.pcscd = {
+    enable = true;
+  };
   services.openssh.enable = true;
   services.mullvad-vpn.enable = true;
   virtualisation.docker.enable = true;
diff --git a/nixos/hosts/hinata.nix b/nixos/hosts/hinata.nix
index 468d50f..d1652ad 100644
--- a/nixos/hosts/hinata.nix
+++ b/nixos/hosts/hinata.nix
@@ -13,15 +13,17 @@
 }:
 let
   # libfprint with patches for the GPD-provided reader
-  libfprint-gpd = pkgs.libfprint.overrideAttrs (prev: {
-    version = "git";
+  libfprint-gpd =
+    pkgs.libfprint.overrideAttrs
+      (prev: {
+        version = "git";
 
-    src = pkgs.fetchFromGitHub {
-      owner = "ericlinagora";
-      repo = "libfprint-CS9711";
-      rev = "03ace5b20146eb01c77fb3ea63e1909984d6d377";
-      sha256 = "sha256-gr3UvFB6D04he/9zawvQIuwfv0B7fEZb6BGiNAbLids=";
-    };
+        src = pkgs.fetchFromGitHub {
+          owner = "ericlinagora";
+          repo = "libfprint-CS9711";
+          rev = "03ace5b20146eb01c77fb3ea63e1909984d6d377";
+          sha256 = "sha256-gr3UvFB6D04he/9zawvQIuwfv0B7fEZb6BGiNAbLids=";
+        };
 
     nativeBuildInputs =
       prev.nativeBuildInputs
@@ -32,9 +34,19 @@ let
         nss
       ]);
 
-    installCheckPhase = "";
+        installCheckPhase = "";
 
-  });
+      }).overrideAttrs
+      (prev: rec {
+        version = "1.94.4";
+        src = pkgs.fetchFromGitLab {
+          domain = "gitlab.freedesktop.org";
+          owner = "libfprint";
+          repo = "fprintd";
+          rev = "refs/tags/v${version}";
+          hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
+        };
+      });
 
 in
 {
@@ -48,6 +60,9 @@ in
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  # Allow using our phone as an NFC smartcard reader.
+  services.pcscd.plugins = [ pkgs.vsmartcard-pcsc-relay ];
+
   # Networking.
   networking.hostName = "hinata";
   networking.networkmanager.enable = true;
diff --git a/nixos/hosts/komashi/default.nix b/nixos/hosts/komashi/default.nix
index b3027e7..d10a4dd 100644
--- a/nixos/hosts/komashi/default.nix
+++ b/nixos/hosts/komashi/default.nix
@@ -71,6 +71,9 @@
 
   services.blueman.enable = true;
 
+  # Allow the NFC reader on the trackpoint to be used as a smartcard reader.
+  hardware.nfc-nci.enable = true;
+
   #
   # Niri configuration for our monitors.
   #
diff --git a/nixos/packages/default.pkgs.nix b/nixos/packages/default.pkgs.nix
index 744af99..8d082e9 100644
--- a/nixos/packages/default.pkgs.nix
+++ b/nixos/packages/default.pkgs.nix
@@ -150,6 +150,7 @@ with pkgs;
   deprekages.rfe-touch
   deprekages.rfe-signal
   deprekages.librevna
+  python3Packages.meshtastic
 
   # For editors.
   fish
diff --git a/nixos/packages/flatpak.nix b/nixos/packages/flatpak.nix
index 5d93e49..dce7a3d 100644
--- a/nixos/packages/flatpak.nix
+++ b/nixos/packages/flatpak.nix
@@ -13,6 +13,10 @@
       appId = "com.github.vikdevelop.photopea_app";
       origin = "flathub";
     }
+    {
+      appId = "io.emeric.toolblex";
+      origin = "flathub";
+    }
   ];
 
   services.flatpak.overrides = {
diff --git a/nixos/packages/offline.pkgs.nix b/nixos/packages/offline.pkgs.nix
index 173b9cf..08f3ea8 100644
--- a/nixos/packages/offline.pkgs.nix
+++ b/nixos/packages/offline.pkgs.nix
@@ -42,6 +42,9 @@ with pkgs;
   gnuradioPackages.fosphor
   gnuradioPackages.lora_sdr
 
+  # hax
+  btlejack
+
   # Build systems.
   cmake
   gnumake