chore: formatting

This commit is contained in:
Malte Tammena 2023-09-10 21:33:56 +02:00
parent 99e71beded
commit 190eba591b
4 changed files with 43 additions and 42 deletions

View file

@ -1,8 +1,4 @@
{ {modulesPath, ...}: {
modulesPath,
...
}:
{
imports = [(modulesPath + "/installer/scan/not-detected.nix")]; imports = [(modulesPath + "/installer/scan/not-detected.nix")];
# === Boot options === # === Boot options ===

View file

@ -1,7 +1,4 @@
{ {pkgs, ...}: {
pkgs,
...
}: {
imports = [ imports = [
../hardware/intel-nuc.nix ../hardware/intel-nuc.nix
]; ];

View file

@ -53,7 +53,13 @@ in {
(builtins.readFile ../secrets/ca.crt) (builtins.readFile ../secrets/ca.crt)
]; ];
system.nixos.label = let rev = if builtins.hasAttr "dirtyShortRev" inputs.self then inputs.self.dirtyShortRev else inputs.self.shortRev; in (builtins.concatStringsSep "-" (builtins.sort (x: y: x < y) config.system.nixos.tags)) + config.system.nixos.version + "-SHA:${rev}"; system.nixos.label = let
rev =
if builtins.hasAttr "dirtyShortRev" inputs.self
then inputs.self.dirtyShortRev
else inputs.self.shortRev;
in
(builtins.concatStringsSep "-" (builtins.sort (x: y: x < y) config.system.nixos.tags)) + config.system.nixos.version + "-SHA:${rev}";
# Use some binary caches # Use some binary caches
nix.settings = { nix.settings = {

View file

@ -7,7 +7,7 @@
build ? inputs.self.nixosConfigurations.chrysomallon-squamiferum.config.system.build, build ? inputs.self.nixosConfigurations.chrysomallon-squamiferum.config.system.build,
... ...
}: let }: let
netboot = writeShellApplication { netboot = writeShellApplication {
name = "netboot"; name = "netboot";
runtimeInputs = [pixiecore]; runtimeInputs = [pixiecore];
text = '' text = ''
@ -21,7 +21,9 @@ netboot = writeShellApplication {
--status-port 64172 \ --status-port 64172 \
"$@" "$@"
''; '';
}; in writeShellApplication { };
in
writeShellApplication {
name = "run-netboot-server"; name = "run-netboot-server";
runtimeInputs = [ runtimeInputs = [
netboot netboot
@ -39,4 +41,4 @@ netboot = writeShellApplication {
sudo iptables -w -D nixos-fw -p udp -m multiport --dports 67,69,4011 -j ACCEPT sudo iptables -w -D nixos-fw -p udp -m multiport --dports 67,69,4011 -j ACCEPT
sudo iptables -w -D nixos-fw -p tcp -m tcp --dport 64172 -j ACCEPT sudo iptables -w -D nixos-fw -p tcp -m tcp --dport 64172 -j ACCEPT
''; '';
} }