leon/nix-config
leon/nix-config
1
0
Fork 0
forked from c3d2/nix-config
Code Pull Requests Activity

nncp: cleanup

Browse Source
This commit is contained in:
Emery 2022-10-31 18:21:38 -05:00
parent 2055b6b639
commit d474949d78
3 changed files with 11 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
flake.nix
View File

@ -35,10 +35,6 @@
rust-overlay.follows = "rust-overlay";
};
};
# eris = {
# url = "git+https://codeberg.org/eris/nix-eris?ref=trunk";
# inputs.nixpkgs.follows = "nixos";
# };
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixos";
@ -123,13 +119,6 @@
url = "github:astro/spacemsg";
flake = false;
};
# syndicate = {
# url = "git+https://git.syndicate-lang.org/ehmry/syndicate-flake";
# inputs = {
# nixpkgs.follows = "nixos";
# rust.follows = "rust-overlay";
# };
# };
ticker = {
url = "git+https://gitea.c3d2.de/astro/ticker.git";
inputs = {
@ -220,9 +209,6 @@
pkgs.appendOverlays [
fenix.overlay
naersk.overlay
# syndicate.overlays.default
# eris.inputs.nimble.overlay
# eris.overlays.default
self.overlay
]) nixos.legacyPackages;
@ -634,21 +620,13 @@
system = "aarch64-linux";
};
# nncp = nixosSystem' {
# modules = [
# self.nixosModules.microvm
# self.nixosModules.nncp
# syndicate.nixosModules.default
# ./hosts/nncp
# {
# nixpkgs.overlays = [
# syndicate.overlays.default
# eris.inputs.nimble.overlay
# eris.overlays.default
# ];
# }
# ];
# };
nncp = nixosSystem' {
modules = [
self.nixosModules.microvm
self.nixosModules.nncp
./hosts/nncp
];
};
dacbert = nixosSystem' {
modules = [

8
hosts/nncp/default.nix
View File

@ -1,19 +1,19 @@
{ config, lib, pkgs, ... }:
{
imports = [ ./eris.nix ./neighbours.nix ];
imports = [ ./neighbours.nix ];
microvm.interfaces = [ {
microvm.interfaces = [{
type = "tap";
id = "c3d2-nncp";
mac = "de:ec:9a:6f:3f:63";
} ];
}];
c3d2.mergeNncpSettings = false;
c3d2.hq.statistics.enable = true;
c3d2.deployment = {
server = "server10";
mounts = [ "etc" "home" "var"];
mounts = [ "etc" "home" "var" ];
autoNetSetup = false;
};

30
hosts/nncp/eris.nix
View File

@ -1,30 +0,0 @@
{ pkgs, ... }:
let home = "/var/spool/eris";
in {
services.syndicate.eris = {
enable = true;
user = "eris";
config = [
(pkgs.writeText "eris.pr" ''
<require-service <daemon eris-resolver>>
<daemon eris-resolver {
argv: [ "${pkgs.nimPackages.eris}/bin/eriscmd" "resolver" ]
protocol: text/syndicate
}>
? <service-object <daemon eris-resolver> ?cap> $cap [
<coap-server "::" 5683 #{Get Put}>
<tkrzw "${home}/eris.tkh" #{Get Put} >
]
'')
];
};
users.groups.eris = { };
users.users.eris = {
isSystemUser = true;
group = "eris";
inherit home;
};
}