Fix nix fmt
This commit is contained in:
parent
1be261f54d
commit
86637a363e
@ -19,7 +19,7 @@
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
formatter = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
|
||||
formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
|
||||
|
||||
packages.${system} =
|
||||
let
|
||||
|
@ -74,7 +74,9 @@ in
|
||||
intakeCfg = config.services.intake;
|
||||
enabledUsers = filterAttrs (userName: userCfg: userCfg.enable) intakeCfg.users;
|
||||
enabledUserNames = mapAttrsToList (userName: userCfg: userName) enabledUsers;
|
||||
userPackages = userName: [ intakeCfg.package ] ++ intakeCfg.extraPackages ++ intakeCfg.users.${userName}.extraPackages;
|
||||
userPackages =
|
||||
userName:
|
||||
[ intakeCfg.package ] ++ intakeCfg.extraPackages ++ intakeCfg.users.${userName}.extraPackages;
|
||||
in
|
||||
{
|
||||
# Apply the overlay so intake is included in pkgs.
|
||||
@ -94,9 +96,12 @@ in
|
||||
let
|
||||
runScript =
|
||||
userName:
|
||||
let
|
||||
listen = enabledUsers.${userName}.listen;
|
||||
in
|
||||
pkgs.writeShellScript "intake-run.sh" ''
|
||||
mkdir -p $INTAKE_DATA_DIR
|
||||
${intakeCfg.package}/bin/intake serve --addr ${enabledUsers.${userName}.listen.addr} --port ${toString enabledUsers.${userName}.listen.port}
|
||||
${intakeCfg.package}/bin/intake serve --addr ${listen.addr} --port ${toString listen.port}
|
||||
'';
|
||||
# systemd service definition for a single user, given `services.intake.users.userName` = `userCfg`
|
||||
userServiceConfig = userName: userCfg: {
|
||||
|
@ -27,5 +27,5 @@ buildGoModule {
|
||||
|
||||
nativeBuildInputs = [ jq ];
|
||||
|
||||
meta = {};
|
||||
meta = { };
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user