From e062cbe45d29376d99dde3c5d75f924e2604d2b6 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 8 Mar 2021 18:59:08 +0000
Subject: [PATCH 1/5] flake: remove unused 'pkgs' attribute

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index daaf0ad..5d881a7 100644
--- a/flake.nix
+++ b/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

From dec8bd4e81cdab3c75c7ed200001a46ebffc3ca9 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 8 Mar 2021 18:59:22 +0000
Subject: [PATCH 2/5] home: secrets: remove unused 'pkgs' attribute

---
 home/secrets/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/secrets/default.nix b/home/secrets/default.nix
index 356c213..3624472 100644
--- a/home/secrets/default.nix
+++ b/home/secrets/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 let

From 56212a0c9e250aaf911ab2165068bfe89f700669 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 8 Mar 2021 19:00:01 +0000
Subject: [PATCH 3/5] machines: porthos: users: remove unused attribute

---
 machines/porthos/users.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/machines/porthos/users.nix b/machines/porthos/users.nix
index 9ca91b2..1a26e3c 100644
--- a/machines/porthos/users.nix
+++ b/machines/porthos/users.nix
@@ -1,5 +1,5 @@
 # User setup
-{ config, lib, ... }:
+{ config, ... }:
 let
   my = config.my;
 in

From af1332fa892f7aaadadcb720a4d4e9eece691ceb Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 8 Mar 2021 19:02:28 +0000
Subject: [PATCH 4/5] modules: users: eta reduction of 'groupsIfExist'

---
 modules/users.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/users.nix b/modules/users.nix
index d6ddd93..cc1c2ee 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -6,7 +6,7 @@ let
     lib.lists.optional
       (builtins.hasAttr grp config.users.groups)
       grp;
-  groupsIfExist = grps: builtins.concatMap groupIfExists grps;
+  groupsIfExist = builtins.concatMap groupIfExists;
 in
 {
   users.mutableUsers = false; # I want it to be declarative.

From f0c3e71b224d008e8027d5b42180db3c9720fcdb Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 11 Mar 2021 20:53:27 +0000
Subject: [PATCH 5/5] services: drone: fix postgresql service dependency

---
 services/drone.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drone.nix b/services/drone.nix
index 69b16a0..d3314b4 100644
--- a/services/drone.nix
+++ b/services/drone.nix
@@ -70,7 +70,7 @@ in
   config = lib.mkIf cfg.enable {
     systemd.services.drone-server = {
       wantedBy = [ "multi-user.target" ];
-      after = [ "postgresql" ];
+      after = [ "postgresql.service" ];
       serviceConfig = {
         EnvironmentFile = [
           cfg.secretFile