Merge pull request 'format all files' (#4) from format-all into main

Reviewed-on: https://git.clan.lol/clan/clan-baseos/pulls/4

flake-parts/formatting.nix

@@ -1,11 +1,12 @@
-{self, inputs, ...}: {
+{
+  self,
+  inputs,
+  ...
+}: {
   imports = [
     inputs.treefmt-nix.flakeModule
   ];
-  perSystem = {
+  perSystem = {pkgs, ...}: {
-    pkgs,
-    ...
-  }: {
     treefmt.projectRootFile = "flake.nix";
     treefmt.flakeCheck = true;
     treefmt.flakeFormatter = true;

flake-parts/packages.nix

@@ -1,6 +1,7 @@
-{ self, ... }: {
+{self, ...}: {
   flake.packages.x86_64-linux = {
-    inherit (self.nixosConfigurations.installer.config.formats)
+    inherit
+      (self.nixosConfigurations.installer.config.formats)
       install-iso
       ;
   };

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,8 +11,13 @@
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs@{ flake-parts, ... }:
+  outputs = inputs @ {flake-parts, ...}:
-    flake-parts.lib.mkFlake { inherit inputs; } ({ lib, config, self, ... }: {
+    flake-parts.lib.mkFlake {inherit inputs;} ({
+      lib,
+      config,
+      self,
+      ...
+    }: {
       systems = lib.systems.flakeExposed;
       imports = [
         ./flake-parts/packages.nix

hidden-announce.nix

@@ -1,5 +1,9 @@
-{ config, lib, pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   options.hidden-announce = {
     enable = lib.mkEnableOption "hidden-announce";
     script = lib.mkOption {
@@ -17,18 +21,20 @@
       enable = true;
       relay.onionServices.hidden-ssh = {
         version = 3;
-        map = [{
+        map = [
-          port = 22;
+          {
-          target.port = 22;
+            port = 22;
-        }];
+            target.port = 22;
+          }
+        ];
       };
       client.enable = true;
     };
     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,5 +1,9 @@
-{ config, lib, pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   systemd.tmpfiles.rules = [
     "d /var/shared 0777 root root - -"
   ];

pkgs/go-ssb/default.nix

@@ -1,8 +1,8 @@
-{ lib
+{
-, buildGoModule
+  lib,
-, fetchFromGitHub
+  buildGoModule,
+  fetchFromGitHub,
 }:
-
 buildGoModule rec {
   pname = "go-ssb";
   version = "0.2.1";
@@ -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; [];
   };
 }