From d5b04699c146efffbda4e4cc0e02f73099741f23 Mon Sep 17 00:00:00 2001
From: Alexander Tomokhov <alexoundos@gmail.com>
Date: Thu, 16 Nov 2023 06:33:28 +0400
Subject: [PATCH] sp-module: refactor simple-nixos-mailserver flake

---
 sp-modules/simple-nixos-mailserver/flake.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/sp-modules/simple-nixos-mailserver/flake.nix b/sp-modules/simple-nixos-mailserver/flake.nix
index d0c6e18..13aad14 100644
--- a/sp-modules/simple-nixos-mailserver/flake.nix
+++ b/sp-modules/simple-nixos-mailserver/flake.nix
@@ -5,20 +5,22 @@
     gitlab:simple-nixos-mailserver/nixos-mailserver;
 
   outputs = { self, mailserver }: {
-    # tricks to rename (alias) the original module
-    nixosModules.default = args@{ pkgs, config, ... }:
+    nixosModules.default = args@{ config, ... }:
+      # tricks to rename (alias) the original module
       let
         module = mailserver.nixosModules.default args;
       in
-      module // {
-        imports = module.imports ++ [
+      {
+        imports = [
+          module
+          {
+            config.mailserver =
+              config.selfprivacy.modules.simple-nixos-mailserver;
+            options.selfprivacy.modules.simple-nixos-mailserver =
+              module.options.mailserver;
+          }
           ./config.nix
-          { mailserver = config.selfprivacy.modules.simple-nixos-mailserver; }
         ];
-        options = module.options // {
-          selfprivacy.modules.simple-nixos-mailserver =
-            module.options.mailserver;
-        };
       };
     configPathsNeeded =
       builtins.fromJSON (builtins.readFile ./config-paths-needed.json);