felschr/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style: reformat all nix files

Browse source
This commit is contained in:
Felix Schröter 2025-09-15 20:46:37 +02:00
parent 0b5daa99ed
commit 2dcb901ae1
Signed by: felschr
GPG key ID: 671E39E6744C807D
8 changed files with 51 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

3
home/flake-module.nix
View file

@ -21,7 +21,8 @@ let
home.username = user;
home.homeDirectory = "/home/${user}";
}
] ++ modules;
]
++ modules;
};
in
{

3
home/modules/firefox/mkFirefoxModuleCompat.nix
View file

@ -29,7 +29,8 @@ let
configPath = [
"config"
"content" # due to mkIf
] ++ modulePath;
]
++ modulePath;
in
lib.updateManyAttrsByPath
[

3
home/modules/firefox/mkFirefoxProfileBinModule.nix
View file

@ -33,7 +33,8 @@ let
categories = [
"Network"
"WebBrowser"
] ++ lib.optional isSecure "Security";
]
++ lib.optional isSecure "Security";
};
in
pkgs.runCommand pname { } ''

3
lib/createUser.nix
View file

@ -35,7 +35,8 @@
count = 60000000;
}
];
} // user;
}
// user;
home-manager = {
useGlobalPkgs = true;

3
lib/openwrt.nix
View file

@ -30,7 +30,8 @@ in
"luci-ssl"
"nextdns"
"tailscale"
] ++ packages;
]
++ packages;
# TODO set up SSH config (register public keys, disable password login, ...)
files = pkgs.runCommand "image-files" { } ''

55
modules/systemdNotify.nix
View file

@ -85,34 +85,33 @@ in
}
];
systemd.services."notify@" =
{
onFailure = lib.mkForce [ ];
}
// optionalAttrs (cfg.method == "libnotify") {
description = "Desktop notifications for %i service failure";
environment = {
DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/user/${
toString config.users.users.${cfg.libnotify.user}.uid
}/bus";
INSTANCE = "%i";
};
script = ''
${pkgs.libnotify}/bin/notify-send --urgency=critical \
"Service '$INSTANCE' failed" \
"$(journalctl -n 6 -o cat -u $INSTANCE)"
'';
serviceConfig = {
Type = "oneshot";
User = cfg.libnotify.user;
};
}
// optionalAttrs (cfg.method == "email") {
description = "E-Mail notifications for %i service failure";
serviceConfig = {
ExecStart = "${sendmail} %i";
Type = "oneshot";
};
systemd.services."notify@" = {
onFailure = lib.mkForce [ ];
}
// optionalAttrs (cfg.method == "libnotify") {
description = "Desktop notifications for %i service failure";
environment = {
DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/user/${
toString config.users.users.${cfg.libnotify.user}.uid
}/bus";
INSTANCE = "%i";
};
script = ''
${pkgs.libnotify}/bin/notify-send --urgency=critical \
"Service '$INSTANCE' failed" \
"$(journalctl -n 6 -o cat -u $INSTANCE)"
'';
serviceConfig = {
Type = "oneshot";
User = cfg.libnotify.user;
};
}
// optionalAttrs (cfg.method == "email") {
description = "E-Mail notifications for %i service failure";
serviceConfig = {
ExecStart = "${sendmail} %i";
Type = "oneshot";
};
};
};
}

3
services/restic/lib.nix
View file

@ -53,7 +53,8 @@ in
# reduce download bandwidth
"--max-unused 10%"
"--repack-cacheable-only"
] ++ extraPruneOpts;
]
++ extraPruneOpts;
}
// (removeAttrs args [
"name"

25
system/vpn.nix
View file

@ -89,21 +89,20 @@ in
wants = [ "tailscaled.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig.Type = "oneshot";
script =
''
status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service)
if [[ $status != Connected* ]]; then
${cfg.package}/bin/tailscale up
fi
script = ''
status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service)
if [[ $status != Connected* ]]; then
${cfg.package}/bin/tailscale up
fi
# some options cannot be set immediately
${cfg.package}/bin/tailscale up ${lib.escapeShellArgs cfg.extraUpFlags}
# some options cannot be set immediately
${cfg.package}/bin/tailscale up ${lib.escapeShellArgs cfg.extraUpFlags}
${cfg.package}/bin/tailscale cert ${tailnetHost}
''
+ lib.optionalString config.services.nginx.enable ''
chown nginx:nginx /var/lib/tailscale/certs/${tailnetHost}.{key,crt}
'';
${cfg.package}/bin/tailscale cert ${tailnetHost}
''
+ lib.optionalString config.services.nginx.enable ''
chown nginx:nginx /var/lib/tailscale/certs/${tailnetHost}.{key,crt}
'';
};
services.nginx.virtualHosts.${tailnetHost} = {