This commit is contained in:
mjallen18
2025-12-14 21:50:50 -06:00
parent 0012a019fc
commit 34539045e5
41 changed files with 164 additions and 251 deletions

View File

@@ -1,6 +1,6 @@
{ lib, ... }:
{ lib, namespace, ... }:
let
inherit (lib.mjallen.file)
inherit (lib.${namespace}.file)
readFile
pathExists
safeImport

View File

@@ -2,10 +2,11 @@
config,
lib,
pkgs,
namespace,
...
}:
let
inherit (lib.mjallen.module) mkModule mkOpt;
inherit (lib.${namespace}.module) mkModule mkOpt;
in
mkModule {
name = "sops";
@@ -23,13 +24,13 @@ mkModule {
];
sops = {
inherit (config.mjallen.sops) defaultSopsFile;
inherit (config.${namespace}.sops) defaultSopsFile;
defaultSopsFormat = "yaml";
age = {
generateKey = true;
keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ] ++ config.mjallen.sops.sshKeyPaths;
sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ] ++ config.${namespace}.sops.sshKeyPaths;
};
};
};

View File

@@ -1,7 +1,7 @@
# Example usage of the reverse proxy utilities
{ lib, ... }:
{ lib, namespace, ... }:
let
inherit (lib.mjallen-lib.reverseproxy)
inherit (lib.${namespace}-lib.reverseproxy)
mkReverseProxy
mkReverseProxies
templates

View File

@@ -1,6 +1,6 @@
{ config, lib, ... }:
{ config, lib, namespace, ... }:
let
inherit (lib.mjallen.module) mkModule mkOpt mkBoolOpt;
inherit (lib.${namespace}.module) mkModule mkOpt mkBoolOpt;
in
mkModule {
name = "sops";
@@ -22,18 +22,18 @@ mkModule {
};
config = {
sops = {
inherit (config.mjallen.sops) defaultSopsFile validateSopsFiles;
inherit (config.${namespace}.sops) defaultSopsFile validateSopsFiles;
age = {
inherit (config.mjallen.sops) generateAgeKey;
inherit (config.${namespace}.sops) generateAgeKey;
keyFile =
if config.mjallen.sops.ageKeyPath != null then
config.mjallen.sops.ageKeyPath
if config.${namespace}.sops.ageKeyPath != null then
config.${namespace}.sops.ageKeyPath
else
"${config.users.users.${config.mjallen.user.name}.home}/.config/sops/age/keys.txt";
"${config.users.users.${config.${namespace}.user.name}.home}/.config/sops/age/keys.txt";
sshKeyPaths = config.mjallen.sops.sshKeyPaths;
sshKeyPaths = config.${namespace}.sops.sshKeyPaths;
};
};
};

View File

@@ -1,6 +1,6 @@
{ inputs, ... }:
{ inputs, namespace, ... }:
let
inherit (inputs.self.mjallen-lib.system.common)
inherit (inputs.self.${namespace}-lib.system.common)
mkExtendedLib
mkNixpkgsConfig
mkHomeConfigs
@@ -13,10 +13,10 @@ in
nixosConfigurations =
let
# Get all systems
allSystems = inputs.self.mjallen-lib.file.scanSystems ../systems;
allSystems = inputs.self.${namespace}-lib.file.scanSystems ../systems;
# Filter for NixOS systems
nixosSystems = inputs.self.mjallen-lib.file.filterNixOSSystems allSystems;
nixosSystems = inputs.self.${namespace}-lib.file.filterNixOSSystems allSystems;
in
inputs.nixpkgs.lib.mapAttrs' (
_name:
@@ -74,7 +74,7 @@ in
# Import all nixos modules recursively
../${system}/${hostname}
]
++ (extendedLib.mjallen.file.importModulesRecursive ../modules/nixos);
++ (extendedLib.${namespace}.file.importModulesRecursive ../modules/nixos);
};
}
) nixosSystems;
@@ -83,7 +83,7 @@ in
homeConfigurations =
let
# Get all homes
allHomes = inputs.self.mjallen-lib.file.scanHomes ../homes;
allHomes = inputs.self.${namespace}-lib.file.scanHomes ../homes;
in
inputs.nixpkgs.lib.mapAttrs' (
_name:
@@ -125,7 +125,7 @@ in
# Import the home configuration
path
]
++ (extendedLib.mjallen.file.importModulesRecursive ../modules/home);
++ (extendedLib.${namespace}.file.importModulesRecursive ../modules/home);
};
}
) allHomes;