artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update jlink, add scanners, yubikeys are plugdev now

Browse source
This commit is contained in:
Artemis Tosini 2021-04-28 17:50:54 +00:00
parent ee1630b377
commit 43236a3d56
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
externals/packages/jlink/default.nix vendored
View file

@ -18,7 +18,7 @@
, libXrandr , libXrandr
}: }:
let let
jlinkVersion = "694"; jlinkVersion = "700a";
architecture = { architecture = {
x86_64-linux = "x86_64"; x86_64-linux = "x86_64";
@ -28,10 +28,10 @@ let
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
sha256 = { sha256 = {
x86_64-linux = "1y1i30y8h9pq345r25wycnfns1zz0y3g7b66a82nx3075zx2n4lm"; x86_64-linux = "0b9jyhd0lkd0icabpfgdcbmzdz4arw1wvjkzchbm4gpd4lvw5q0g";
i686-linux = "1vdfxiwwxxr6vjybd0xl8iq79b5j7kd10bk9j22ghkg7b4mbsjrm"; i686-linux = "0dam6v4gxc0jbhw3ab73jw9v8m166wxy07blfb53gq8xpl71x0f9";
armv7l-linux = "0hpiirzy1921fca7b0bcrmc48r03r0lv0qph6xnqdkv66iplj1gz"; armv7l-linux = "1ihcs0pxd28ay7v5c5kc6v28n9wml1s6p94b8lcxyddjli3lpkly";
aarch64-linux = "0c1sbyil6a97pr9ln9jf0ih6zmxvkl9lvxy86bbnbs8wrkgjfp8g"; aarch64-linux = "1pr1ziksixjrryhiycyl4qbr7fjnpgkj00iyphapxqcd0b64hsyr";
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${jlinkVersion}_${architecture}.tgz"; url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${jlinkVersion}_${architecture}.tgz";

3
sets/hardware.nix
View file

@ -1,6 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let 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 in
{ {
services.udev.packages = [ services.udev.packages = [

5
system/starlight/default.nix
View file

@ -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:9c", NAME="lan10g0"
KERNEL=="eth*", ATTR{address}=="00:0f:53:16:15:9d", NAME="lan10g1" KERNEL=="eth*", ATTR{address}=="00:0f:53:16:15:9d", NAME="lan10g1"
KERNEL=="eth*", ATTR{address}=="b4:2e:99:3d:07:66", NAME="lan1g0" 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 = { networking.bridges.br0 = {
rstp = true; rstp = true;
@ -76,5 +77,9 @@
allowFrom = [ "localhost" "10.69.0.*" ]; allowFrom = [ "localhost" "10.69.0.*" ];
}; };
# Scanning
hardware.sane.enable = true;
users.users.artemis.extraGroups = [ "scanner" ];
system.stateVersion = "19.09"; system.stateVersion = "19.09";
} }