From abbc8cb0639a64bb6286b53f9cd38f8156a8d8a4 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Fri, 7 Oct 2022 20:42:59 +0200 Subject: [PATCH] Formatting --- machines/loki/configuration.nix | 26 +++++++++++++++++++------- modules/base/default.nix | 8 ++++---- modules/base/solo2/default.nix | 8 ++++---- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix index 4a3017e..a1456b1 100644 --- a/machines/loki/configuration.nix +++ b/machines/loki/configuration.nix @@ -82,23 +82,35 @@ in # interfaces."enp4s0" = { allowedTCPPorts = [ # NFS - 111 2049 4100 4101 4102 20048 + 111 + 2049 + 4100 + 4101 + 4102 + 20048 # Horus System V2 - 12345 5555 5556 - + 12345 + 5555 + 5556 + # Elixir/Phoenix dev environment 4000 - + # Sunshine 48010 ]; - + allowedUDPPorts = [ # NFS - 111 2049 4100 4101 4102 20048 + 111 + 2049 + 4100 + 4101 + 4102 + 20048 ]; - + allowedTCPPortRanges = [ # Sunshine { from = 47984; to = 47990; } diff --git a/modules/base/default.nix b/modules/base/default.nix index 040174f..058cb8b 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -80,10 +80,10 @@ in services.udev = { extraRules = qmkUdevRules; - packages = [] ++ (optional cfg.udev-rules.probe-rs [ probersRules ]) - ++ (optional cfg.udev-rules.blink1 [ blink1Rules ]) - ++ (optional cfg.udev-rules.picotool [ picotoolRules ]) - ++ (optional cfg.udev-rules.solo2 [ solo2Rules ]); + packages = [ ] ++ (optional cfg.udev-rules.probe-rs [ probersRules ]) + ++ (optional cfg.udev-rules.blink1 [ blink1Rules ]) + ++ (optional cfg.udev-rules.picotool [ picotoolRules ]) + ++ (optional cfg.udev-rules.solo2 [ solo2Rules ]); }; }; } diff --git a/modules/base/solo2/default.nix b/modules/base/solo2/default.nix index ff7f572..2132959 100644 --- a/modules/base/solo2/default.nix +++ b/modules/base/solo2/default.nix @@ -11,10 +11,10 @@ mkDerivation { phases = [ "installPhase" ]; installPhase = '' -mkdir -p $out/lib/udev/rules.d -echo 'SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="b000", TAG+="uaccess"' >> $out/lib/udev/rules.d/70-solo2.rules -''; - + mkdir -p $out/lib/udev/rules.d + echo 'SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="b000", TAG+="uaccess"' >> $out/lib/udev/rules.d/70-solo2.rules + ''; + meta = with lib; { description = "udev rules for the solo2 key"; homepage = "https://solokeys.com";