project-wide: nixdirfmt

This commit is contained in:
kat witch 2021-05-05 15:05:48 +01:00
parent e0764a44a4
commit 1ff53944f1
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
10 changed files with 35 additions and 49 deletions

View file

@ -28,7 +28,7 @@ in {
"0cc3c26366cbfddfb1534b25c5655733d8f429edc941bcce674c46566fc87027";
grimoire =
"2a1567a2848540070328c9e938c58d40f2b1a3f08982c15c7edc5dcabfde3330";
boline =
boline =
"89684441745467da0d1bf7f47dc74ec3ca65e05c72f752298ef3c22a22024d43";
} // (mapAttrs (_: c: c.pubkey) hexYgg);
};

View file

@ -1,8 +1,14 @@
{ config, lib, pkgs, ... }:
{
katnet.public.udp.ranges = [ { from=60000; to=61000; }];
katnet.private.udp.ranges = [ { from=60000; to=61000; }];
katnet.public.udp.ranges = [{
from = 60000;
to = 61000;
}];
katnet.private.udp.ranges = [{
from = 60000;
to = 61000;
}];
services.openssh = {
enable = true;

View file

@ -4,10 +4,8 @@
home-manager.users.kat = { imports = [ ./home.nix ]; };
deploy.profile.kat = true;
users.groups = {
uinput = {};
};
users.groups = { uinput = { }; };
users.users.kat = {
uid = 1000;

View file

@ -1,5 +1,8 @@
{ config, ... }:
{
services.konawall = { enable = true; interval = "20m"; };
services.konawall = {
enable = true;
interval = "20m";
};
}

View file

@ -17,9 +17,7 @@ in {
home.packages = with pkgs; [ grim slurp wl-clipboard jq ];
services.i3gopher = {
enable = true;
};
services.i3gopher = { enable = true; };
programs.zsh.profileExtra = ''
# If running from tty1 start sway

View file

@ -4,7 +4,7 @@
services.fail2ban = {
enable = true;
packageFirewall = pkgs.nftables;
banaction="nftables-multiport";
banaction = "nftables-multiport";
banaction-allports = "nftables-allports";
jails = {
default = ''

View file

@ -3,22 +3,16 @@
{
katnet.private.tcp.ports = [ 19999 ];
services.netdata = {
enable = true;
};
services.netdata = { enable = true; };
services.nginx = {#
services.nginx = {
enable = true;
virtualHosts = {
"${config.networking.hostName}.net.kittywit.ch" = {
useACMEHost = "${config.networking.hostName}.net.kittywit.ch";
forceSSL = true;
locations = {
"/netdata" = {
proxyPass = "http://[::1]:19999/";
};
"${config.networking.hostName}.net.kittywit.ch" = {
useACMEHost = "${config.networking.hostName}.net.kittywit.ch";
forceSSL = true;
locations = { "/netdata" = { proxyPass = "http://[::1]:19999/"; }; };
};
};
};
};
}

View file

@ -8,37 +8,24 @@ let
(filterAttrs
(_: host: host.config.services.prometheus.exporters.node.enable)
hosts));
nd_configs =
(mapAttrs (hostName: host: host.config.services.netdata)
(filterAttrs
(_: host: host.config.services.netdata.enable)
hosts));
nd_configs = (mapAttrs (hostName: host: host.config.services.netdata)
(filterAttrs (_: host: host.config.services.netdata.enable) hosts));
in {
services.prometheus = {
enable = true;
scrapeConfigs = [
{
job_name = "boline";
static_configs = [{ targets = [ "boline.net.kittywit.ch:8002" ];}];
}
] ++ mapAttrsToList (hostName: prom: {
scrapeConfigs = [{
job_name = "boline";
static_configs = [{ targets = [ "boline.net.kittywit.ch:8002" ]; }];
}] ++ mapAttrsToList (hostName: prom: {
job_name = "${hostName}-nd";
metrics_path = "/api/v1/allmetrics";
honor_labels = true;
params = {
format = [ "prometheus" ];
};
static_configs = [{
targets = [
"${hostName}.net.kittywit.ch:19999"
];
}];
params = { format = [ "prometheus" ]; };
static_configs = [{ targets = [ "${hostName}.net.kittywit.ch:19999" ]; }];
}) nd_configs ++ mapAttrsToList (hostName: prom: {
job_name = hostName;
static_configs = [{
targets = [
"${hostName}.net.kittywit.ch:${toString prom.port}"
];
targets = [ "${hostName}.net.kittywit.ch:${toString prom.port}" ];
}];
}) prom_configs;
};

View file

@ -20,6 +20,6 @@
dns.records.kittywitch_net_boline = {
tld = "kittywit.ch.";
domain = "boline.net";
aaaa.address = config.variables.pi_ygg.ref;
};
aaaa.address = config.variables.pi_ygg.ref;
};
}

View file

@ -8,5 +8,5 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ8Z6briIboxIdedPGObEWB6QEQkvxKvnMW/UVU9t/ac mew-pgp"
];
shell = pkgs.zsh;
};
};
}