diff options
| author | lassulus <git@lassul.us> | 2023-06-10 15:29:55 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2023-06-11 16:50:45 +0200 |
| commit | b21dd1063f06d176913d064b5864092ffe0e5b17 (patch) | |
| tree | e3801b629d2969f0581d07604672e8c4d92ade3a | |
| parent | c94ebb5f5cba9b750cd132d3c354bd300e5fd433 (diff) | |
ci fixup
| -rw-r--r-- | krebs/3modules/brockman.nix | 3 | ||||
| -rw-r--r-- | krebs/3modules/exim-retiolum.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/fetchWallpaper.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/on-failure.nix | 3 | ||||
| -rw-r--r-- | krebs/3modules/setuid.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/tinc_graphs.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/urlwatch.nix | 2 |
7 files changed, 9 insertions, 7 deletions
diff --git a/krebs/3modules/brockman.nix b/krebs/3modules/brockman.nix index e010800e5..653ed355a 100644 --- a/krebs/3modules/brockman.nix +++ b/krebs/3modules/brockman.nix @@ -1,6 +1,7 @@ { pkgs, config, lib, ... }: with lib; let + slib = import ../../lib/lib.nix { inherit lib; }; cfg = config.krebs.brockman; in { options.krebs.brockman = { @@ -14,7 +15,7 @@ in { group = "brockman"; createHome = true; isSystemUser = true; - uid = genid_uint31 "brockman"; + uid = slib.genid_uint31 "brockman"; }; users.groups.brockman = {}; diff --git a/krebs/3modules/exim-retiolum.nix b/krebs/3modules/exim-retiolum.nix index 5fe242a13..276031f7e 100644 --- a/krebs/3modules/exim-retiolum.nix +++ b/krebs/3modules/exim-retiolum.nix @@ -1,5 +1,5 @@ { config, pkgs, lib, ... }: -with lib; let +with import ../../lib/lib.nix { inherit lib; }; let cfg = config.krebs.exim-retiolum; # Due to improvements to the JSON notation, braces around top-level objects diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix index 2ca57d00d..e51bf2d9d 100644 --- a/krebs/3modules/fetchWallpaper.nix +++ b/krebs/3modules/fetchWallpaper.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with import ../../lib/lib.nix { inherit lib; }; let cfg = config.krebs.fetchWallpaper; diff --git a/krebs/3modules/on-failure.nix b/krebs/3modules/on-failure.nix index 54c1eca10..ffce8da95 100644 --- a/krebs/3modules/on-failure.nix +++ b/krebs/3modules/on-failure.nix @@ -1,4 +1,5 @@ -{ config, lib, pkgs, ... }: with lib; let +{ config, lib, pkgs, ... }: +with import ../../lib/lib.nix { inherit lib; }; let out = { options.krebs.on-failure = api; config = lib.mkIf cfg.enable imp; diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix index 52a4e8908..f00bab83c 100644 --- a/krebs/3modules/setuid.nix +++ b/krebs/3modules/setuid.nix @@ -1,5 +1,5 @@ { config, pkgs, lib, ... }: -with lib; +with import ../../lib/lib.nix { inherit lib; }; let out = { diff --git a/krebs/3modules/tinc_graphs.nix b/krebs/3modules/tinc_graphs.nix index 4ab6fadd9..60af6021b 100644 --- a/krebs/3modules/tinc_graphs.nix +++ b/krebs/3modules/tinc_graphs.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with import ../../lib/lib.nix { inherit lib; }; let cfg = config.krebs.tinc_graphs; internal_dir = "${cfg.workingDir}/internal"; diff --git a/krebs/3modules/urlwatch.nix b/krebs/3modules/urlwatch.nix index 1a88de1a4..84968f747 100644 --- a/krebs/3modules/urlwatch.nix +++ b/krebs/3modules/urlwatch.nix @@ -4,7 +4,7 @@ # TODO inform about unused caches # cache = url: "${cfg.dataDir}/.urlwatch/cache/${hashString "sha1" url}" -with lib; +with import ../../lib/lib.nix { inherit lib; }; let cfg = config.krebs.urlwatch; |