Use nixpkgs-fmt

Makefile

@@ -24,4 +24,4 @@ update:
 	@./nix-flake-update.sh
 
 fmt:
-	alejandra .
+	nixpkgs-fmt .

darwin.nix

@@ -1,11 +1,12 @@
-{
+{ config
-  config,
+, lib
-  lib,
+, pkgs
-  pkgs,
+, ...
-  ...
+}:
-}: let
+let
   checkBrew = "command -v brew > /dev/null";
-in {
+in
+{
   users.users."dave.gallant".home = "/Users/dave.gallant";
   environment = {
     extraInit = ''

default.nix

@@ -2,12 +2,13 @@ let
   nix-pre-commit-hooks =
     import (builtins.fetchTarball
       "https://github.com/cachix/pre-commit-hooks.nix/tarball/master");
-in {
+in
+{
   pre-commit-check = nix-pre-commit-hooks.run {
     src = ./.;
     hooks = {
       shellcheck.enable = true;
-      alejandra.enable = true;
+      nixpkgs-fmt.enable = true;
     };
   };
 }

home/default.nix

@@ -1,11 +1,12 @@
-{
+{ lib
-  lib,
+, pkgs
-  pkgs,
+, unstable
-  unstable,
+, ...
-  ...
+}:
-}: let
+let
   inherit (pkgs) stdenv;
-in {
+in
+{
   home.stateVersion = "23.11";
 
   services = {

machines/hephaestus/configuration.nix

@@ -1,9 +1,9 @@
-{
+{ config
-  config,
+, pkgs
-  pkgs,
+, unstable
-  unstable,
+, ...
-  ...
+}:
-}: let
+let
   gnomeExtensions = with pkgs.gnomeExtensions; [
     appindicator
     bluetooth-quick-connect
@@ -17,7 +17,8 @@
     tailscale-status
     tray-icons-reloaded
   ];
-in {
+in
+{
   imports = [ ./hardware.nix ];
 
   hardware.opengl.enable = true;

machines/hephaestus/hardware.nix

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

outputs.nix

@@ -1,14 +1,14 @@
-{
+{ self
-  self,
+, darwin
-  darwin,
+, home-manager
-  home-manager,
+, nixpkgs
-  nixpkgs,
+, nixpkgs-unstable
-  nixpkgs-unstable,
+, nixos-hardware
-  nixos-hardware,
+, nix-ld
-  nix-ld,
+, ...
-  ...
 } @ inputs: {
-  nixosConfigurations = let
+  nixosConfigurations =
+    let
       modulesDir = ./modules;
       unstable = import nixpkgs-unstable {
         system = "x86_64-linux";
@@ -23,11 +23,10 @@
         ./packages.nix
         ./upgrade-diff.nix
 
-      ({
+        ({ config
-        config,
+         , lib
-        lib,
+         , lib'
-        lib',
+         , ...
-        ...
          }: {
           config = {
             _module.args = {
@@ -70,7 +69,8 @@
           };
         })
       ];
-  in {
+    in
+    {
       hephaestus = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit unstable; };
         modules =
@@ -83,13 +83,15 @@
       };
     };
 
-  darwinConfigurations = let
+  darwinConfigurations =
+    let
       system = "aarch64-darwin";
       unstable = import nixpkgs-unstable {
         config.allowUnfree = true;
         inherit system;
       };
-  in {
+    in
+    {
       zelus = darwin.lib.darwinSystem {
         inherit system;
         specialArgs = { inherit unstable; };

overlays/tmux-sessionizer/default.nix

@@ -1,7 +1,7 @@
-{
+{ stdenv
-  stdenv,
+, lib
-  lib,
+, fetchurl
-  fetchurl,
+,
 }:
 stdenv.mkDerivation rec {
   pname = "tmux-sessionizer";

overlays/vpngate/default.nix

@@ -1,7 +1,7 @@
-{
+{ lib
-  lib,
+, fetchFromGitHub
-  fetchFromGitHub,
+, buildGoModule
-  buildGoModule,
+,
 }:
 buildGoModule rec {
   pname = "vpngate";

packages.nix

@@ -1,12 +1,13 @@
-{
+{ config
-  config,
+, lib
-  lib,
+, pkgs
-  pkgs,
+, unstable
-  unstable,
+, ...
-  ...
+}:
-}: let
+let
   inherit (pkgs) stdenv;
-in {
+in
+{
   environment.systemPackages = with pkgs; [
     # essentials
     curl

services/netdata/default.nix

@@ -1,12 +1,13 @@
-{
+{ config
-  config,
+, pkgs
-  pkgs,
+, ...
-  ...
+}:
-}: let
+let
   netdata = pkgs.netdata;
   netdataConf = ./netdata.conf;
   netdataDir = "/var/lib/netdata";
-in {
+in
+{
   users.extraGroups.netdata.gid = 220008;
   users.users.netdata.group = "netdata";
   users.extraUsers.netdata = {