mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

refactor: add lib extensions to nixpkgs.lib as overlays

Browse source
This commit is contained in:
oddlama 2023-07-02 00:08:17 +02:00
parent 385d8178a2
commit e1e7516e1a
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
19 changed files with 743 additions and 813 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hosts/ward/fs.nix
View file

@ -1,18 +1,15 @@
{
config,
inputs,
lib,
pkgs,
...
}: let
disko = import ../../lib/disko.nix inputs;
in {
}: {
disko.devices = {
disk = {
m2-ssd = {
type = "disk";
device = "/dev/disk/by-id/${config.repo.secrets.local.disk.m2-ssd}";
content = with disko.gpt; {
content = with lib.disko.gpt; {
type = "table";
format = "gpt";
partitions = [
@ -23,7 +20,7 @@ in {
};
};
};
zpool = with disko.zfs; {
zpool = with lib.disko.zfs; {
rpool =
defaultZpoolOptions
// {

16
hosts/ward/net.nix
View file

@ -1,15 +1,9 @@
{
config,
inputs,
lib,
utils,
...
}: let
inherit
(import ../../lib/net.nix inputs)
cidr
;
lanCidrv4 = "192.168.100.0/24";
lanCidrv6 = "fd10::/64";
in {
@ -60,8 +54,8 @@ in {
};
"20-lan-self" = {
address = [
(cidr.hostCidr 1 lanCidrv4)
(cidr.hostCidr 1 lanCidrv6)
(lib.net.cidr.hostCidr 1 lanCidrv4)
(lib.net.cidr.hostCidr 1 lanCidrv6)
];
matchConfig.Name = "lan-self";
networkConfig = {
@ -84,7 +78,7 @@ in {
ipv6SendRAConfig = {
EmitDNS = true;
# TODO change to self later
#DNS = cidr.host 1 net.lan.ipv6cidr;
#DNS = lib.net.cidr.host 1 net.lan.ipv6cidr;
DNS = ["2606:4700:4700::1111" "2001:4860:4860::8888"];
};
linkConfig.RequiredForOnline = "routable";
@ -160,12 +154,12 @@ in {
interface = "lan-self";
subnet = lanCidrv4;
pools = [
{pool = "${cidr.host 20 lanCidrv4} - ${cidr.host (-6) lanCidrv4}";}
{pool = "${lib.net.cidr.host 20 lanCidrv4} - ${lib.net.cidr.host (-6) lanCidrv4}";}
];
option-data = [
{
name = "routers";
data = cidr.host 1 lanCidrv4;
data = lib.net.cidr.host 1 lanCidrv4;
}
];
}