1
0

Compare commits

...

6 Commits

Author SHA1 Message Date
3377218ee0
flake.nix: Add lix 2024-11-20 20:41:35 +01:00
d946d31c81
configuration/common: Pin nix version to 2.18 2024-11-20 20:40:27 +01:00
5f6c3b9258
configuration/common: Remove nix experimental feature repl-flake 2024-11-20 20:32:41 +01:00
54dc097b44
hosts/carbon: Enable mDNS reflection between net-heimnetz and net-iot 2024-11-12 21:09:45 +01:00
684c5e9ac5 hosts/zinc: Add mumble 2024-11-10 20:05:18 +01:00
6840548833 hosts/carbon: Readvertise prefixes often enough
Advertise current prefixes more often than claimed addresses expire.
Also increased lifetimes for claimed addresses.
2024-11-10 19:52:47 +01:00
11 changed files with 127 additions and 9 deletions

View File

@ -26,7 +26,6 @@
experimental-features = [ experimental-features = [
"flakes" "flakes"
"nix-command" "nix-command"
"repl-flake"
]; ];
substituters = [ substituters = [
"https://nix-cache.clerie.de" "https://nix-cache.clerie.de"
@ -63,6 +62,8 @@
}; };
}; };
nix.package = pkgs.nixVersions.nix_2_18;
documentation.doc.enable = false; documentation.doc.enable = false;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View File

@ -158,6 +158,39 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"harmonia": { "harmonia": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
@ -181,6 +214,44 @@
"type": "github" "type": "github"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1729298361,
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1729360442,
"narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
"ref": "stable",
"rev": "2bbdcd73b9a464f8acf45a7100feb979883ba485",
"revCount": 110,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module.git"
},
"original": {
"ref": "stable",
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module.git"
}
},
"mitel-ommclient2": { "mitel-ommclient2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -330,6 +401,7 @@
"fernglas": "fernglas", "fernglas": "fernglas",
"fieldpoc": "fieldpoc", "fieldpoc": "fieldpoc",
"harmonia": "harmonia", "harmonia": "harmonia",
"lix-module": "lix-module",
"nixos-exporter": "nixos-exporter", "nixos-exporter": "nixos-exporter",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
@ -416,6 +488,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View File

@ -22,6 +22,10 @@
url = "github:nix-community/harmonia/harmonia-v1.0.2"; url = "github:nix-community/harmonia/harmonia-v1.0.2";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module.git?ref=stable";
inputs.nixpkgs.follows = "nixpkgs";
};
fieldpoc.url = "git+https://git.clerie.de/clerie/fieldpoc.git"; fieldpoc.url = "git+https://git.clerie.de/clerie/fieldpoc.git";
nixos-exporter = { nixos-exporter = {
url = "git+https://git.clerie.de/clerie/nixos-exporter.git"; url = "git+https://git.clerie.de/clerie/nixos-exporter.git";

View File

@ -1,6 +1,7 @@
{ self { self
, fernglas , fernglas
, fieldpoc , fieldpoc
, lix-module
, nixos-exporter , nixos-exporter
, solid-xmpp-alarm , solid-xmpp-alarm
, sops-nix , sops-nix
@ -12,6 +13,7 @@
imports = [ imports = [
fernglas.nixosModules.default fernglas.nixosModules.default
fieldpoc.nixosModules.default fieldpoc.nixosModules.default
lix-module.nixosModules.default
nixos-exporter.nixosModules.default nixos-exporter.nixosModules.default
solid-xmpp-alarm.nixosModules.solid-xmpp-alarm solid-xmpp-alarm.nixosModules.solid-xmpp-alarm
sops-nix.nixosModules.sops sops-nix.nixosModules.sops

View File

@ -7,6 +7,7 @@
../../configuration/router ../../configuration/router
./dns.nix ./dns.nix
./mdns.nix
./net-dsl.nix ./net-dsl.nix
./net-gastnetz.nix ./net-gastnetz.nix
./net-heimnetz.nix ./net-heimnetz.nix

17
hosts/carbon/mdns.nix Normal file
View File

@ -0,0 +1,17 @@
{ pkgs, ... }:
{
services.avahi = {
enable = true;
nssmdns4 = true;
allowInterfaces = [
"net-heimnetz"
"net-iot"
];
reflector = true;
};
}

View File

@ -20,9 +20,10 @@
services.radvd.config = '' services.radvd.config = ''
interface net-gastnetz { interface net-gastnetz {
AdvSendAdvert on; AdvSendAdvert on;
MaxRtrAdvInterval 30;
prefix ::/64 { prefix ::/64 {
AdvValidLifetime 60; AdvValidLifetime 300;
AdvPreferredLifetime 30; AdvPreferredLifetime 120;
}; };
RDNSS 2620:fe::fe 2620:fe::9 {}; # Quad 9 RDNSS 2620:fe::fe 2620:fe::9 {}; # Quad 9
}; };

View File

@ -22,9 +22,10 @@
services.radvd.config = '' services.radvd.config = ''
interface net-heimnetz { interface net-heimnetz {
AdvSendAdvert on; AdvSendAdvert on;
MaxRtrAdvInterval 30;
prefix ::/64 { prefix ::/64 {
AdvValidLifetime 60; AdvValidLifetime 300;
AdvPreferredLifetime 30; AdvPreferredLifetime 120;
}; };
RDNSS fd00:152:152::1 {}; RDNSS fd00:152:152::1 {};
DNSSL net.clerie.de {}; DNSSL net.clerie.de {};

View File

@ -23,9 +23,10 @@
services.radvd.config = '' services.radvd.config = ''
interface net-iot { interface net-iot {
AdvSendAdvert on; AdvSendAdvert on;
MaxRtrAdvInterval 30;
prefix ::/64 { prefix ::/64 {
AdvValidLifetime 60; AdvValidLifetime 300;
AdvPreferredLifetime 30; AdvPreferredLifetime 120;
}; };
RDNSS fd00:152:152::1 {}; RDNSS fd00:152:152::1 {};
DNSSL iot.clerie.de {}; DNSSL iot.clerie.de {};

View File

@ -20,9 +20,10 @@
services.radvd.config = '' services.radvd.config = ''
interface net-mgmt { interface net-mgmt {
AdvSendAdvert on; AdvSendAdvert on;
MaxRtrAdvInterval 30;
prefix ::/64 { prefix ::/64 {
AdvValidLifetime 60; AdvValidLifetime 300;
AdvPreferredLifetime 30; AdvPreferredLifetime 120;
}; };
}; };
''; '';

View File

@ -7,6 +7,8 @@
blender blender
#cura # libarcus library is currently broken, required for curaengine #cura # libarcus library is currently broken, required for curaengine
mumble
]; ];
} }