From 361d7445a5d0f663dd4e475e90f6badf9df18d02 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 18 Sep 2019 15:38:07 +0800
Subject: [PATCH] nixbld: cleanup

---
 nixbld-etc-nixos/configuration.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index fde849c..98aa192 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -32,7 +32,7 @@ in
   networking = {
     hostName = "nixbld";
     firewall = {
-      allowedTCPPorts = [ 80 443 631 5901 ];
+      allowedTCPPorts = [ 80 443 631 ];
       allowedUDPPorts = [ 53 67 631 ];
     };
     networkmanager.unmanaged = [ "interface-name:${netifLan}" "interface-name:${netifWifi}" ];
@@ -123,6 +123,7 @@ in
   services.avahi.interfaces = [ netifLan ];
   services.avahi.publish.enable = true;
   services.avahi.publish.userServices = true;
+  nixpkgs.config.allowUnfree = true;
   services.printing.enable = true;
   services.printing.drivers = [ pkgs.hplipWithPlugin ];
   services.printing.browsing = true;
@@ -155,7 +156,7 @@ in
   security.sudo.wheelNeedsPassword = false;
   security.hideProcessInformation = true;
   boot.kernel.sysctl."kernel.dmesg_restrict" = true;
-  services.udev.packages = [ pkgs.openocd ];
+  services.udev.packages = [ pkgs.openocd pkgs.sane-backends ];
   services.udev.extraRules = ''
 ACTION=="add", SUBSYSTEM=="tty", \
   ENV{ID_SERIAL}=="FTDI_Quad_RS232-HS", \
@@ -173,8 +174,6 @@ ACTION=="add", SUBSYSTEM=="tty", \
 
   '';
 
-  nixpkgs.config.allowUnfree = true;
-
   nix.distributedBuilds = true;
   nix.buildMachines = [
     {