style(treewide): Switch to nixfmt
This commit is contained in:
parent
4b0e6f0a8c
commit
82c1d22d3d
8 changed files with 154 additions and 126 deletions
|
|
@ -1,9 +1,8 @@
|
|||
{ pkgs, self }:
|
||||
let
|
||||
callPackage = pkgs.lib.callPackageWith (pkgs // { inherit self; });
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
self,
|
||||
}: let
|
||||
callPackage = pkgs.lib.callPackageWith (pkgs // {inherit self;});
|
||||
in {
|
||||
lintNix = callPackage ./lint-nix.nix {};
|
||||
openHomepage = callPackage ./open-homepage.nix {};
|
||||
lintNix = callPackage ./lint-nix.nix { };
|
||||
openHomepage = callPackage ./open-homepage.nix { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,26 +2,31 @@
|
|||
self,
|
||||
lib,
|
||||
stdenv,
|
||||
alejandra,
|
||||
nixfmt-rfc-style,
|
||||
deadnix,
|
||||
statix,
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib) sourceFilesBySuffices;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
dontPatch = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontInstall = true;
|
||||
doCheck = true;
|
||||
stdenv.mkDerivation {
|
||||
dontPatch = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontInstall = true;
|
||||
doCheck = true;
|
||||
|
||||
name = "lint-nix";
|
||||
src = sourceFilesBySuffices self [".nix"];
|
||||
checkInputs = [alejandra deadnix statix];
|
||||
checkPhase = ''
|
||||
mkdir -p $out
|
||||
alejandra --check . | tee $out/alejandra.log
|
||||
deadnix --fail | tee $out/deadnix.log
|
||||
statix check | tee $out/statix.log
|
||||
'';
|
||||
}
|
||||
name = "lint-nix";
|
||||
src = sourceFilesBySuffices self [ ".nix" ];
|
||||
checkInputs = [
|
||||
nixfmt-rfc-style
|
||||
deadnix
|
||||
statix
|
||||
];
|
||||
checkPhase = ''
|
||||
mkdir -p $out
|
||||
nixfmt --strict --check . | tee $out/nixfmt.log
|
||||
deadnix --fail | tee $out/deadnix.log
|
||||
statix check | tee $out/statix.log
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,16 @@
|
|||
{
|
||||
self,
|
||||
nixosTest,
|
||||
}:
|
||||
{ self, nixosTest }:
|
||||
nixosTest {
|
||||
name = "open-homepage";
|
||||
|
||||
nodes = {
|
||||
# Host with just the default configuration
|
||||
defaults = {
|
||||
imports = [self.nixosModules.default];
|
||||
imports = [ self.nixosModules.default ];
|
||||
services.tlaternet-webserver.enable = true;
|
||||
};
|
||||
|
||||
host = {
|
||||
imports = [self.nixosModules.default];
|
||||
imports = [ self.nixosModules.default ];
|
||||
|
||||
services.tlaternet-webserver = {
|
||||
enable = true;
|
||||
|
|
@ -23,10 +20,10 @@ nixosTest {
|
|||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [8080];
|
||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
||||
};
|
||||
|
||||
client = {};
|
||||
client = { };
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
|
|||
|
|
@ -1,18 +1,14 @@
|
|||
{
|
||||
self,
|
||||
system,
|
||||
}: {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
{ self, system }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
inherit (lib) mkEnableOption mkIf mkOption;
|
||||
inherit (lib.types) str int;
|
||||
inherit (lib.strings) escapeShellArgs;
|
||||
inherit (self.packages.${system}) server templates;
|
||||
|
||||
cfg = config.services.tlaternet-webserver;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.tlaternet-webserver = {
|
||||
enable = mkEnableOption "tlaternet web server";
|
||||
|
|
@ -35,8 +31,8 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
systemd.services.tlaternet-webserver = {
|
||||
description = "tlaternet webserver";
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = ["network.target"];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
script = escapeShellArgs [
|
||||
"${server}/bin/tlaternet-webserver"
|
||||
|
|
@ -60,14 +56,21 @@ in {
|
|||
ProtectKernelModules = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
RestrictAddressFamilies = ["AF_UNIX" "AF_INET" "AF_INET6"];
|
||||
RestrictAddressFamilies = [
|
||||
"AF_UNIX"
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = ["@system-service" "~@privileged @resources @setuid @keyring"];
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged @resources @setuid @keyring"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,20 +6,25 @@
|
|||
git,
|
||||
nix,
|
||||
yq-go,
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
selfPackages = self.packages.${system};
|
||||
inherit (selfPackages.server.config.deps) cargo;
|
||||
inherit (selfPackages.templates.config.deps) npm;
|
||||
|
||||
npm-check-updates =
|
||||
(builtins.elemAt (lib.attrValues
|
||||
selfPackages.templates.config.nodejs-granular-v3.deps.npm-check-updates)
|
||||
0)
|
||||
.package-func
|
||||
.result;
|
||||
(builtins.elemAt (lib.attrValues selfPackages.templates.config.nodejs-granular-v3.deps.npm-check-updates) 0)
|
||||
.package-func.result;
|
||||
in
|
||||
writeShellApplication {
|
||||
name = "update";
|
||||
runtimeInputs = [cargo git nix npm npm-check-updates yq-go];
|
||||
text = builtins.readFile ./scripts/update.sh;
|
||||
}
|
||||
writeShellApplication {
|
||||
name = "update";
|
||||
runtimeInputs = [
|
||||
cargo
|
||||
git
|
||||
nix
|
||||
npm
|
||||
npm-check-updates
|
||||
yq-go
|
||||
];
|
||||
text = builtins.readFile ./scripts/update.sh;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue