diff --git a/flake-parts/formatting.nix b/flake-parts/formatting.nix index 63e6ff91..db4a2bc5 100644 --- a/flake-parts/formatting.nix +++ b/flake-parts/formatting.nix @@ -1,11 +1,12 @@ -{self, inputs, ...}: { +{ + self, + inputs, + ... +}: { imports = [ inputs.treefmt-nix.flakeModule ]; - perSystem = { - pkgs, - ... - }: { + perSystem = {pkgs, ...}: { treefmt.projectRootFile = "flake.nix"; treefmt.flakeCheck = true; treefmt.flakeFormatter = true; diff --git a/flake-parts/packages.nix b/flake-parts/packages.nix index f6ced25b..50f81e49 100644 --- a/flake-parts/packages.nix +++ b/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 ; }; diff --git a/flake-parts/pre-commit.nix b/flake-parts/pre-commit.nix index d44afc88..5bd8756e 100644 --- a/flake-parts/pre-commit.nix +++ b/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; } diff --git a/flake.nix b/flake.nix index 6d8286f5..606548ad 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,13 @@ treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } ({ lib, config, self, ... }: { + outputs = inputs @ {flake-parts, ...}: + flake-parts.lib.mkFlake {inherit inputs;} ({ + lib, + config, + self, + ... + }: { systems = lib.systems.flakeExposed; imports = [ ./flake-parts/packages.nix diff --git a/hidden-announce.nix b/hidden-announce.nix index de33976c..a73086a4 100644 --- a/hidden-announce.nix +++ b/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 = [{ - port = 22; - target.port = 22; - }]; + map = [ + { + port = 22; + target.port = 22; + } + ]; }; client.enable = true; }; systemd.services.hidden-ssh-announce = { description = "irc announce hidden ssh"; - after = [ "tor.service" "network-online.target" ]; - wants = [ "tor.service" ]; - wantedBy = [ "multi-user.target" ]; + after = ["tor.service" "network-online.target"]; + wants = ["tor.service"]; + wantedBy = ["multi-user.target"]; serviceConfig = { # ${pkgs.tor}/bin/torify ExecStart = pkgs.writers.writeDash "announce-hidden-service" '' diff --git a/installer.nix b/installer.nix index b3cd803d..8a0924fb 100644 --- a/installer.nix +++ b/installer.nix @@ -1,5 +1,9 @@ -{ config, lib, pkgs, ... }: { + config, + lib, + pkgs, + ... +}: { systemd.tmpfiles.rules = [ "d /var/shared 0777 root root - -" ]; diff --git a/pkgs/go-ssb/default.nix b/pkgs/go-ssb/default.nix index c2e00c91..171c259e 100644 --- a/pkgs/go-ssb/default.nix +++ b/pkgs/go-ssb/default.nix @@ -1,8 +1,8 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + 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; []; }; }