From 05dd85210e465caa44ef7254f2781b2d12ba2882 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 16 Oct 2022 23:49:18 +0200
Subject: Reformat files with alejandra

---
 system/settings/base.nix                          |  8 ++--
 system/settings/configuration/berlin.nix          |  9 ++--
 system/settings/configuration/british-english.nix |  9 ++--
 system/settings/configuration/england.nix         |  9 ++--
 system/settings/configuration/networking.nix      |  8 ++--
 system/settings/configuration/nix.nix             | 13 +++--
 system/settings/configuration/user.nix            | 11 +++--
 system/settings/darwin.nix                        |  7 ++-
 system/settings/gaming.nix                        | 42 ++++++++--------
 system/settings/hardware/adb.nix                  |  8 ++--
 system/settings/hardware/audio.nix                |  9 ++--
 system/settings/hardware/bare-metal.nix           | 17 ++++---
 system/settings/hardware/bluetooth-audio.nix      |  6 ++-
 system/settings/hardware/bluetooth.nix            |  7 ++-
 system/settings/hardware/connman.nix              | 11 +++--
 system/settings/hardware/grub2.nix                | 10 ++--
 system/settings/hardware/intel-gpu.nix            |  8 ++--
 system/settings/hardware/iwd.nix                  |  8 ++--
 system/settings/hardware/keyboard.nix             |  6 ++-
 system/settings/hardware/keyboardio-model01.nix   |  9 ++--
 system/settings/hardware/laptop.nix               | 12 +++--
 system/settings/hardware/mouse.nix                |  8 ++--
 system/settings/hardware/network-manager.nix      |  7 ++-
 system/settings/hardware/nitrokey.nix             |  7 ++-
 system/settings/hardware/nvidia-gpu.nix           | 20 ++++----
 system/settings/hardware/nvme-root.nix            |  6 ++-
 system/settings/hardware/personal-computer.nix    |  7 ++-
 system/settings/hardware/printing.nix             | 14 ++++--
 system/settings/hardware/systemd-boot.nix         |  9 ++--
 system/settings/hardware/thinkpad.nix             | 11 +++--
 system/settings/hardware/trackball.nix            |  9 ++--
 system/settings/hardware/trezor.nix               | 12 +++--
 system/settings/kubernetes.nix                    |  6 ++-
 system/settings/machines/t470s.nix                |  9 ++--
 system/settings/programs/barrier.nix              |  8 +++-
 system/settings/programs/base.nix                 |  4 +-
 system/settings/programs/gnome.nix                | 12 +++--
 system/settings/programs/gnupg.nix                |  9 ++--
 system/settings/programs/i3.nix                   |  9 ++--
 system/settings/programs/kde.nix                  | 12 +++--
 system/settings/programs/shell.nix                | 24 ++++++----
 system/settings/programs/tor.nix                  |  9 ++--
 system/settings/programs/window-manager.nix       |  6 ++-
 system/settings/satoshipay.nix                    | 13 +++--
 system/settings/services/airplay-sink.nix         |  6 ++-
 system/settings/services/samba.nix                | 16 +++----
 system/settings/services/syncthing.nix            |  9 ++--
 system/settings/services/virtualisation.nix       |  6 ++-
 system/settings/services/xserver.nix              | 58 +++++++++++++----------
 system/settings/services/zeroconf.nix             | 12 +++--
 system/settings/user-interface.nix                | 17 ++++---
 51 files changed, 364 insertions(+), 218 deletions(-)

(limited to 'system/settings')

diff --git a/system/settings/base.nix b/system/settings/base.nix
index 35d00faa..809b6847 100644
--- a/system/settings/base.nix
+++ b/system/settings/base.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, lib, ... }:
-
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [
     ../modules/nextdns.nix
   ];
@@ -18,5 +21,4 @@
     configID = "abd6e5";
     identifyDevice = true;
   };
-
 }
diff --git a/system/settings/configuration/berlin.nix b/system/settings/configuration/berlin.nix
index 6fa4f502..bc8ed1fd 100644
--- a/system/settings/configuration/berlin.nix
+++ b/system/settings/configuration/berlin.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
-
-{ time.timeZone = "Europe/Berlin";
+{
+  config,
+  pkgs,
+  ...
+}: {
+  time.timeZone = "Europe/Berlin";
   location = {
     latitude = 52.586;
     longitude = 13.300;
diff --git a/system/settings/configuration/british-english.nix b/system/settings/configuration/british-english.nix
index 3ff93678..4167016f 100644
--- a/system/settings/configuration/british-english.nix
+++ b/system/settings/configuration/british-english.nix
@@ -1,4 +1,7 @@
-{ config, pkgs, ... }:
-
-{ i18n.defaultLocale = "en_GB.UTF-8";
+{
+  config,
+  pkgs,
+  ...
+}: {
+  i18n.defaultLocale = "en_GB.UTF-8";
 }
diff --git a/system/settings/configuration/england.nix b/system/settings/configuration/england.nix
index 4b54db17..2213ac74 100644
--- a/system/settings/configuration/england.nix
+++ b/system/settings/configuration/england.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
-
-{ time.timeZone = "Europe/London";
+{
+  config,
+  pkgs,
+  ...
+}: {
+  time.timeZone = "Europe/London";
   services.redshift = {
     latitude = 52.2394;
     longitude = -0.9416;
diff --git a/system/settings/configuration/networking.nix b/system/settings/configuration/networking.nix
index 2e93a4ca..8d9f276f 100644
--- a/system/settings/configuration/networking.nix
+++ b/system/settings/configuration/networking.nix
@@ -1,7 +1,9 @@
-{ config, pkgs, ... }:
-
 {
-  environment.systemPackages = with pkgs; [ lxqt.lxqt-policykit ]; # provides a default authentification client for policykit
+  config,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [lxqt.lxqt-policykit]; # provides a default authentification client for policykit
   services.gvfs.enable = true; # enables gvfs
 
   imports = [
diff --git a/system/settings/configuration/nix.nix b/system/settings/configuration/nix.nix
index f152ac27..7ae8f7f6 100644
--- a/system/settings/configuration/nix.nix
+++ b/system/settings/configuration/nix.nix
@@ -1,10 +1,13 @@
-{ config, pkgs, ... }:
-
-{ nix = {
+{
+  config,
+  pkgs,
+  ...
+}: {
+  nix = {
     settings = {
       cores = 0;
       auto-optimise-store = true;
-      trusted-users = [ "@wheel" ];
+      trusted-users = ["@wheel"];
     };
 
     daemonCPUSchedPolicy = "idle";
@@ -24,7 +27,7 @@
 
   system.autoUpgrade = {
     enable = true;
-    flags = [ "--max-jobs" "2" ];
+    flags = ["--max-jobs" "2"];
   };
   systemd.services.nixos-upgrade = {
     script = pkgs.lib.mkForce ''
diff --git a/system/settings/configuration/user.nix b/system/settings/configuration/user.nix
index 33b678e9..ccb43323 100644
--- a/system/settings/configuration/user.nix
+++ b/system/settings/configuration/user.nix
@@ -1,9 +1,12 @@
-{ config, pkgs, ... }:
-
-{ users.extraUsers.alan = {
+{
+  config,
+  pkgs,
+  ...
+}: {
+  users.extraUsers.alan = {
     description = "Alan Pearce";
     isNormalUser = true;
-    extraGroups = [ "audio" "wheel" "lp" "adbusers" "docker" "nitrokey" "dialout" "pipewire" "networkmanager" "video" ];
+    extraGroups = ["audio" "wheel" "lp" "adbusers" "docker" "nitrokey" "dialout" "pipewire" "networkmanager" "video"];
     shell = "/run/current-system/sw/bin/zsh";
     initialPassword = "password";
     home = "/home/alan";
diff --git a/system/settings/darwin.nix b/system/settings/darwin.nix
index 66d2a353..1d64ff3b 100644
--- a/system/settings/darwin.nix
+++ b/system/settings/darwin.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, lib, ... }:
-
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   services.nix-daemon = {
     enable = true;
     enableSocketListener = true;
diff --git a/system/settings/gaming.nix b/system/settings/gaming.nix
index 139210cf..3a0c134e 100644
--- a/system/settings/gaming.nix
+++ b/system/settings/gaming.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.steam.enable = true;
   programs.gamemode = {
     enable = true;
@@ -25,7 +27,7 @@
       "link.max-buffers" = 16;
       "log.level" = 2;
       "default.clock.rate" = 44100;
-      "default.clock.allowed_rates" = [ 44100 48000 88200 96000 ];
+      "default.clock.allowed_rates" = [44100 48000 88200 96000];
       "default.clock.quantum" = 32;
       "default.clock.min-quantum" = 32;
       "default.clock.max-quantum" = 32;
@@ -41,26 +43,26 @@
           "rt.time.soft" = 200000;
           "rt.time.hard" = 200000;
         };
-        flags = [ "ifexists" "nofail" ];
+        flags = ["ifexists" "nofail"];
       }
-      { name = "libpipewire-module-protocol-native"; }
-      { name = "libpipewire-module-profiler"; }
-      { name = "libpipewire-module-metadata"; }
-      { name = "libpipewire-module-spa-device-factory"; }
-      { name = "libpipewire-module-spa-node-factory"; }
-      { name = "libpipewire-module-client-node"; }
-      { name = "libpipewire-module-client-device"; }
+      {name = "libpipewire-module-protocol-native";}
+      {name = "libpipewire-module-profiler";}
+      {name = "libpipewire-module-metadata";}
+      {name = "libpipewire-module-spa-device-factory";}
+      {name = "libpipewire-module-spa-node-factory";}
+      {name = "libpipewire-module-client-node";}
+      {name = "libpipewire-module-client-device";}
       {
         name = "libpipewire-module-portal";
-        flags = [ "ifexists" "nofail" ];
+        flags = ["ifexists" "nofail"];
       }
       {
         name = "libpipewire-module-access";
         args = {};
       }
-      { name = "libpipewire-module-adapter"; }
-      { name = "libpipewire-module-link-factory"; }
-      { name = "libpipewire-module-session-manager"; }
+      {name = "libpipewire-module-adapter";}
+      {name = "libpipewire-module-link-factory";}
+      {name = "libpipewire-module-session-manager";}
     ];
     "stream.properties" = {
       "node.latency" = "32/44100";
@@ -86,12 +88,12 @@
           "rt.time.soft" = 200000;
           "rt.time.hard" = 200000;
         };
-        flags = [ "ifexists" "nofail" ];
+        flags = ["ifexists" "nofail"];
       }
-      { name = "libpipewire-module-protocol-native"; }
-      { name = "libpipewire-module-client-node"; }
-      { name = "libpipewire-module-adapter"; }
-      { name = "libpipewire-module-metadata"; }
+      {name = "libpipewire-module-protocol-native";}
+      {name = "libpipewire-module-client-node";}
+      {name = "libpipewire-module-adapter";}
+      {name = "libpipewire-module-metadata";}
       {
         name = "libpipewire-module-protocol-pulse";
         args = {
diff --git a/system/settings/hardware/adb.nix b/system/settings/hardware/adb.nix
index 0c27b380..be151695 100644
--- a/system/settings/hardware/adb.nix
+++ b/system/settings/hardware/adb.nix
@@ -1,10 +1,12 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.adb.enable = true;
   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 036fb37d..823edaeb 100644
--- a/system/settings/hardware/audio.nix
+++ b/system/settings/hardware/audio.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
-
-{ services.pipewire = {
+{
+  config,
+  pkgs,
+  ...
+}: {
+  services.pipewire = {
     enable = true;
     audio.enable = true;
     alsa.enable = true;
diff --git a/system/settings/hardware/bare-metal.nix b/system/settings/hardware/bare-metal.nix
index ce8e57e2..0b8ce6d2 100644
--- a/system/settings/hardware/bare-metal.nix
+++ b/system/settings/hardware/bare-metal.nix
@@ -1,8 +1,11 @@
-{ config, pkgs, ... }:
-
-{ environment.systemPackages = with pkgs; [
+{
+  config,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
     exfat
-		efibootmgr
+    efibootmgr
     cryptsetup
     dmidecode
     hdparm
@@ -28,7 +31,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";
@@ -44,6 +47,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 69f46984..26e3ca70 100644
--- a/system/settings/hardware/bluetooth-audio.nix
+++ b/system/settings/hardware/bluetooth-audio.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   hardware = {
     bluetooth = {
       package = pkgs.bluezFull;
diff --git a/system/settings/hardware/bluetooth.nix b/system/settings/hardware/bluetooth.nix
index 258fdb29..54a1792a 100644
--- a/system/settings/hardware/bluetooth.nix
+++ b/system/settings/hardware/bluetooth.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, lib, ... }:
-
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   hardware = {
     bluetooth = {
       enable = true;
diff --git a/system/settings/hardware/connman.nix b/system/settings/hardware/connman.nix
index 91b6aab1..e8e04244 100644
--- a/system/settings/hardware/connman.nix
+++ b/system/settings/hardware/connman.nix
@@ -1,9 +1,12 @@
-{ config, pkgs, ... }:
-
-{ services.connman = {
+{
+  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 cd1fd619..a020baa7 100644
--- a/system/settings/hardware/grub2.nix
+++ b/system/settings/hardware/grub2.nix
@@ -1,6 +1,10 @@
-{ config, pkgs, lib, ... }:
-
-{ boot.loader = {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  boot.loader = {
     grub = {
       enable = true;
       splashImage = null;
diff --git a/system/settings/hardware/intel-gpu.nix b/system/settings/hardware/intel-gpu.nix
index 3503c315..c606de79 100644
--- a/system/settings/hardware/intel-gpu.nix
+++ b/system/settings/hardware/intel-gpu.nix
@@ -1,13 +1,15 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   # https://wiki.gentoo.org/wiki/Intel#Feature_support
   services.xserver = {
     useGlamor = true;
     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 f1a67764..c0090f26 100644
--- a/system/settings/hardware/iwd.nix
+++ b/system/settings/hardware/iwd.nix
@@ -1,10 +1,12 @@
-{ 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 c967d561..3ff11b83 100644
--- a/system/settings/hardware/keyboard.nix
+++ b/system/settings/hardware/keyboard.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   services.xserver = {
     layout = "us";
     xkbVariant = "intl-unicode";
diff --git a/system/settings/hardware/keyboardio-model01.nix b/system/settings/hardware/keyboardio-model01.nix
index 9c44a916..c10533bd 100644
--- a/system/settings/hardware/keyboardio-model01.nix
+++ b/system/settings/hardware/keyboardio-model01.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
-
-{ services.udev.extraRules = ''
+{
+  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"
     SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2301", 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 946dbda7..ee67d38f 100644
--- a/system/settings/hardware/laptop.nix
+++ b/system/settings/hardware/laptop.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, lib, ... }:
-
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [
     ./bluetooth.nix
     ./bluetooth-audio.nix
@@ -10,10 +13,9 @@
     ../user-interface.nix
   ];
 
-  boot.kernelModules = [ "coretemp" ];
+  boot.kernelModules = ["coretemp"];
 
   environment.systemPackages = with pkgs; [
-
     powerstat
     powertop
 
@@ -28,7 +30,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 83e76d71..6104ea47 100644
--- a/system/settings/hardware/mouse.nix
+++ b/system/settings/hardware/mouse.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
-{ 
+{
+  config,
+  pkgs,
+  ...
+}: {
   services.xserver.libinput = {
     enable = true;
     mouse = {
diff --git a/system/settings/hardware/network-manager.nix b/system/settings/hardware/network-manager.nix
index 6ab0c818..22711b10 100644
--- a/system/settings/hardware/network-manager.nix
+++ b/system/settings/hardware/network-manager.nix
@@ -1,6 +1,9 @@
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   networking = {
     networkmanager = {
       enable = true;
diff --git a/system/settings/hardware/nitrokey.nix b/system/settings/hardware/nitrokey.nix
index a77ce00c..58e62195 100644
--- a/system/settings/hardware/nitrokey.nix
+++ b/system/settings/hardware/nitrokey.nix
@@ -1,6 +1,9 @@
-{ 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 052cd678..4024f069 100644
--- a/system/settings/hardware/nvidia-gpu.nix
+++ b/system/settings/hardware/nvidia-gpu.nix
@@ -1,16 +1,18 @@
-{ config, pkgs, lib, ... }:
-
-let
-  nvidia_x11 = config.boot.kernelPackages.nvidia_x11;
-in
 {
-  services.xserver.videoDrivers = [ "nvidia" ];
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  nvidia_x11 = config.boot.kernelPackages.nvidia_x11;
+in {
+  services.xserver.videoDrivers = ["nvidia"];
   boot = {
-    blacklistedKernelModules = [ "nouveau" ];
-    extraModulePackages = [ nvidia_x11 ];
+    blacklistedKernelModules = ["nouveau"];
+    extraModulePackages = [nvidia_x11];
   };
 
-  environment.systemPackages = [ nvidia_x11 ];
+  environment.systemPackages = [nvidia_x11];
   hardware.nvidia = {
     powerManagement = {
       enable = true;
diff --git a/system/settings/hardware/nvme-root.nix b/system/settings/hardware/nvme-root.nix
index 3ba26f50..310a0482 100644
--- a/system/settings/hardware/nvme-root.nix
+++ b/system/settings/hardware/nvme-root.nix
@@ -1,5 +1,7 @@
-{ config, pkgs, ...}:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   boot.kernelParams = ["elevator=none"];
 }
diff --git a/system/settings/hardware/personal-computer.nix b/system/settings/hardware/personal-computer.nix
index e8574b3d..e7160950 100644
--- a/system/settings/hardware/personal-computer.nix
+++ b/system/settings/hardware/personal-computer.nix
@@ -1,6 +1,9 @@
-{ 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 fb31e79f..474b37b7 100644
--- a/system/settings/hardware/printing.nix
+++ b/system/settings/hardware/printing.nix
@@ -1,13 +1,17 @@
-{ config, pkgs, lib, ... }:
-
-{ services.printing.enable = true;
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  services.printing.enable = true;
   systemd.services.cups.wantedBy = lib.mkForce [];
-  systemd.sockets.cups.wantedBy = [ "sockets.target" ];
+  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 bc5fca59..e8c06527 100644
--- a/system/settings/hardware/systemd-boot.nix
+++ b/system/settings/hardware/systemd-boot.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
-
-{ boot.loader.systemd-boot = {
+{
+  config,
+  pkgs,
+  ...
+}: {
+  boot.loader.systemd-boot = {
     enable = true;
     editor = false; # Don't allow modification
   };
diff --git a/system/settings/hardware/thinkpad.nix b/system/settings/hardware/thinkpad.nix
index 4f4e6b8c..99d91263 100644
--- a/system/settings/hardware/thinkpad.nix
+++ b/system/settings/hardware/thinkpad.nix
@@ -1,7 +1,10 @@
-{ config, pkgs, ... }:
-
-{ boot.kernelModules = [ ];
-  boot.blacklistedKernelModules = [ "thinkpad_ec" ];
+{
+  config,
+  pkgs,
+  ...
+}: {
+  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 9aa5abc0..7445c5bb 100644
--- a/system/settings/hardware/trackball.nix
+++ b/system/settings/hardware/trackball.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
-
-{ services.xserver.config = ''
+{
+  config,
+  pkgs,
+  ...
+}: {
+  services.xserver.config = ''
     Section "InputClass"
         Identifier "Trackball (No Acceleration)"
         MatchIsPointer "yes"
diff --git a/system/settings/hardware/trezor.nix b/system/settings/hardware/trezor.nix
index 60867e07..e24fc92e 100644
--- a/system/settings/hardware/trezor.nix
+++ b/system/settings/hardware/trezor.nix
@@ -1,10 +1,14 @@
-{ config, lib, pkgs, ... }:
-
-{ services.trezord.enable = true;
+{
+  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 = {
diff --git a/system/settings/kubernetes.nix b/system/settings/kubernetes.nix
index 68bcb627..8c171fc5 100644
--- a/system/settings/kubernetes.nix
+++ b/system/settings/kubernetes.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   networking.bridges = {
     cbr0.interfaces = [];
   };
diff --git a/system/settings/machines/t470s.nix b/system/settings/machines/t470s.nix
index 7790ce28..c1a82912 100644
--- a/system/settings/machines/t470s.nix
+++ b/system/settings/machines/t470s.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
-
-{ hardware.usbWwan.enable = false; # unused
+{
+  config,
+  pkgs,
+  ...
+}: {
+  hardware.usbWwan.enable = false; # unused
   systemd.services.ModemManager.enable = false;
 
   hardware.enableRedistributableFirmware = true;
diff --git a/system/settings/programs/barrier.nix b/system/settings/programs/barrier.nix
index 9a73620d..788021d5 100644
--- a/system/settings/programs/barrier.nix
+++ b/system/settings/programs/barrier.nix
@@ -1,7 +1,11 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
     barrier
   ];
 
-  networking.firewall.allowedTCPPorts = [ 24800 ];
+  networking.firewall.allowedTCPPorts = [24800];
 }
diff --git a/system/settings/programs/base.nix b/system/settings/programs/base.nix
index 1024aedd..f09beb75 100644
--- a/system/settings/programs/base.nix
+++ b/system/settings/programs/base.nix
@@ -1,6 +1,4 @@
-{ pkgs, ...}:
-
-{
+{pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     cachix
     home-manager
diff --git a/system/settings/programs/gnome.nix b/system/settings/programs/gnome.nix
index 13309a6e..3ccac864 100644
--- a/system/settings/programs/gnome.nix
+++ b/system/settings/programs/gnome.nix
@@ -1,7 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-{ services = {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
+  services = {
     gnome3 = {
       gnome-documents.enable = false;
       gnome-user-share.enable = false;
diff --git a/system/settings/programs/gnupg.nix b/system/settings/programs/gnupg.nix
index 663bcb3c..9899c23b 100644
--- a/system/settings/programs/gnupg.nix
+++ b/system/settings/programs/gnupg.nix
@@ -1,10 +1,13 @@
-{ config, pkgs, lib, ... }:
-
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
     gnupg
     pinentry
-    (python3.withPackages(ps: with ps; [ trezor_agent wheel ]))
+    (python3.withPackages (ps: with ps; [trezor_agent wheel]))
   ];
   environment.variables.GNUPGHOME = "$HOME/.gnupg/trezor/";
 }
diff --git a/system/settings/programs/i3.nix b/system/settings/programs/i3.nix
index ab1fcca4..4cf4a82a 100644
--- a/system/settings/programs/i3.nix
+++ b/system/settings/programs/i3.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
-
-{ services.xserver.windowManager = {
+{
+  config,
+  pkgs,
+  ...
+}: {
+  services.xserver.windowManager = {
     i3 = {
       enable = true;
       extraSessionCommands = ''
diff --git a/system/settings/programs/kde.nix b/system/settings/programs/kde.nix
index 2faad513..9d77eeb5 100644
--- a/system/settings/programs/kde.nix
+++ b/system/settings/programs/kde.nix
@@ -1,7 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-{ services = {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
+  services = {
     xserver = {
       desktopManager = {
         plasma5.enable = true;
diff --git a/system/settings/programs/shell.nix b/system/settings/programs/shell.nix
index bf8fc3aa..6f4b793a 100644
--- a/system/settings/programs/shell.nix
+++ b/system/settings/programs/shell.nix
@@ -1,11 +1,19 @@
-{ config, pkgs, ... }:
-
 {
-  programs.zsh = {
-    enable = true;
-    promptInit = "";
-  } // (if pkgs.stdenv.isDarwin then {} else {
-    enableGlobalCompInit = false;
-  });
+  config,
+  pkgs,
+  ...
+}: {
+  programs.zsh =
+    {
+      enable = true;
+      promptInit = "";
+    }
+    // (
+      if pkgs.stdenv.isDarwin
+      then {}
+      else {
+        enableGlobalCompInit = false;
+      }
+    );
   programs.bash.enableCompletion = true;
 }
diff --git a/system/settings/programs/tor.nix b/system/settings/programs/tor.nix
index 48106e08..80e2fdf2 100644
--- a/system/settings/programs/tor.nix
+++ b/system/settings/programs/tor.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, lib, ... }:
-
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   services.tor = {
     enable = true;
     client = {
@@ -17,7 +20,7 @@
   systemd.services.tor.wantedBy = lib.mkForce [];
   systemd.timers.tor = {
     description = "Delayed startup of Tor";
-    wantedBy = [ "timers.target" ];
+    wantedBy = ["timers.target"];
     timerConfig = {
       OnActiveSec = "1 min";
     };
diff --git a/system/settings/programs/window-manager.nix b/system/settings/programs/window-manager.nix
index b2d94929..bad60797 100644
--- a/system/settings/programs/window-manager.nix
+++ b/system/settings/programs/window-manager.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   services.xserver = {
     desktopManager.xterm.enable = false;
 
diff --git a/system/settings/satoshipay.nix b/system/settings/satoshipay.nix
index 9e185570..96c69711 100644
--- a/system/settings/satoshipay.nix
+++ b/system/settings/satoshipay.nix
@@ -1,6 +1,10 @@
-{ config, pkgs, fetchurl, lib, ... }:
-
-let
+{
+  config,
+  pkgs,
+  fetchurl,
+  lib,
+  ...
+}: let
   dockerConfig = {
     ipv6 = true;
     fixed-cidr-v6 = "fd69:2074:9fcd:b0fd::/64";
@@ -8,8 +12,7 @@ let
       buildkit = true;
     };
   };
-in
-{
+in {
   virtualisation = {
     docker = {
       enable = true;
diff --git a/system/settings/services/airplay-sink.nix b/system/settings/services/airplay-sink.nix
index 617adaa2..4621706e 100644
--- a/system/settings/services/airplay-sink.nix
+++ b/system/settings/services/airplay-sink.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   services.pipewire.systemWide = false;
   services.shairport-sync = {
     enable = true;
diff --git a/system/settings/services/samba.nix b/system/settings/services/samba.nix
index 63283e88..729a6756 100644
--- a/system/settings/services/samba.nix
+++ b/system/settings/services/samba.nix
@@ -1,16 +1,16 @@
-{ config, pkgs, ... }:
-
-let
-  workgroup = "WORKGROUP";
-
-in
 {
+  config,
+  pkgs,
+  ...
+}: let
+  workgroup = "WORKGROUP";
+in {
   services.samba-wsdd = {
     inherit workgroup;
     enable = true;
   };
-  networking.firewall.allowedTCPPorts = [ 5357 ];
-  networking.firewall.allowedUDPPorts = [ 3702 ];
+  networking.firewall.allowedTCPPorts = [5357];
+  networking.firewall.allowedUDPPorts = [3702];
 
   services.samba = {
     enable = true;
diff --git a/system/settings/services/syncthing.nix b/system/settings/services/syncthing.nix
index c3aa8086..b504bde3 100644
--- a/system/settings/services/syncthing.nix
+++ b/system/settings/services/syncthing.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
-
-{ services.syncthing = {
+{
+  config,
+  pkgs,
+  ...
+}: {
+  services.syncthing = {
     enable = true;
     user = "alan";
     group = "users";
diff --git a/system/settings/services/virtualisation.nix b/system/settings/services/virtualisation.nix
index 200ffa62..8056387c 100644
--- a/system/settings/services/virtualisation.nix
+++ b/system/settings/services/virtualisation.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   virtualisation.libvirtd = {
     enable = true;
     onBoot = "ignore";
diff --git a/system/settings/services/xserver.nix b/system/settings/services/xserver.nix
index c78693c1..7e2a7c49 100644
--- a/system/settings/services/xserver.nix
+++ b/system/settings/services/xserver.nix
@@ -1,7 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-{ services.xserver = {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
+  services.xserver = {
     enable = true;
     enableCtrlAltBackspace = true;
     exportConfiguration = true;
@@ -37,9 +41,9 @@ with lib;
       };
       useEmbeddedBitmaps = !config.fonts.fontconfig.antialias;
       defaultFonts = {
-        monospace = [ "IBM Plex Mono" ];
-        sansSerif = [ "Cantarell" ];
-        serif = [ "Times New Roman" ];
+        monospace = ["IBM Plex Mono"];
+        sansSerif = ["Cantarell"];
+        serif = ["Times New Roman"];
       };
 
       localConf = ''
@@ -57,28 +61,30 @@ with lib;
         </fontconfig>
       '';
     };
-    fonts = with pkgs; [
-      gohufont
-      dina-font
-      terminus_font
+    fonts = with pkgs;
+      [
+        gohufont
+        dina-font
+        terminus_font
 
-      corefonts
+        corefonts
 
-      emacs-all-the-icons-fonts
-      font-awesome_5
-      xorg.fontmiscmisc
-      xorg.fontcursormisc
-    ] ++ lib.optionals config.fonts.fontconfig.antialias [
-      cantarell-fonts
+        emacs-all-the-icons-fonts
+        font-awesome_5
+        xorg.fontmiscmisc
+        xorg.fontcursormisc
+      ]
+      ++ lib.optionals config.fonts.fontconfig.antialias [
+        cantarell-fonts
 
-      fira
-      fira-code
-      fira-mono
-      ibm-plex
+        fira
+        fira-code
+        fira-mono
+        ibm-plex
 
-      source-code-pro
-      source-sans-pro
-      source-serif-pro
-    ];
+        source-code-pro
+        source-sans-pro
+        source-serif-pro
+      ];
   };
 }
diff --git a/system/settings/services/zeroconf.nix b/system/settings/services/zeroconf.nix
index 98bde1da..6859cfd5 100644
--- a/system/settings/services/zeroconf.nix
+++ b/system/settings/services/zeroconf.nix
@@ -1,6 +1,10 @@
-{ config, pkgs, lib, ... }:
-
-{ services.avahi = {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  services.avahi = {
     enable = true;
     nssmdns = true;
     ipv6 = true;
@@ -15,7 +19,7 @@
   systemd.services.avahi-daemon.wantedBy = lib.mkForce [];
   systemd.timers.avahi-daemon = {
     description = "Delayed startup of Avahi";
-    wantedBy = [ "timers.target" ];
+    wantedBy = ["timers.target"];
     timerConfig = {
       OnActiveSec = "1 min";
     };
diff --git a/system/settings/user-interface.nix b/system/settings/user-interface.nix
index 078f71cb..7fec2f88 100644
--- a/system/settings/user-interface.nix
+++ b/system/settings/user-interface.nix
@@ -1,9 +1,14 @@
-{ config, pkgs, lib, makeDesktopItem, ... }:
-
-{ documentation.info.enable = true;
+{
+  config,
+  pkgs,
+  lib,
+  makeDesktopItem,
+  ...
+}: {
+  documentation.info.enable = true;
   nixpkgs.config.firefox.enableOfficialBranding = true;
 
-  environment.pathsToLink = [ "/share/zsh" ];
+  environment.pathsToLink = ["/share/zsh"];
 
   environment.systemPackages = with pkgs; [
     aria2
@@ -31,7 +36,7 @@
   services.devmon.enable = true;
 
   systemd.user.services.trash-clean = {
-    path = with pkgs; [ trash-cli ];
+    path = with pkgs; [trash-cli];
     description = "Remove old files from FreeDesktop.org trash";
 
     serviceConfig = {
@@ -40,7 +45,7 @@
     script = "trash-empty 30";
   };
   systemd.user.timers.trash-clean = {
-    wantedBy = [ "default.target" ];
+    wantedBy = ["default.target"];
     timerConfig = {
       OnCalendar = "weekly";
       Persistent = true;
-- 
cgit 1.4.1