From 43236a3d562f891aba76c4000b69ed267eb6b753 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Wed, 28 Apr 2021 17:50:54 +0000
Subject: [PATCH] Update jlink, add scanners, yubikeys are plugdev now

---
 externals/packages/jlink/default.nix | 10 +++++-----
 sets/hardware.nix                    |  3 ++-
 system/starlight/default.nix         |  5 +++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/externals/packages/jlink/default.nix b/externals/packages/jlink/default.nix
index 31428ad..e0f4903 100644
--- a/externals/packages/jlink/default.nix
+++ b/externals/packages/jlink/default.nix
@@ -18,7 +18,7 @@
 , libXrandr
 }:
 let
-  jlinkVersion = "694";
+  jlinkVersion = "700a";
 
   architecture = {
     x86_64-linux = "x86_64";
@@ -28,10 +28,10 @@ let
   }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
 
   sha256 = {
-    x86_64-linux = "1y1i30y8h9pq345r25wycnfns1zz0y3g7b66a82nx3075zx2n4lm";
-    i686-linux = "1vdfxiwwxxr6vjybd0xl8iq79b5j7kd10bk9j22ghkg7b4mbsjrm";
-    armv7l-linux = "0hpiirzy1921fca7b0bcrmc48r03r0lv0qph6xnqdkv66iplj1gz";
-    aarch64-linux = "0c1sbyil6a97pr9ln9jf0ih6zmxvkl9lvxy86bbnbs8wrkgjfp8g";
+    x86_64-linux = "0b9jyhd0lkd0icabpfgdcbmzdz4arw1wvjkzchbm4gpd4lvw5q0g";
+    i686-linux = "0dam6v4gxc0jbhw3ab73jw9v8m166wxy07blfb53gq8xpl71x0f9";
+    armv7l-linux = "1ihcs0pxd28ay7v5c5kc6v28n9wml1s6p94b8lcxyddjli3lpkly";
+    aarch64-linux = "1pr1ziksixjrryhiycyl4qbr7fjnpgkj00iyphapxqcd0b64hsyr";
   }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
 
   url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${jlinkVersion}_${architecture}.tgz";
diff --git a/sets/hardware.nix b/sets/hardware.nix
index 055e3b4..2f7ada0 100644
--- a/sets/hardware.nix
+++ b/sets/hardware.nix
@@ -1,6 +1,7 @@
 { config, pkgs, ... }:
 let
-  jlink = pkgs.callPackage ../externals/packages/jlink { };
+  oldpkgs = import (fetchTarball "http://nixos.org/channels/nixos-20.03/nixexprs.tar.xz") { config.allowUnfree = true; };
+  jlink = oldpkgs.callPackage ../externals/packages/jlink { };
 in
 {
   services.udev.packages = [
diff --git a/system/starlight/default.nix b/system/starlight/default.nix
index 02692c6..1a77fc9 100644
--- a/system/starlight/default.nix
+++ b/system/starlight/default.nix
@@ -24,6 +24,7 @@
     KERNEL=="eth*", ATTR{address}=="00:0f:53:16:15:9c", NAME="lan10g0"
     KERNEL=="eth*", ATTR{address}=="00:0f:53:16:15:9d", NAME="lan10g1"
     KERNEL=="eth*", ATTR{address}=="b4:2e:99:3d:07:66", NAME="lan1g0"
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0407", MODE="0660", GROUP="plugdev"
   '';
   networking.bridges.br0 = {
     rstp = true;
@@ -76,5 +77,9 @@
     allowFrom = [ "localhost" "10.69.0.*" ];
   };
 
+  # Scanning
+  hardware.sane.enable = true;
+  users.users.artemis.extraGroups = [ "scanner" ];
+
   system.stateVersion = "19.09";
 }