refactor secrets

common/users/default.nix

@@ -3,7 +3,7 @@
   secrets,
   ...
 }: let
-  user = (import ../../secrets.nix).users;
+  user = secrets.users;
 in {
   users.mutableUsers = false;
   users.users = {

flake.nix

@@ -34,7 +34,7 @@
     lanzaboote,
     nixneovimplugins,
   } @ inputs: let
-    user = (import ./secrets.nix).users;
+    secrets = import ./secrets.nix;
   in {
     formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".alejandra;
     nixosConfigurations = {
@@ -47,7 +47,7 @@
           };
           overlays = [(import ./packages) nixneovimplugins.overlays.default];
         };
-        specialArgs = inputs;
+        specialArgs = inputs // {inherit secrets;};
         modules = [
           {
             system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
@@ -64,7 +64,8 @@
             home-manager = {
               useUserPackages = true;
               useGlobalPkgs = true;
-              users.${user.primary.userName} = {pkgs, ...}: {
+              extraSpecialArgs = {inherit secrets;};
+              users.${secrets.users.primary.userName} = {pkgs, ...}: {
                 imports = [
                   impermanence.nixosModules.home-manager.impermanence
                   ./home
@@ -82,7 +83,7 @@
             allowUnfree = true;
           };
         };
-        specialArgs = inputs;
+        specialArgs = inputs // {inherit secrets;};
         modules = [
           {
             system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;

home/programs/git.nix

@@ -1,5 +1,9 @@
-{pkgs, ...}: let
+{
-  user = (import ../../secrets.nix).users;
+  pkgs,
+  secrets,
+  ...
+}: let
+  user = secrets.users;
 in {
   programs.git = {
     enable = true;

hosts/rico2/services/caddy.nix

@@ -1,6 +1,4 @@
-{...}: let
+{secrets, ...}: {
-  secrets = import ../../../secrets.nix;
-in {
   services.caddy = {
     enable = true;
     email = secrets.caddy_config.email;

hosts/rico2/services/frpc.nix

@@ -1,5 +1,9 @@
-{pkgs, ...}: let
+{
-  frp_config = (import ../../../secrets.nix).frp_config;
+  pkgs,
+  secrets,
+  ...
+}: let
+  frp_config = secrets.frp_config;
 in {
   systemd.services.frpc = {
     enable = true;

hosts/skipper/services/default.nix

@@ -1,5 +1,5 @@
-{ ... }: let
+{secrets, ...}: let
-  user = (import ../../../secrets.nix).users;
+  user = secrets.users;
 in {
   imports = [
     ./dbus.nix