From 407b1cb8a64e323a2de5d9adcb62a8745a1d1beb Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 30 Oct 2021 02:02:08 +0200 Subject: [PATCH] sdrweb: add heliwatch --- flake.lock | 108 +++++++++++++++++++++++++--- flake.nix | 5 +- hosts/containers/sdrweb/default.nix | 7 ++ 3 files changed, 109 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index c7ffc65c..84b8a674 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,63 @@ { "nodes": { + "heliwatch": { + "inputs": { + "mozillapkgs": "mozillapkgs", + "naersk": "naersk", + "nixpkgs": "nixpkgs", + "utils": "utils" + }, + "locked": { + "lastModified": 1635551957, + "narHash": "sha256-gV/H08vG+DAR1T50AAqrXmN+Jf1WCREXN8Rzbumm0us=", + "ref": "master", + "rev": "37ac69fddc4086cf6c911871752694b9a144416b", + "revCount": 10, + "type": "git", + "url": "https://gitea.c3d2.de/astro/heliwatch.git" + }, + "original": { + "type": "git", + "url": "https://gitea.c3d2.de/astro/heliwatch.git" + } + }, + "mozillapkgs": { + "flake": false, + "locked": { + "lastModified": 1634833229, + "narHash": "sha256-uDbVCkW91/AY87mTwm8XrX2E133LTFqwYsYNNxBcY9M=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "6070a8ee799f629cb1d0004821f77ceed94d3992", + "type": "github" + }, + "original": { + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "type": "github" + } + }, + "naersk": { + "inputs": { + "nixpkgs": [ + "heliwatch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1635444951, + "narHash": "sha256-1y3YkERwoYDIZjGow7HLAR8K3C/9VBPCBy8VpftMPsM=", + "owner": "nmattia", + "repo": "naersk", + "rev": "0d2ce479df4633dbeb53a8ea96e5098ed37fbcc6", + "type": "github" + }, + "original": { + "owner": "nmattia", + "repo": "naersk", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1633793047, @@ -17,18 +75,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1634883236, - "narHash": "sha256-Z9ofgNzSmYVhs+STOAvk6QNy5KVsUmADOE+UIfur2ug=", - "owner": "nixos", + "lastModified": 1635547145, + "narHash": "sha256-qhyl0MMqBal5io91P6Qu7Lb20NM5Y1+2Y4TkUCN1nJQ=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0274abf85097e9a2da868b28a5532918dc14380", + "rev": "ecebf0602cb068c784f386dd7f0bbeba57d619e4", "type": "github" }, "original": { - "owner": "nixos", - "ref": "release-21.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-master": { @@ -79,6 +135,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1634883236, + "narHash": "sha256-Z9ofgNzSmYVhs+STOAvk6QNy5KVsUmADOE+UIfur2ug=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b0274abf85097e9a2da868b28a5532918dc14380", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1631792076, "narHash": "sha256-dBRsZ3JB6i53nzC30SsltdwrzjIr8e0zU/y8HitKpT8=", @@ -96,8 +168,9 @@ }, "root": { "inputs": { + "heliwatch": "heliwatch", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-mobilizon": "nixpkgs-mobilizon", "nixpkgs-unstable": "nixpkgs-unstable", "scrapers": "scrapers", @@ -188,6 +261,21 @@ "type": "github" } }, + "utils": { + "locked": { + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "yammat": { "inputs": { "nixpkgs": [ @@ -211,7 +299,7 @@ }, "zentralwerk": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-master": "nixpkgs-master", "zentralwerk-network-key": "zentralwerk-network-key" }, diff --git a/flake.nix b/flake.nix index 9a053f14..9e6b81cf 100644 --- a/flake.nix +++ b/flake.nix @@ -18,9 +18,10 @@ tigger.flake = false; ticker.url = "git+https://gitea.c3d2.de/astro/ticker.git"; ticker.flake = false; + heliwatch.url = "git+https://gitea.c3d2.de/astro/heliwatch.git"; }; - outputs = inputs@{ self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, ... }: + outputs = inputs@{ self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, ... }: let forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ]; @@ -444,6 +445,8 @@ sdrweb = nixosSystem' { modules = [ ./lib/lxc-container.nix + { nixpkgs.overlays = [ secrets.overlays.mucbot ]; } + heliwatch.nixosModule ./hosts/containers/sdrweb ]; system = "x86_64-linux"; diff --git a/hosts/containers/sdrweb/default.nix b/hosts/containers/sdrweb/default.nix index ea3bc437..e305b8fc 100644 --- a/hosts/containers/sdrweb/default.nix +++ b/hosts/containers/sdrweb/default.nix @@ -80,6 +80,13 @@ ''; }; + services.heliwatch = { + enable = true; + jid = pkgs.mucbot.jid; + password = pkgs.mucbot.password; + muc = "luftraum@chat.c3d2.de/Hubschraubereinsatz"; + }; + # noXlibs breaks cairo: environment.noXlibs = false; }