From cf18b231c482224a364945e54394507700364411 Mon Sep 17 00:00:00 2001
From: Jade <obsidianical@gmail.com>
Date: Tue, 6 Feb 2024 19:33:09 +0100
Subject: [PATCH] ssh stuff, pam u2f, fixing touchpad tapping on mbp

---
 common.nix                           |  3 +++
 hosts/potatobook-g/configuration.nix | 10 ++++++++++
 other/scripts/dispatcher.nu          |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/common.nix b/common.nix
index 078c01f..44987f9 100644
--- a/common.nix
+++ b/common.nix
@@ -156,6 +156,9 @@ with builtins; {
     packages = [
       pkgs.marksman
     ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaE8TFsIazpn4OnHvHcRpOFr9FfvMaWOiEjmHsmnAoE cardno:000F_70CD7D05"
+    ];
   };
 
   zramSwap = {
diff --git a/hosts/potatobook-g/configuration.nix b/hosts/potatobook-g/configuration.nix
index 4853d99..47ef40f 100644
--- a/hosts/potatobook-g/configuration.nix
+++ b/hosts/potatobook-g/configuration.nix
@@ -66,6 +66,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   services.xserver.libinput.touchpad.disableWhileTyping = true;
+  services.xserver.libinput.touchpad.tapping = false;
 
   networking.networkmanager.enable = true;
 
@@ -115,8 +116,17 @@
   services.gnome.gnome-keyring.enable = true;
   programs.seahorse.enable = true;
   security.pam.services.jade.enableGnomeKeyring = true;
+  security.pam.services.jade.u2fAuth = true;
 
   systemd.services."NetworkManager-wait-online".enable = false;
+  programs.i3lock.u2fSupport = true;
+
+  security.pam.u2f = {
+    enable = true;
+    cue = true;
+    control = "sufficient";
+    authFile = "/home/jade/.ssh/u2f_keys";
+  };
 
   # services.pixiecore =
   #   let
diff --git a/other/scripts/dispatcher.nu b/other/scripts/dispatcher.nu
index 30cc91b..466732d 100755
--- a/other/scripts/dispatcher.nu
+++ b/other/scripts/dispatcher.nu
@@ -13,7 +13,7 @@ def main [
 
   systemd-cat echo $"($currentnet) \(($interface)): ($type)";
 
-  if $interface == 'wlp2s0' {
+  if $interface starts-with 'wlp' {
     ^$"/etc/networkhooks/($currentnet).nu" $interface $type
   }
 }