From 6db9eaad8e78f882ae44a28edcc4d11d2ffd5e28 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 14 Mar 2023 21:43:19 +0100 Subject: Re-format with nixpkgs-fmt --- system/settings/hardware/adb.nix | 11 +++++------ system/settings/hardware/audio.nix | 7 +++---- system/settings/hardware/bare-metal.nix | 13 ++++++------- system/settings/hardware/bluetooth-audio.nix | 7 +++---- system/settings/hardware/bluetooth.nix | 9 ++++----- system/settings/hardware/connman.nix | 9 ++++----- system/settings/hardware/grub2.nix | 9 ++++----- system/settings/hardware/intel-gpu.nix | 9 ++++----- system/settings/hardware/iwd.nix | 9 ++++----- system/settings/hardware/keyboard.nix | 7 +++---- system/settings/hardware/keyboardio-model01.nix | 7 +++---- system/settings/hardware/laptop.nix | 13 ++++++------- system/settings/hardware/mouse.nix | 7 +++---- system/settings/hardware/network-manager.nix | 9 ++++----- system/settings/hardware/nitrokey.nix | 9 ++++----- system/settings/hardware/nvidia-gpu.nix | 21 +++++++++++---------- system/settings/hardware/nvme-root.nix | 9 ++++----- system/settings/hardware/personal-computer.nix | 9 ++++----- system/settings/hardware/printing.nix | 17 ++++++++--------- system/settings/hardware/systemd-boot.nix | 7 +++---- system/settings/hardware/thinkpad.nix | 11 +++++------ system/settings/hardware/trackball.nix | 7 +++---- system/settings/hardware/trezor.nix | 11 +++++------ 23 files changed, 103 insertions(+), 124 deletions(-) (limited to 'system/settings/hardware') diff --git a/system/settings/hardware/adb.nix b/system/settings/hardware/adb.nix index be151695..d7025d7e 100644 --- a/system/settings/hardware/adb.nix +++ b/system/settings/hardware/adb.nix @@ -1,12 +1,11 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { programs.adb.enable = true; - users.groups.adbusers = {}; + users.groups.adbusers = { }; services.udev = { - packages = [pkgs.android-udev-rules]; + packages = [ pkgs.android-udev-rules ]; }; } diff --git a/system/settings/hardware/audio.nix b/system/settings/hardware/audio.nix index 823edaeb..57055942 100644 --- a/system/settings/hardware/audio.nix +++ b/system/settings/hardware/audio.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.pipewire = { enable = true; diff --git a/system/settings/hardware/bare-metal.nix b/system/settings/hardware/bare-metal.nix index 0b8ce6d2..bd528fda 100644 --- a/system/settings/hardware/bare-metal.nix +++ b/system/settings/hardware/bare-metal.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { environment.systemPackages = with pkgs; [ exfat @@ -31,7 +30,7 @@ ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="bfq" ''; - boot.kernelModules = ["tcp_bbr"]; + boot.kernelModules = [ "tcp_bbr" ]; boot.kernel.sysctl = { "net.core.default_qdisc" = "cake"; "net.ipv4.tcp_allowed_congestion_control" = "bbr illinois reno lp"; @@ -47,6 +46,6 @@ }; boot.tmpOnTmpfs = true; - fileSystems."/".options = ["noatime" "nodiratime"]; - fileSystems."/home".options = ["noatime" "nodiratime"]; + fileSystems."/".options = [ "noatime" "nodiratime" ]; + fileSystems."/home".options = [ "noatime" "nodiratime" ]; } diff --git a/system/settings/hardware/bluetooth-audio.nix b/system/settings/hardware/bluetooth-audio.nix index 26e3ca70..d368cb29 100644 --- a/system/settings/hardware/bluetooth-audio.nix +++ b/system/settings/hardware/bluetooth-audio.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { hardware = { bluetooth = { diff --git a/system/settings/hardware/bluetooth.nix b/system/settings/hardware/bluetooth.nix index 54a1792a..b92cd881 100644 --- a/system/settings/hardware/bluetooth.nix +++ b/system/settings/hardware/bluetooth.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { hardware = { bluetooth = { diff --git a/system/settings/hardware/connman.nix b/system/settings/hardware/connman.nix index e8e04244..5e8d0227 100644 --- a/system/settings/hardware/connman.nix +++ b/system/settings/hardware/connman.nix @@ -1,12 +1,11 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.connman = { enable = true; enableVPN = false; - extraFlags = ["--nodnsproxy"]; + extraFlags = [ "--nodnsproxy" ]; }; networking.useDHCP = false; diff --git a/system/settings/hardware/grub2.nix b/system/settings/hardware/grub2.nix index a020baa7..7b4b2e39 100644 --- a/system/settings/hardware/grub2.nix +++ b/system/settings/hardware/grub2.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { boot.loader = { grub = { diff --git a/system/settings/hardware/intel-gpu.nix b/system/settings/hardware/intel-gpu.nix index c606de79..494cb86e 100644 --- a/system/settings/hardware/intel-gpu.nix +++ b/system/settings/hardware/intel-gpu.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { # https://wiki.gentoo.org/wiki/Intel#Feature_support services.xserver = { @@ -9,7 +8,7 @@ deviceSection = '' Option "DRI" "3" ''; - videoDrivers = ["intel"]; + videoDrivers = [ "intel" ]; }; boot.kernelParams = [ diff --git a/system/settings/hardware/iwd.nix b/system/settings/hardware/iwd.nix index c0090f26..45d0ffdb 100644 --- a/system/settings/hardware/iwd.nix +++ b/system/settings/hardware/iwd.nix @@ -1,12 +1,11 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { networking.wireless.iwd = { enable = true; }; - users.users.alan.extraGroups = ["network"]; + users.users.alan.extraGroups = [ "network" ]; services.connman.wifi.backend = "iwd"; } diff --git a/system/settings/hardware/keyboard.nix b/system/settings/hardware/keyboard.nix index 6e06618f..20030760 100644 --- a/system/settings/hardware/keyboard.nix +++ b/system/settings/hardware/keyboard.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.xserver = { layout = "us,de"; diff --git a/system/settings/hardware/keyboardio-model01.nix b/system/settings/hardware/keyboardio-model01.nix index c10533bd..450ae6d0 100644 --- a/system/settings/hardware/keyboardio-model01.nix +++ b/system/settings/hardware/keyboardio-model01.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.udev.extraRules = '' SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2300", SYMLINK+="model01", ENV{ID_MM_DEVICE_IGNORE}:="1", ENV{ID_MM_CANDIDATE}:="0" diff --git a/system/settings/hardware/laptop.nix b/system/settings/hardware/laptop.nix index 32479ad1..bd66fb8f 100644 --- a/system/settings/hardware/laptop.nix +++ b/system/settings/hardware/laptop.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { imports = [ ./bluetooth.nix @@ -13,7 +12,7 @@ ../user-interface.nix ]; - boot.kernelModules = ["coretemp"]; + boot.kernelModules = [ "coretemp" ]; environment.systemPackages = with pkgs; [ powerstat @@ -29,7 +28,7 @@ enable = true; defaultTarget = "common"; }; - systemd.services.autorandr.wantedBy = ["graphical.target"]; + systemd.services.autorandr.wantedBy = [ "graphical.target" ]; environment.etc.autorandr = { enable = true; diff --git a/system/settings/hardware/mouse.nix b/system/settings/hardware/mouse.nix index 6104ea47..b74d17aa 100644 --- a/system/settings/hardware/mouse.nix +++ b/system/settings/hardware/mouse.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.xserver.libinput = { enable = true; diff --git a/system/settings/hardware/network-manager.nix b/system/settings/hardware/network-manager.nix index 22711b10..a27ca892 100644 --- a/system/settings/hardware/network-manager.nix +++ b/system/settings/hardware/network-manager.nix @@ -1,8 +1,7 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: { networking = { networkmanager = { diff --git a/system/settings/hardware/nitrokey.nix b/system/settings/hardware/nitrokey.nix index 58e62195..ae402b34 100644 --- a/system/settings/hardware/nitrokey.nix +++ b/system/settings/hardware/nitrokey.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { hardware.nitrokey = { enable = true; diff --git a/system/settings/hardware/nvidia-gpu.nix b/system/settings/hardware/nvidia-gpu.nix index 40c148ec..8aa3f104 100644 --- a/system/settings/hardware/nvidia-gpu.nix +++ b/system/settings/hardware/nvidia-gpu.nix @@ -1,15 +1,16 @@ -{ - config, - pkgs, - lib, - ... -}: let +{ config +, pkgs +, lib +, ... +}: +let nvidia_x11 = config.boot.kernelPackages.nvidia_x11; -in { - services.xserver.videoDrivers = ["nvidia"]; +in +{ + services.xserver.videoDrivers = [ "nvidia" ]; boot = { - blacklistedKernelModules = ["nouveau"]; - extraModulePackages = [nvidia_x11]; + blacklistedKernelModules = [ "nouveau" ]; + extraModulePackages = [ nvidia_x11 ]; }; environment.systemPackages = [ nvidia_x11 pkgs.nvidia-vaapi-driver ]; diff --git a/system/settings/hardware/nvme-root.nix b/system/settings/hardware/nvme-root.nix index 310a0482..90f5248a 100644 --- a/system/settings/hardware/nvme-root.nix +++ b/system/settings/hardware/nvme-root.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { - boot.kernelParams = ["elevator=none"]; + boot.kernelParams = [ "elevator=none" ]; } diff --git a/system/settings/hardware/personal-computer.nix b/system/settings/hardware/personal-computer.nix index e7160950..35824136 100644 --- a/system/settings/hardware/personal-computer.nix +++ b/system/settings/hardware/personal-computer.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_zen; powerManagement.cpuFreqGovernor = "schedutil"; diff --git a/system/settings/hardware/printing.nix b/system/settings/hardware/printing.nix index 474b37b7..2cb3b62c 100644 --- a/system/settings/hardware/printing.nix +++ b/system/settings/hardware/printing.nix @@ -1,17 +1,16 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { services.printing.enable = true; - systemd.services.cups.wantedBy = lib.mkForce []; - systemd.sockets.cups.wantedBy = ["sockets.target"]; - systemd.services.cups-browsed.wantedBy = lib.mkForce []; + systemd.services.cups.wantedBy = lib.mkForce [ ]; + systemd.sockets.cups.wantedBy = [ "sockets.target" ]; + systemd.services.cups-browsed.wantedBy = lib.mkForce [ ]; systemd.timers.cups-browsed = { description = "Delayed startup of CUPS Remote Printer Discovery"; - wantedBy = ["timers.target"]; + wantedBy = [ "timers.target" ]; timerConfig = { OnActiveSec = "2 min"; }; diff --git a/system/settings/hardware/systemd-boot.nix b/system/settings/hardware/systemd-boot.nix index e8c06527..9a94dcf8 100644 --- a/system/settings/hardware/systemd-boot.nix +++ b/system/settings/hardware/systemd-boot.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { boot.loader.systemd-boot = { enable = true; diff --git a/system/settings/hardware/thinkpad.nix b/system/settings/hardware/thinkpad.nix index 99d91263..649f626a 100644 --- a/system/settings/hardware/thinkpad.nix +++ b/system/settings/hardware/thinkpad.nix @@ -1,10 +1,9 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { - boot.kernelModules = []; - boot.blacklistedKernelModules = ["thinkpad_ec"]; + boot.kernelModules = [ ]; + boot.blacklistedKernelModules = [ "thinkpad_ec" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; diff --git a/system/settings/hardware/trackball.nix b/system/settings/hardware/trackball.nix index 7445c5bb..c2f7e68c 100644 --- a/system/settings/hardware/trackball.nix +++ b/system/settings/hardware/trackball.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.xserver.config = '' Section "InputClass" diff --git a/system/settings/hardware/trezor.nix b/system/settings/hardware/trezor.nix index e24fc92e..1004833a 100644 --- a/system/settings/hardware/trezor.nix +++ b/system/settings/hardware/trezor.nix @@ -1,14 +1,13 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: { services.trezord.enable = true; environment.systemPackages = with pkgs; [ gnupg pinentry - (python3.withPackages (ps: with ps; [trezor_agent wheel])) + (python3.withPackages (ps: with ps; [ trezor_agent wheel ])) trezor-suite ]; programs.gnupg.agent = { -- cgit 1.4.1