diff options
author | makefu <github@syntax-fehler.de> | 2018-09-10 17:32:31 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-09-10 17:32:31 +0200 |
commit | 859f98583788a9324be0e8c52d36a6bb812273fe (patch) | |
tree | 81e1ce4bd2a4185221761165023434f8737fff06 /tv | |
parent | b2a3bd38ea70307c8b136eba42de7cc882afd441 (diff) | |
parent | f6e69c6ecb25fc96655ec1749747d9ccb7880365 (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv')
-rw-r--r-- | tv/1systems/querel/config.nix | 3 | ||||
-rw-r--r-- | tv/krops.nix | 22 |
2 files changed, 22 insertions, 3 deletions
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix index 07ec8e403..5f981c64c 100644 --- a/tv/1systems/querel/config.nix +++ b/tv/1systems/querel/config.nix @@ -11,9 +11,6 @@ with import <stockholm/lib>; krebs.build.host = config.krebs.hosts.querel; krebs.build.user = mkForce config.krebs.users.itak; - boot.extraModulePackages = [ - config.boot.kernelPackages.exfat-nofuse - ]; boot.initrd.availableKernelModules = [ "ahci" ]; boot.initrd.luks = { cryptoModules = [ "aes" "sha512" "xts" ]; diff --git a/tv/krops.nix b/tv/krops.nix new file mode 100644 index 000000000..231486ab7 --- /dev/null +++ b/tv/krops.nix @@ -0,0 +1,22 @@ +{ name }: rec { + + inherit (import ../krebs/krops.nix { inherit name; }) + krebs-source + lib + pkgs + ; + + source = lib.evalSource [ + krebs-source + { + nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix"; + secrets.file = toString ./dummy_secrets; + } + ]; + + # usage: $(nix-build --no-out-link --argstr name HOSTNAME --argstr target PATH -A test) + test = { target }: pkgs.krops.writeTest "tv-krops-${name}-ci" { + inherit source target; + }; + +} |