From b88432cfa07d7abdfa204444d11289ec1c4f80b9 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 11 May 2021 01:45:06 +0000 Subject: [PATCH] Finish fixing radio, clean up printing and udev --- private | 2 +- sets/printing.nix | 11 ----------- sets/radio.nix | 5 ++--- system/starlight/default.nix | 1 - 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/private b/private index 1d77fc8..c867a0a 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 1d77fc84c6c587b74e5404013d5144a0e5a348d8 +Subproject commit c867a0a61269868b9a295226e4d5fea2ca889708 diff --git a/sets/printing.nix b/sets/printing.nix index 9b1d0fd..2497c0f 100644 --- a/sets/printing.nix +++ b/sets/printing.nix @@ -3,16 +3,5 @@ { services.printing = { enable = true; - drivers = with pkgs; [ - (pkgs.brlaser.overrideAttrs (old: { - patches = [ - (pkgs.fetchpatch { - name = "l2300d-fix.patch"; - url = "https://patch-diff.githubusercontent.com/raw/pdewacht/brlaser/pull/68.patch"; - sha256 = "07iqv048q0iplghn0aamjslyixw1p5jbk004i20xnl1vs95nyqzy"; - }) - ]; - })) - ]; }; } diff --git a/sets/radio.nix b/sets/radio.nix index c861dbb..4a3f8f4 100644 --- a/sets/radio.nix +++ b/sets/radio.nix @@ -2,11 +2,10 @@ { services.udev.packages = with pkgs; [ - limesuite + soapysdr-with-plugins ]; environment.systemPackages = with pkgs; [ - limesuite - soapysdr + soapysdr-with-plugins gqrx ]; } diff --git a/system/starlight/default.nix b/system/starlight/default.nix index 6ab3a38..8456914 100644 --- a/system/starlight/default.nix +++ b/system/starlight/default.nix @@ -25,7 +25,6 @@ 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;