summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <git@lassul.us>2023-06-10 13:10:56 +0200
committerlassulus <git@lassul.us>2023-06-11 16:50:45 +0200
commit3e2a4412670e820023ec767edb847cbd431f6015 (patch)
treeb6e83ff797c64422ca3ce94c7876c233d676a564
parent497aca5116c0228e87d95ee4fd2281914a19d3f8 (diff)
ci fixups
-rw-r--r--kartei/tv/default.nix2
-rw-r--r--krebs/3modules/exim.nix2
-rw-r--r--lass/3modules/default.nix1
3 files changed, 3 insertions, 2 deletions
diff --git a/kartei/tv/default.nix b/kartei/tv/default.nix
index b203675f..e7485175 100644
--- a/kartei/tv/default.nix
+++ b/kartei/tv/default.nix
@@ -37,7 +37,7 @@
(host: mkIf (host.config.ssh.pubkey != null) {
ssh.privkey = mapAttrs (const mkDefault) {
path = config.krebs.secret.file "ssh.id_${host.config.ssh.privkey.type}";
- type = head (toList (match "ssh-([^ ]+) .*" host.config.ssh.pubkey));
+ type = head (toList (builtins.match "ssh-([^ ]+) .*" host.config.ssh.pubkey));
};
})
])
diff --git a/krebs/3modules/exim.nix b/krebs/3modules/exim.nix
index 908f6663..55adc79d 100644
--- a/krebs/3modules/exim.nix
+++ b/krebs/3modules/exim.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: with lib; let
+{ config, lib, pkgs, ... }: with pkgs.stockholm.lib; let
cfg = config.krebs.exim;
in {
options.krebs.exim = {
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 0e1a794c..4082c8bd 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -1,6 +1,7 @@
_:
{
imports = [
+ ../../submodules/disko/module.nix
./dnsmasq.nix
./drbd.nix
./folderPerms.nix