From 86637a363ea086cfa9d772b741ef218416b7d15d Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Thu, 20 Feb 2025 08:03:38 -0800 Subject: [PATCH] Fix nix fmt --- flake.nix | 2 +- module.nix | 9 +++++++-- package.nix | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 691890b..50afefd 100644 --- a/flake.nix +++ b/flake.nix @@ -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 diff --git a/module.nix b/module.nix index a309515..864689d 100644 --- a/module.nix +++ b/module.nix @@ -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: { diff --git a/package.nix b/package.nix index ac9d3c3..b2b9ed9 100644 --- a/package.nix +++ b/package.nix @@ -27,5 +27,5 @@ buildGoModule { nativeBuildInputs = [ jq ]; - meta = {}; + meta = { }; }