Merge pull request 'switch from alejandra -> nixpkgs-fmt' (#12) from formatting into main

Reviewed-on: #12

flake-parts/formatting.nix

@@ -1,16 +1,15 @@
-{
+{ self
-  self,
+, inputs
-  inputs,
+, ...
-  ...
 }: {
   imports = [
     inputs.treefmt-nix.flakeModule
   ];
-  perSystem = {pkgs, ...}: {
+  perSystem = { pkgs, ... }: {
     treefmt.projectRootFile = "flake.nix";
     treefmt.flakeCheck = true;
     treefmt.flakeFormatter = true;
-    treefmt.programs.alejandra.enable = true;
+    treefmt.programs.nixpkgs-fmt.enable = true;
     treefmt.programs.shellcheck.enable = true;
   };
 }

flake-parts/packages.nix

@@ -1,4 +1,4 @@
-{self, ...}: {
+{ self, ... }: {
   flake.packages.x86_64-linux = {
     inherit
       (self.nixosConfigurations.installer.config.formats)

flake-parts/pre-commit.nix

@@ -1,4 +1,4 @@
-{self, ...}: {
+{ self, ... }: {
   pre-commit.settings.hooks.alejandra.enable = true;
   pre-commit.settings.hooks.shellcheck.enable = true;
 }

flake.nix

@@ -11,13 +11,12 @@
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs @ {flake-parts, ...}:
+  outputs = inputs @ { flake-parts, ... }:
-    flake-parts.lib.mkFlake {inherit inputs;} ({
+    flake-parts.lib.mkFlake { inherit inputs; } ({ lib
-      lib,
+                                                 , config
-      config,
+                                                 , self
-      self,
+                                                 , ...
-      ...
+                                                 }: {
-    }: {
       systems = lib.systems.flakeExposed;
       imports = [
         ./flake-parts/packages.nix

hidden-announce.nix

@@ -1,8 +1,7 @@
-{
+{ config
-  config,
+, lib
-  lib,
+, pkgs
-  pkgs,
+, ...
-  ...
 }: {
   options.hidden-announce = {
     enable = lib.mkEnableOption "hidden-announce";
@@ -32,9 +31,9 @@
     };
     systemd.services.hidden-ssh-announce = {
       description = "irc announce hidden ssh";
-      after = ["tor.service" "network-online.target"];
+      after = [ "tor.service" "network-online.target" ];
-      wants = ["tor.service"];
+      wants = [ "tor.service" ];
-      wantedBy = ["multi-user.target"];
+      wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         # ${pkgs.tor}/bin/torify
         ExecStart = pkgs.writers.writeDash "announce-hidden-service" ''

installer.nix

@@ -1,8 +1,7 @@
-{
+{ config
-  config,
+, lib
-  lib,
+, pkgs
-  pkgs,
+, ...
-  ...
 }: {
   systemd.tmpfiles.rules = [
     "d /var/shared 0777 root root - -"

pkgs/clan-cli/default.nix

@@ -4,7 +4,7 @@
 symlinkJoin {
   name = "clan";
   paths = [
-    (writers.writePython3Bin "clan" {} ./clan.py)
+    (writers.writePython3Bin "clan" { } ./clan.py)
     (writers.writePython3Bin "clan-admin" { flakeIgnore = [ "E501" ]; } ./clan-admin.py)
   ];
 }

pkgs/go-ssb/default.nix

@@ -1,7 +1,7 @@
-{
+{ lib
-  lib,
+, buildGoModule
-  buildGoModule,
+, fetchFromGitHub
-  fetchFromGitHub,
+,
 }:
 buildGoModule rec {
   pname = "go-ssb";
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-ZytuWFre7Cz6Qt01tLQoPEuNzDIyoC938OkdIrU8nZo=";
 
-  ldflags = ["-s" "-w"];
+  ldflags = [ "-s" "-w" ];
 
   # take very long
   doCheck = false;
@@ -26,6 +26,6 @@ buildGoModule rec {
     description = "Go implementation of ssb (work in progress)";
     homepage = "https://github.com/ssbc/go-ssb";
     license = licenses.mit;
-    maintainers = with maintainers; [];
+    maintainers = with maintainers; [ ];
   };
 }

templates/python-project/default.nix

@@ -1,11 +1,11 @@
-{
+{ pkgs ? import <nixpkgs> { }
-  pkgs ? import <nixpkgs> {},
+, lib ? pkgs.lib
-
+, python3 ? pkgs.python3
-  lib ? pkgs.lib,
+, ruff ? pkgs.ruff
-  python3 ? pkgs.python3,
+, runCommand ? pkgs.runCommand
-  ruff ? pkgs.ruff,
+,
-  runCommand ? pkgs.runCommand,
+}:
-}: let
+let
   pyproject = builtins.fromTOML (builtins.readFile ./pyproject.toml);
   name = pyproject.project.name;
 
@@ -37,14 +37,14 @@
     ];
     propagatedBuildInputs =
       dependencies
-      ++ [];
+      ++ [ ];
-    passthru.tests = {inherit check;};
+    passthru.tests = { inherit check; };
     passthru.devDependencies = devDependencies;
   };
 
   checkPython = python3.withPackages (ps: devDependencies ++ dependencies);
 
-  check = runCommand "${name}-check" {} ''
+  check = runCommand "${name}-check" { } ''
     cp -r ${src} ./src
     chmod +w -R ./src
     cd src
@@ -59,4 +59,4 @@
   '';
 
 in
-  package
+package

templates/python-project/flake-module.nix

@@ -1,10 +1,12 @@
 {
-  perSystem = {pkgs, ...}: let
+  perSystem = { pkgs, ... }:
-    pyproject = builtins.fromTOML (builtins.readFile ./pyproject.toml);
+    let
-    name = pyproject.project.name;
+      pyproject = builtins.fromTOML (builtins.readFile ./pyproject.toml);
-    package = pkgs.callPackage ./default.nix {};
+      name = pyproject.project.name;
-  in {
+      package = pkgs.callPackage ./default.nix { };
-    # packages.${name} = package;
+    in
-    checks.python-template = package.tests.check;
+    {
-  };
+      # packages.${name} = package;
+      checks.python-template = package.tests.check;
+    };
 }

templates/python-project/shell.nix

@@ -1,7 +1,8 @@
-{
+{ pkgs ? import <nixpkgs> { }
-  pkgs ? import <nixpkgs> {},
+, system ? builtins.currentSystem
-  system ? builtins.currentSystem,
+,
-}: let
+}:
+let
   lib = pkgs.lib;
   python3 = pkgs.python3;
   package = import ./default.nix {
@@ -9,11 +10,11 @@
   };
   pythonWithDeps = python3.withPackages (
     ps:
-      package.propagatedBuildInputs
+    package.propagatedBuildInputs
-      ++ package.devDependencies
+    ++ package.devDependencies
-      ++ [
+    ++ [
-        ps.pip
+      ps.pip
-      ]
+    ]
   );
   checkScript = pkgs.writeScriptBin "check" ''
     nix build -f . tests.check -L "$@"
@@ -43,4 +44,4 @@
     '';
   };
 in
-  devShell
+devShell