modules: services: nginx: use 'recursiveMerge'

This is the better option to use in case I want to have a stateless
system.

home/wm/i3.nix

@@ -154,7 +154,7 @@ in
         };
 
         # I don't care for i3's default values, I specify them all explicitly
-        keybindings = builtins.foldl' (lhs: rhs: lhs // rhs) { } [
+        keybindings = lib.my.recursiveMerge [
           {
             # The basics
             "${modifier}+Return" = "exec ${terminal}";
@@ -298,7 +298,7 @@ in
               in
               lib.my.genAttrs' oneToNine createWorkspaceBinding;
           in
-          builtins.foldl' (lhs: rhs: lhs // rhs) { } [
+          lib.my.recursiveMerge [
             (createWorkspaceBindings modifier "workspace number")
             (createWorkspaceBindings "${modifier}+Shift" "move container to workspace number")
             {

lib/attrs.nix

@@ -1,6 +1,13 @@
 { lib, ... }:
 let
-  inherit (lib) filterAttrs listToAttrs mapAttrs' nameValuePair;
+  inherit (lib)
+    filterAttrs
+    foldl
+    listToAttrs
+    mapAttrs'
+    nameValuePair
+    recursiveUpdate
+    ;
 in
 {
   # Filter a generated set of attrs using a predicate function.
@@ -19,6 +26,13 @@ in
   #   attrs
   genAttrs' = values: f: listToAttrs (map f values);
 
+  # Merge a list of attrs recursively, later values override previous ones.
+  #
+  # recursiveMerge ::
+  #   [ attrs ]
+  #   attrs
+  recursiveMerge = foldl recursiveUpdate { };
+
   # Rename each of the attributes in an attribute set using the mapping function
   #
   # renameAttrs ::

modules/services/nginx.nix

@@ -173,7 +173,7 @@ in
           domain = config.networking.domain;
           mkVHost = ({ subdomain, ... } @ args: lib.nameValuePair
             "${subdomain}.${domain}"
-            (builtins.foldl' lib.recursiveUpdate { } [
+            (lib.my.recursiveMerge [
               # Base configuration
               {
                 forceSSL = true;

modules/system/users.nix

@@ -17,11 +17,11 @@ in
 
       users = {
         root = {
-          inherit (secrets.users.root) hashedPassword;
+          initialHashedPassword = secrets.users.root.hashedPassword;
         };
 
         ${config.my.user.name} = {
-          inherit (secrets.users.${config.my.user.name}) hashedPassword;
+          initialHashedPassword = secrets.users.ambroisie.hashedPassword;
           description = "Bruno BELANYI";
           isNormalUser = true;
           shell = pkgs.zsh;