forked from clan/clan-core
Merge pull request 'format all files' (#4) from format-all into main
Reviewed-on: clan/clan-baseos#4
This commit is contained in:
commit
4af5df0da2
@ -1,11 +1,12 @@
|
|||||||
{self, inputs, ...}: {
|
{
|
||||||
|
self,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.treefmt-nix.flakeModule
|
inputs.treefmt-nix.flakeModule
|
||||||
];
|
];
|
||||||
perSystem = {
|
perSystem = {pkgs, ...}: {
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
treefmt.projectRootFile = "flake.nix";
|
treefmt.projectRootFile = "flake.nix";
|
||||||
treefmt.flakeCheck = true;
|
treefmt.flakeCheck = true;
|
||||||
treefmt.flakeFormatter = true;
|
treefmt.flakeFormatter = true;
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ self, ... }: {
|
{self, ...}: {
|
||||||
flake.packages.x86_64-linux = {
|
flake.packages.x86_64-linux = {
|
||||||
inherit (self.nixosConfigurations.installer.config.formats)
|
inherit
|
||||||
|
(self.nixosConfigurations.installer.config.formats)
|
||||||
install-iso
|
install-iso
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ self, ... }: {
|
{self, ...}: {
|
||||||
pre-commit.settings.hooks.alejandra.enable = true;
|
pre-commit.settings.hooks.alejandra.enable = true;
|
||||||
pre-commit.settings.hooks.shellcheck.enable = true;
|
pre-commit.settings.hooks.shellcheck.enable = true;
|
||||||
}
|
}
|
||||||
|
@ -11,8 +11,13 @@
|
|||||||
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
|
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;
|
systems = lib.systems.flakeExposed;
|
||||||
imports = [
|
imports = [
|
||||||
./flake-parts/packages.nix
|
./flake-parts/packages.nix
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
options.hidden-announce = {
|
options.hidden-announce = {
|
||||||
enable = lib.mkEnableOption "hidden-announce";
|
enable = lib.mkEnableOption "hidden-announce";
|
||||||
script = lib.mkOption {
|
script = lib.mkOption {
|
||||||
@ -17,18 +21,20 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
relay.onionServices.hidden-ssh = {
|
relay.onionServices.hidden-ssh = {
|
||||||
version = 3;
|
version = 3;
|
||||||
map = [{
|
map = [
|
||||||
port = 22;
|
{
|
||||||
target.port = 22;
|
port = 22;
|
||||||
}];
|
target.port = 22;
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
client.enable = true;
|
client.enable = true;
|
||||||
};
|
};
|
||||||
systemd.services.hidden-ssh-announce = {
|
systemd.services.hidden-ssh-announce = {
|
||||||
description = "irc announce hidden ssh";
|
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 = {
|
serviceConfig = {
|
||||||
# ${pkgs.tor}/bin/torify
|
# ${pkgs.tor}/bin/torify
|
||||||
ExecStart = pkgs.writers.writeDash "announce-hidden-service" ''
|
ExecStart = pkgs.writers.writeDash "announce-hidden-service" ''
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d /var/shared 0777 root root - -"
|
"d /var/shared 0777 root root - -"
|
||||||
];
|
];
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
{ lib
|
{
|
||||||
, buildGoModule
|
lib,
|
||||||
, fetchFromGitHub
|
buildGoModule,
|
||||||
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "go-ssb";
|
pname = "go-ssb";
|
||||||
version = "0.2.1";
|
version = "0.2.1";
|
||||||
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||||||
|
|
||||||
vendorHash = "sha256-ZytuWFre7Cz6Qt01tLQoPEuNzDIyoC938OkdIrU8nZo=";
|
vendorHash = "sha256-ZytuWFre7Cz6Qt01tLQoPEuNzDIyoC938OkdIrU8nZo=";
|
||||||
|
|
||||||
ldflags = [ "-s" "-w" ];
|
ldflags = ["-s" "-w"];
|
||||||
|
|
||||||
# take very long
|
# take very long
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
@ -26,6 +26,6 @@ buildGoModule rec {
|
|||||||
description = "Go implementation of ssb (work in progress)";
|
description = "Go implementation of ssb (work in progress)";
|
||||||
homepage = "https://github.com/ssbc/go-ssb";
|
homepage = "https://github.com/ssbc/go-ssb";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user