From 241f7265d5c239520f6207fddd27d6380dcf9c84 Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Wed, 4 Dec 2024 17:08:09 +0800
Subject: [PATCH] perf: my-lib under config

---
 flake.nix                                 | 37 ++++++++++++-----------
 machines/biotite/services/forgejo.nix     |  3 +-
 machines/biotite/services/hedgedoc.nix    |  4 +--
 machines/biotite/services/miniflux.nix    |  4 +--
 machines/biotite/services/vaultwarden.nix |  4 +--
 machines/massicot/kanidm-provision.nix    |  4 +--
 machines/thorite/monitoring.nix           |  6 ++--
 modules/nixos/monitor/loki.nix            |  3 +-
 8 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7e725f2..8c38287 100644
--- a/flake.nix
+++ b/flake.nix
@@ -84,11 +84,16 @@
       overlayModule =
         { ... }:
         {
-          _module.args.my-lib = import ./overlays/my-lib;
-          nixpkgs.overlays = [
-            editorOverlay
-            (import ./overlays/add-pkgs.nix)
-          ];
+          options.my-lib = nixpkgs.lib.mkOption {
+            type = nixpkgs.lib.types.freeformType;
+            default = import ./overlays/my-lib;
+          };
+          config = {
+            nixpkgs.overlays = [
+              editorOverlay
+              (import ./overlays/add-pkgs.nix)
+            ];
+          };
         };
       deploymentModule = {
         deployment.targetUser = "xin";
@@ -109,7 +114,7 @@
           nur.nixosModules.nur
           catppuccin.nixosModules.catppuccin
           machines/calcite/configuration.nix
-          (mkHome "xin" "calcite")
+          # (mkHome "xin" "calcite")
         ];
         hk-00 = [
           ./machines/dolomite/claw.nix
@@ -142,17 +147,15 @@
         user: host:
         { ... }:
         {
-          imports = [
-            home-manager.nixosModules.home-manager
-            {
-              home-manager = {
-                sharedModules = sharedHmModules;
-                useGlobalPkgs = true;
-                useUserPackages = true;
-              };
-              home-manager.users.${user} = (import ./home).${user}.${host};
-            }
-          ];
+          imports = [ home-manager.nixosModules.home-manager ];
+          config = {
+            home-manager = {
+              sharedModules = sharedHmModules;
+              useGlobalPkgs = true;
+              useUserPackages = true;
+            };
+            home-manager.users.${user} = (import ./home).${user}.${host};
+          };
         };
       mkNixos =
         {
diff --git a/machines/biotite/services/forgejo.nix b/machines/biotite/services/forgejo.nix
index 43a73d8..551cbcc 100644
--- a/machines/biotite/services/forgejo.nix
+++ b/machines/biotite/services/forgejo.nix
@@ -2,12 +2,11 @@
   config,
   pkgs,
   lib,
-  my-lib,
   ...
 }:
 let
   inherit (lib) getExe;
-  inherit (my-lib.settings) idpUrl forgejoDomain forgejoGitDomain;
+  inherit (config.my-lib.settings) idpUrl forgejoDomain forgejoGitDomain;
   settings = {
     service.DISABLE_REGISTRATION = true;
     server = {
diff --git a/machines/biotite/services/hedgedoc.nix b/machines/biotite/services/hedgedoc.nix
index dc89296..c8b33bc 100644
--- a/machines/biotite/services/hedgedoc.nix
+++ b/machines/biotite/services/hedgedoc.nix
@@ -1,6 +1,6 @@
-{ config, my-lib, ... }:
+{ config, pkgs, ... }:
 let
-  inherit (my-lib.settings) hedgedocDomain idpUrl;
+  inherit (config.my-lib.settings) hedgedocDomain idpUrl;
 in
 {
   sops.secrets."hedgedoc/client_secret" = { };
diff --git a/machines/biotite/services/miniflux.nix b/machines/biotite/services/miniflux.nix
index caf02f1..1bee3dc 100644
--- a/machines/biotite/services/miniflux.nix
+++ b/machines/biotite/services/miniflux.nix
@@ -1,6 +1,6 @@
-{ config, my-lib, ... }:
+{ config, pkgs, ... }:
 let
-  inherit (my-lib.settings) idpUrl minifluxUrl;
+  inherit (config.my-lib.settings) idpUrl minifluxUrl;
 in
 {
   sops = {
diff --git a/machines/biotite/services/vaultwarden.nix b/machines/biotite/services/vaultwarden.nix
index 6cb7b8d..f7c55c3 100644
--- a/machines/biotite/services/vaultwarden.nix
+++ b/machines/biotite/services/vaultwarden.nix
@@ -1,6 +1,6 @@
-{ config, my-lib, ... }:
+{ config, pkgs, ... }:
 let
-  inherit (my-lib.settings) vaultwardenUrl;
+  inherit (config.my-lib.settings) vaultwardenUrl;
 in
 {
   services.vaultwarden = {
diff --git a/machines/massicot/kanidm-provision.nix b/machines/massicot/kanidm-provision.nix
index d9ecb3f..94e977c 100644
--- a/machines/massicot/kanidm-provision.nix
+++ b/machines/massicot/kanidm-provision.nix
@@ -1,6 +1,6 @@
-{ my-lib, ... }:
+{ pkgs, ... }:
 let
-  inherit (my-lib.settings)
+  inherit (config.my-lib.settings)
     gotosocialUrl
     minifluxUrl
     hedgedocDomain
diff --git a/machines/thorite/monitoring.nix b/machines/thorite/monitoring.nix
index 65442d2..671a9d0 100644
--- a/machines/thorite/monitoring.nix
+++ b/machines/thorite/monitoring.nix
@@ -1,12 +1,12 @@
 {
   config,
   lib,
-  my-lib,
+  pkgs,
   ...
 }:
-with my-lib;
+with config.my-lib;
 let
-  inherit (my-lib.settings)
+  inherit (config.my-lib.settings)
     minifluxUrl
     gotosocialUrl
     hedgedocDomain
diff --git a/modules/nixos/monitor/loki.nix b/modules/nixos/monitor/loki.nix
index 772d59a..ee4a768 100644
--- a/modules/nixos/monitor/loki.nix
+++ b/modules/nixos/monitor/loki.nix
@@ -2,7 +2,6 @@
   pkgs,
   config,
   lib,
-  my-lib,
   ...
 }:
 let
@@ -14,7 +13,7 @@ let
     types
     literalExpression
     ;
-  inherit (my-lib.settings)
+  inherit (config.my-lib.settings)
     alertmanagerPort
     ;
   cfg = config.custom.monitoring;