motiejus/config
1
Fork 0
Code Packages Releases Activity

nix fmt

Browse Source
This commit is contained in:
Motiejus Jakštys
2025-07-28 05:17:49 +00:00
parent 66568d814c
commit b30ef5392e
5 changed files with 215 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hosts/fwminex/configuration.nix
View File

@@ -424,8 +424,7 @@ in
evaluation_interval = "1m"; evaluation_interval = "1m";
}; };
scrapeConfigs = scrapeConfigs = [
[
( (
let let
port = toString config.services.prometheus.exporters.ping.port; port = toString config.services.prometheus.exporters.ping.port;
@@ -466,7 +465,8 @@ in
static_configs = [ { targets = [ "vno1-vinc.jakst.vpn:9100" ]; } ]; static_configs = [ { targets = [ "vno1-vinc.jakst.vpn:9100" ]; } ];
} }
] ]
++ map ++
map
( (
let let
port = builtins.toString myData.ports.exporters.node; port = builtins.toString myData.ports.exporters.node;
@@ -601,8 +601,7 @@ in
enable = true; enable = true;
passwordPath = config.age.secrets.borgbackup-password.path; passwordPath = config.age.secrets.borgbackup-password.path;
sshKeyPath = "/etc/ssh/ssh_host_ed25519_key"; sshKeyPath = "/etc/ssh/ssh_host_ed25519_key";
dirs = dirs = [
[
{ {
subvolume = "/var/lib"; subvolume = "/var/lib";
repo = "${vno3-nk}:${this}-var_lib_lesser"; repo = "${vno3-nk}:${this}-var_lib_lesser";

3
modules/base/unitstatus/default.nix
View File

@@ -17,8 +17,7 @@
}; };
config = lib.mkIf config.mj.base.unitstatus.enable { config = lib.mkIf config.mj.base.unitstatus.enable {
systemd.services = systemd.services = {
{
"unit-status-mail@" = "unit-status-mail@" =
let let
# https://northernlightlabs.se/2014-07-05/systemd-status-mail-on-unit-failure.html # https://northernlightlabs.se/2014-07-05/systemd-status-mail-on-unit-failure.html

6
modules/base/users/default.nix
View File

@@ -53,7 +53,8 @@ in
"dialout" "dialout"
"video" "video"
"audio" "audio"
] ++ cfg.user.extraGroups; ]
++ cfg.user.extraGroups;
uid = myData.uidgid.motiejus; uid = myData.uidgid.motiejus;
openssh.authorizedKeys.keys = openssh.authorizedKeys.keys =
let let
@@ -69,7 +70,8 @@ in
(''from="127.0.0.1,::1" '' + myData.hosts.${fqdn}.publicKey) (''from="127.0.0.1,::1" '' + myData.hosts.${fqdn}.publicKey)
]) ])
]; ];
} // lib.filterAttrs (n: v: n != "extraGroups" && v != null) cfg.user or { }; }
// lib.filterAttrs (n: v: n != "extraGroups" && v != null) cfg.user or { };
root = lib.filterAttrs (_: v: v != null) cfg.root; root = lib.filterAttrs (_: v: v != null) cfg.root;
}; };

3
modules/services/btrfsborg/default.nix
View File

@@ -92,7 +92,8 @@ in
h = config.networking; h = config.networking;
in in
"${h.hostName}.${h.domain}@${h.hostId}"; "${h.hostName}.${h.domain}@${h.hostId}";
} // lib.optionalAttrs (cfg.sshKeyPath != null) { BORG_RSH = ''ssh -i "${cfg.sshKeyPath}"''; }; }
// lib.optionalAttrs (cfg.sshKeyPath != null) { BORG_RSH = ''ssh -i "${cfg.sshKeyPath}"''; };
} }
// lib.optionalAttrs (attrs ? patterns) { inherit (attrs) patterns; } // lib.optionalAttrs (attrs ? patterns) { inherit (attrs) patterns; }
// lib.optionalAttrs (attrs ? prune) { inherit (attrs) prune; } // lib.optionalAttrs (attrs ? prune) { inherit (attrs) prune; }

3
modules/services/nsd-acme/default.nix
View File

@@ -102,8 +102,7 @@ in
systemd = { systemd = {
tmpfiles.rules = [ "d /var/lib/nsd/acmezones 0755 nsd nsd -" ]; tmpfiles.rules = [ "d /var/lib/nsd/acmezones 0755 nsd nsd -" ];
services = services = {
{
nsd-control-setup = { nsd-control-setup = {
requiredBy = [ "nsd.service" ]; requiredBy = [ "nsd.service" ];
before = [ "nsd.service" ]; before = [ "nsd.service" ];