refactor: rename utils to lib'
check / lint (push) Successful in 15s

This commit is contained in:
hektor committed 2026-11-06 14:35:01 +01:00
1 parent 1947ee0c9f
commit 6fa74fead8
22 files changed
+116 -144

No files matched your search

+2 -6
View File
@@ -1,8 +1,6 @@
{
inputs,
outputs,
paths,
myUtils,
lib',
config,
lib,
...
@@ -20,9 +18,7 @@ in
extraSpecialArgs = {
inherit
inputs
outputs
paths
myUtils
lib'
;
};
sharedModules = [
+2 -2
View File
@@ -3,7 +3,7 @@
inputs,
pkgs,
config,
myUtils,
lib',
...
}:
@@ -61,7 +61,7 @@ in
config = lib.mkIf cfg.enable {
sops = {
secrets = myUtils.mkSopsSecrets sopsDir system // myUtils.mkSopsUserSecrets sopsDir owner cfg.user;
secrets = lib'.mkSopsSecrets sopsDir null system // lib'.mkSopsSecrets sopsDir owner cfg.user;
};
nix.settings.secret-key-files = lib.mkIf cfg.nixSigningKey.enable [
+3 -3
View File
@@ -1,13 +1,13 @@
{
lib,
config,
paths,
lib',
...
}:
let
inherit (config.host) username;
adminHosts = (import ../../utils { inherit lib; }).adminHosts paths.hosts;
inherit (lib') adminHosts;
in
{
options.ssh = {
@@ -23,7 +23,7 @@ in
map (
hostname:
let
keyFile = paths.hosts + "/${hostname}/ssh_user.pub";
keyFile = lib'.hostsPath + "/${hostname}/ssh_user.pub";
in
lib.optionals (builtins.pathExists keyFile) (lib.splitString "\n" (builtins.readFile keyFile))
) ((builtins.filter (h: h != config.host.name) adminHosts) ++ config.ssh.authorizedHosts)
+3 -4
View File
@@ -1,14 +1,13 @@
{
lib,
config,
outputs,
paths,
lib',
...
}:
let
hosts = lib.attrNames outputs.nixosConfigurations;
keyPath = hostname: paths.hosts + "/${hostname}/ssh_host.pub";
hosts = lib'.nixosHosts;
keyPath = hostname: lib'.hostsPath + "/${hostname}/ssh_host.pub";
hostsWithKeys = lib.filter (hostname: builtins.pathExists (keyPath hostname)) hosts;
in
{
+4 -5
View File
@@ -1,16 +1,15 @@
{
lib,
config,
outputs,
paths,
myUtils,
inputs,
lib',
pkgs,
...
}:
let
hosts = myUtils.dirNames paths.hosts;
interfaces = host: outputs.nixosConfigurations.${host}.config.wol.interfaces;
hosts = lib'.nixosHosts;
interfaces = host: inputs.self.nixosConfigurations.${host}.config.wol.interfaces;
in
{
options.wol = {