From 2bcc955f0731643b2fa842db024f9ccef747c329 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Mon, 3 Jan 2022 11:54:05 +0100 Subject: [PATCH] Global nixfmt --- .../fhauser/work/openvpn.nix | 5 +---- hardware/amd-board.nix | 20 +++++++++---------- hardware/ecc-memory.nix | 4 +--- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/defaults/user-configuration/fhauser/work/openvpn.nix b/defaults/user-configuration/fhauser/work/openvpn.nix index 333b361..25841b8 100644 --- a/defaults/user-configuration/fhauser/work/openvpn.nix +++ b/defaults/user-configuration/fhauser/work/openvpn.nix @@ -25,10 +25,7 @@ -----END CERTIFICATE----- ''; }; - dhcpIps = [ - "185.88.236.100" - "212.103.68.20" - ]; + dhcpIps = [ "185.88.236.100" "212.103.68.20" ]; dhcpOptions = with builtins; concatStringsSep "\n" (map (ip: "dhcp-option DNS ${ip}") dhcpIps); in { diff --git a/hardware/amd-board.nix b/hardware/amd-board.nix index 9617c01..f5eb44d 100644 --- a/hardware/amd-board.nix +++ b/hardware/amd-board.nix @@ -16,25 +16,25 @@ boot.extraModulePackages = [ ]; boot.kernelParams = [ "acpi_enforce_resources=lax" ]; - hardware.firmware = [ pkgs.wireless-regdb ]; hardware.cpu.amd.updateMicrocode = true; nix.maxJobs = lib.mkDefault 24; powerManagement.powerUpCommands = let - forceThunderboltOnScript = pkgs.writeScriptBin "force-thunderbolt-power-on" '' - #!${pkgs.stdenv.shell} + forceThunderboltOnScript = + pkgs.writeScriptBin "force-thunderbolt-power-on" '' + #!${pkgs.stdenv.shell} - #echo 'on' > '/sys/bus/pci/devices/0000:03:00.0/power/control'; #TODO: Is the main controller required? + #echo 'on' > '/sys/bus/pci/devices/0000:03:00.0/power/control'; #TODO: Is the main controller required? - THUNDERBOLT_DEVICES="$(${pkgs.pciutils}/bin/lspci -D | ${pkgs.gnugrep}/bin/grep -i thunderbolt | cut --delimiter=' ' --fields=1)" + THUNDERBOLT_DEVICES="$(${pkgs.pciutils}/bin/lspci -D | ${pkgs.gnugrep}/bin/grep -i thunderbolt | cut --delimiter=' ' --fields=1)" - echo "Force PCI power on all thunderbolt devices" + echo "Force PCI power on all thunderbolt devices" - for DEVICE in $THUNDERBOLT_DEVICES; do - echo 'on' > "/sys/bus/pci/devices/$DEVICE/power/control" - done - ''; + for DEVICE in $THUNDERBOLT_DEVICES; do + echo 'on' > "/sys/bus/pci/devices/$DEVICE/power/control" + done + ''; in "${forceThunderboltOnScript}/bin/force-thunderbolt-power-on"; } diff --git a/hardware/ecc-memory.nix b/hardware/ecc-memory.nix index 232d56c..3fbe401 100644 --- a/hardware/ecc-memory.nix +++ b/hardware/ecc-memory.nix @@ -1,5 +1,3 @@ { config, lib, pkgs, modulesPath, ... }: { - hardware.rasdaemon = { - enable = true; - }; + hardware.rasdaemon = { enable = true; }; }