.: chore: fmt, clean-up warnings reported by nixd

modules/gaming.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+_: {
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;

nixos/amanojaku/default.nix

@@ -4,12 +4,8 @@
   networking.hostName = "amanojaku";
   deployment.tags = [ "reachable-home" ];
 
-  imports = with inputs.self.nixosModules; [
-    graphical
-    laptop
-
-    inputs.jovian-nixos.nixosModules.default
-  ];
+  imports = [ inputs.jovian-nixos.nixosModules.default ]
+    ++ (with inputs.self.nixosModules; [ graphical laptop ]);
 
   boot.uefi.enable = true;
   boot.kernelPackages = lib.mkForce pkgs.linuxPackages_jovian;

nixos/kamaitachi/default.nix

@@ -37,9 +37,9 @@ in {
   deployment.buildOnTarget = lib.mkForce false;
   deployment.tags = [ "reachable-home" ];
 
-  imports = with inputs.self.nixosModules; [
+  imports = [
     "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image.nix"
-    common
+    inputs.self.nixosModules.common
   ];
 
   # don't want to pull in all of installer stuff, so we need to copy some things from sd-image-aarch64.nix:

nixos/khas/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, inputs, ... }:
+{ config, inputs, ... }:
 
 {
   networking.hostName = "khas";

nixos/khas/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+_:
 
 {
   hardware.enableAllFirmware = true;

nixos/microlith/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, inputs, ... }:
+{ config, inputs, ... }:
 
 {
   networking.hostName = "microlith";

nixos/microlith/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+_:
 
 {
   hardware.enableAllFirmware = true;

nixos/scylla/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

nixos/tsukumogami/default.nix

@@ -13,9 +13,9 @@ in {
   deployment.buildOnTarget = lib.mkForce false;
   deployment.tags = [ "reachable-hs" ];
 
-  imports = with inputs.self.nixosModules; [
+  imports = [
     "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image.nix"
-    common
+    inputs.self.nixosModules.common
   ];
 
   # don't want to pull in all of installer stuff, so we need to copy some things from sd-image-aarch64.nix:
@@ -172,8 +172,18 @@ in {
 
   # diet
   boot.binfmt.emulatedSystems = lib.mkForce [ ];
-  environment.systemPackages = with pkgs;
-    lib.mkForce [
+  environment.systemPackages = [
+    # avoid warnings
+    (pkgs.glibcLocales.override {
+      allLocales = false;
+      locales = [ "en_US.UTF-8/UTF-8" "en_CA.UTF-8/UTF-8" "en_DK.UTF-8/UTF-8" ];
+    })
+
+    # strictly unnecessary
+    (pkgs.v4l-utils.override { withGUI = false; })
+  ] ++ (with pkgs;
+  # lib.mkForce
+    [
       # strictly required
       coreutils
       nix
@@ -183,26 +193,8 @@ in {
       zsh
       bashInteractive
 
-      # reaaaaally useful (on-screen keyboard)
-      maliit-keyboard
-      maliit-framework
-      squeekboard
-
-      # we include these anyway
-      wlr-randr
-      chromium
-
       # avoid warnings
       gnugrep
-      (glibcLocales.override {
-        allLocales = false;
-        locales = [
-          "en_US.UTF-8/UTF-8"
-          "en_CA.UTF-8/UTF-8"
-          "en_DK.UTF-8/UTF-8"
-          "pl_PL.UTF-8/UTF-8"
-        ];
-      })
 
       # nice-to-haves
       procps
@@ -213,13 +205,16 @@ in {
       usbutils
       neovim
       tmux
+      uhubctl
+      libraspberrypi
+      raspberrypi-eeprom
 
       # strictly unnecessary
       mpv
       alsa-utils
+      bluez
       pipewire
-      (v4l-utils.override { withGUI = false; })
-    ];
+    ]);
   programs.nix-index.enable = lib.mkForce false;
   services.journald.extraConfig = ''
     Storage=volatile

nixos/zorigami/hardware.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ pkgs, modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

pkgs/linux_rpi/linux-rpi.nix

@@ -1,5 +1,4 @@
-{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ...
-}@args:
+{ stdenv, lib, fetchFromGitHub, buildLinux, rpiVersion, ... }@args:
 
 let
   # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this

pkgs/minecraft-overviewer.nix

@@ -1,28 +1,27 @@
 { fetchFromGitHub, pkgs, buildPythonPackage, python3Packages, python3, ... }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "Minecraft-Overviewer";
   version = "2024-03-15";
   format = "other";
 
-  propagatedBuildInputs = with pkgs;
-    [ pipreqs ] ++ (with python3Packages; [
-      pillow_with_headers
-      altgraph
-      certifi
-      charset-normalizer
-      docopt
-      idna
-      importlib-metadata
-      nbtlib
-      numpy
-      packaging
-      pefile
-      requests
-      urllib3
-      yarg
-      zipp
-    ]);
+  propagatedBuildInputs = [ pkgs.pipreqs ] ++ (with python3Packages; [
+    pillow_with_headers
+    altgraph
+    certifi
+    charset-normalizer
+    docopt
+    idna
+    importlib-metadata
+    nbtlib
+    numpy
+    packaging
+    pefile
+    requests
+    urllib3
+    yarg
+    zipp
+  ]);
 
   buildInputs = with python3Packages; [ setuptools ];
 

pkgs/nix-top/default.nix

@@ -1,32 +1,21 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, ruby
-, makeWrapper
-, getent               # /etc/passwd
-, ncurses              # tput
-, binutils-unwrapped   # strings
-, coreutils
-, findutils
-}:
+{ stdenv, lib, ruby, makeWrapper, getent # /etc/passwd
+, ncurses # tput
+, binutils-unwrapped # strings
+, coreutils, findutils }:
 
 # No gems used, so mkDerivation is fine.
 let
-  additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ];
-in
-stdenv.mkDerivation rec {
+  additionalPath =
+    lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ];
+in stdenv.mkDerivation {
   pname = "nix-top";
   version = "0.3.0";
 
   src = ./.;
 
-  nativeBuildInputs = [
-    makeWrapper
-  ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = [
-    ruby
-  ];
+  buildInputs = [ ruby ];
 
   installPhase = ''
     mkdir -p $out/libexec/nix-top

pkgs/raspberrypi/default.nix

@@ -1,6 +1,6 @@
-{ lib, stdenvNoCC, fetchFromGitHub }:
+{ stdenvNoCC, fetchFromGitHub }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
   # NOTE: this should be updated with linux_rpi
   pname = "raspberrypi-firmware";
   # raspberrypi/firmware no longers tag the releases. However, since each commit
@@ -24,12 +24,9 @@ stdenvNoCC.mkDerivation rec {
   dontBuild = true;
   dontFixup = true;
 
-  meta = with lib; {
+  meta = {
     description = "Firmware for the Raspberry Pi board";
     homepage = "https://github.com/raspberrypi/firmware";
-    license =
-      licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
-    maintainers = with maintainers; [ dezgeg ];
     # Hash mismatch on source, mystery.
     # Maybe due to https://github.com/NixOS/nix/issues/847
     broken = stdenvNoCC.isDarwin;

pkgs/rpi5-arm-tf.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, runCommand, buildPackages, pkgsCross, openssl }:
+{ lib, stdenv, fetchFromGitHub, buildPackages, pkgsCross }:
 
 stdenv.mkDerivation rec {
   name = "arm-trusted-firmware-rpi5";

pkgs/rpi5-edk2-tools.nix

@@ -1,5 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, openssl, buildPackages, runCommand, clangStdenv
-, fetchpatch, libuuid, python3 }:
+{ lib, stdenv, fetchFromGitHub, buildPackages, runCommand, libuuid }:
 
 let
   srcWithVendoring = fetchFromGitHub {

pkgs/rpi5-uefi-bin.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip }:
+{ stdenv, fetchzip }:
 
 let version = "v0.3";
 in stdenv.mkDerivation {
@@ -21,5 +21,5 @@ in stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; { description = "EDK2 port for raspberry pi 5"; };
+  meta = { description = "EDK2 port for raspberry pi 5"; };
 }

pkgs/rpi5-uefi.nix

@@ -1,5 +1,5 @@
-{ lib, stdenv, openssl, pkgsCross, buildPackages, runCommand, rpi5-arm-tf
-, rpi5-edk2-tools, libuuid, python3, bc, util-linux, nasm, acpica-tools }:
+{ stdenv, buildPackages, rpi5-arm-tf, rpi5-edk2-tools, bc, util-linux, nasm
+, acpica-tools }:
 
 let pythonEnv = buildPackages.python3.withPackages (ps: [ ps.tkinter ]);
 in stdenv.mkDerivation rec {