flake.nix

@@ -14,7 +14,7 @@
       inherit (futils.lib) eachDefaultSystem;
 
       defaultModules = [
-        ({ ... }: {
+        ({ pkgs, ... }: {
           # Let 'nixos-version --json' know about the Git revision
           system.configurationRevision =
             if self ? rev

home/secrets/default.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 let

machines/porthos/users.nix

@@ -1,5 +1,5 @@
 # User setup
-{ config, ... }:
+{ config, lib, ... }:
 let
   my = config.my;
 in

modules/users.nix

@@ -6,7 +6,7 @@ let
     lib.lists.optional
       (builtins.hasAttr grp config.users.groups)
       grp;
-  groupsIfExist = builtins.concatMap groupIfExists;
+  groupsIfExist = grps: builtins.concatMap groupIfExists grps;
 in
 {
   users.mutableUsers = false; # I want it to be declarative.

services/drone.nix

@@ -70,7 +70,7 @@ in
   config = lib.mkIf cfg.enable {
     systemd.services.drone-server = {
       wantedBy = [ "multi-user.target" ];
-      after = [ "postgresql.service" ];
+      after = [ "postgresql" ];
       serviceConfig = {
         EnvironmentFile = [
           cfg.secretFile