Compare commits
No commits in common. "9fc9b6b5c86cdd5dd3c8c6a316bfa2cfc835325d" and "b02770adea559d802440a420726deac33ed231b7" have entirely different histories.
9fc9b6b5c8
...
b02770adea
94
flake.lock
94
flake.lock
|
@ -169,27 +169,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"devshell_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"mezza-biz",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722113426,
|
||||
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -262,24 +241,6 @@
|
|||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_4": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714606777,
|
||||
"narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=",
|
||||
|
@ -418,28 +379,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mezza-biz": {
|
||||
"inputs": {
|
||||
"devshell": "devshell_2",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724541053,
|
||||
"narHash": "sha256-bQiwF08H8GEi7lxNiJKc4Gu42K7zYeDPPqRCNYVnp7U=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "0ee615488dec2685cee6ed558cbfcf9840e92b94",
|
||||
"revCount": 10,
|
||||
"type": "git",
|
||||
"url": "https://git.pub.solar/b12f/mezza.biz.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.pub.solar/b12f/mezza.biz.git"
|
||||
}
|
||||
},
|
||||
"mobile-nixos": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -476,7 +415,7 @@
|
|||
},
|
||||
"nixd": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_4",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"flake-root": "flake-root",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
|
@ -566,18 +505,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs-lib_3": {
|
||||
"locked": {
|
||||
"lastModified": 1722555339,
|
||||
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_4": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1714253743,
|
||||
|
@ -597,11 +524,11 @@
|
|||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1724505469,
|
||||
"narHash": "sha256-U0KAINJreo0RbZ2QbA4Y5EhWO7XERFRlkJdrRIncjn8=",
|
||||
"lastModified": 1724053136,
|
||||
"narHash": "sha256-INFq3ENfz0dtIFohPkMiIeX9yBcGV/Xzl1sTK/268fg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "59fbe04a3baa1011fe9f6eb00a1afb7db5179933",
|
||||
"rev": "815d5589d958531af840d7e29424c8525aeff441",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -613,11 +540,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1724224976,
|
||||
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
|
||||
"lastModified": 1723637854,
|
||||
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
|
||||
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -661,11 +588,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1724316499,
|
||||
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
|
||||
"lastModified": 1723938990,
|
||||
"narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
|
||||
"rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -707,7 +634,6 @@
|
|||
"home-manager": "home-manager_2",
|
||||
"impermanence": "impermanence",
|
||||
"invoiceplane-template": "invoiceplane-template",
|
||||
"mezza-biz": "mezza-biz",
|
||||
"mobile-nixos": "mobile-nixos",
|
||||
"musnix": "musnix",
|
||||
"nixd": "nixd",
|
||||
|
|
|
@ -46,9 +46,6 @@
|
|||
|
||||
invoiceplane-template.url = "git+https://git.pub.solar/b12f/invoiceplane-templates.git";
|
||||
invoiceplane-template.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
mezza-biz.url = "git+https://git.pub.solar/b12f/mezza.biz.git";
|
||||
mezza-biz.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = inputs @ {self, ...}:
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
security.acme.certs = {
|
||||
"benjaminbaedorf.eu" = {};
|
||||
"b12f.io" = {};
|
||||
"mezza.biz" = {};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
|
@ -26,16 +25,5 @@
|
|||
tryFiles = "$uri $uri/ =404";
|
||||
};
|
||||
};
|
||||
|
||||
"mezza.biz" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "mezza.biz";
|
||||
|
||||
locations."/" = {
|
||||
root = pkgs.mezza-biz;
|
||||
index = "index.html";
|
||||
tryFiles = "$uri $uri/ =404";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -45,7 +45,6 @@ in {
|
|||
|
||||
glib
|
||||
xdg-utils
|
||||
xorg.xbacklight
|
||||
];
|
||||
|
||||
etc = {
|
||||
|
|
|
@ -96,16 +96,16 @@ in {
|
|||
];
|
||||
timeouts = [
|
||||
{
|
||||
timeout = 300;
|
||||
timeout = 120;
|
||||
command = "${swaylock-bg}/bin/swaylock-bg";
|
||||
}
|
||||
{
|
||||
timeout = 180;
|
||||
timeout = 130;
|
||||
command = "${sway}/bin/swaymsg \"output * dpms off\"";
|
||||
resumeCommand = "${sway}/bin/swaymsg \"output * dpms on\"";
|
||||
}
|
||||
{
|
||||
timeout = 600;
|
||||
timeout = 300;
|
||||
command = "${systemd}/bin/systemctl hibernate";
|
||||
}
|
||||
];
|
||||
|
|
|
@ -32,77 +32,19 @@ in {
|
|||
ips = cfg.ownIPs;
|
||||
privateKeyFile = cfg.privateKeyFile;
|
||||
peers = [
|
||||
{
|
||||
endpoint = "nachtigall.pub.solar:51820";
|
||||
publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk=";
|
||||
allowedIPs = [
|
||||
"10.7.6.1/32"
|
||||
"fd00:fae:fae:fae:fae:1::/96"
|
||||
];
|
||||
persistentKeepalive = 15;
|
||||
dynamicEndpointRefreshSeconds = 30;
|
||||
}
|
||||
{
|
||||
endpoint = "flora-6.pub.solar:51820";
|
||||
publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
|
||||
allowedIPs = [
|
||||
"10.7.6.2/32"
|
||||
"fd00:fae:fae:fae:fae:2::/96"
|
||||
];
|
||||
allowedIPs = ["10.7.6.2/32" "fd00:fae:fae:fae:fae:2::/96"];
|
||||
persistentKeepalive = 15;
|
||||
dynamicEndpointRefreshSeconds = 30;
|
||||
}
|
||||
{
|
||||
# metronom.pub.solar
|
||||
endpoint = "49.13.236.167:51820";
|
||||
publicKey = "zOSYGO7MfnOOUnzaTcWiKRQM0qqxR3JQrwx/gtEtHmo=";
|
||||
allowedIPs = [
|
||||
"10.7.6.3/32"
|
||||
"fd00:fae:fae:fae:fae:3::/96"
|
||||
];
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# tankstelle.pub.solar
|
||||
endpoint = "80.244.242.5:51820";
|
||||
publicKey = "iRTlY1lB7nPXf2eXzX8ZZDkfMmXyGjff5/joccbP8Cg=";
|
||||
allowedIPs = [
|
||||
"10.7.6.4/32"
|
||||
"fd00:fae:fae:fae:fae:4::/96"
|
||||
];
|
||||
}
|
||||
{
|
||||
# trinkgenossin.pub.solar
|
||||
publicKey = "QWgHovHxtqiQhnHLouSWiT6GIoQDmuvnThYL5c/rvU4=";
|
||||
allowedIPs = [
|
||||
"10.7.6.5/32"
|
||||
"fd00:fae:fae:fae:fae:5::/96"
|
||||
];
|
||||
#endpoint = "80.244.242.5:51820";
|
||||
endpoint = "[2a01:239:35d:f500::1]:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# delite.pub.solar
|
||||
publicKey = "ZT2qGWgMPwHRUOZmTQHWCRX4m14YwOsiszjsA5bpc2k=";
|
||||
allowedIPs = [
|
||||
"10.7.6.6/32"
|
||||
"fd00:fae:fae:fae:fae:6::/96"
|
||||
];
|
||||
#endpoint = "80.244.242.5:51820";
|
||||
endpoint = "[2a04:52c0:124:9d8c::2]:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# blue-shell.pub.solar
|
||||
publicKey = "bcrIpWrKc1M+Hq4ds3aN1lTaKE26f2rvXhd+93QrzR8=";
|
||||
allowedIPs = [
|
||||
"10.7.6.7/32"
|
||||
"fd00:fae:fae:fae:fae:7::/96"
|
||||
];
|
||||
#endpoint = "80.244.242.5:51820";
|
||||
endpoint = "[2a03:4000:43:24e::1]:51820";
|
||||
endpoint = "nachtigall.pub.solar:51820";
|
||||
publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk=";
|
||||
allowedIPs = ["10.7.6.1/32" "fd00:fae:fae:fae:fae:1::/96"];
|
||||
persistentKeepalive = 15;
|
||||
dynamicEndpointRefreshSeconds = 30;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
inputs.deno2nix.overlays.default
|
||||
inputs.nixd.overlays.default
|
||||
inputs.invoiceplane-template.overlays.default
|
||||
inputs.mezza-biz.overlays.default
|
||||
|
||||
(final: prev: let
|
||||
unstable = import inputs.nixpkgs-unstable {system = prev.system;};
|
||||
|
|
|
@ -127,31 +127,6 @@ in {
|
|||
user = "barkeeper";
|
||||
hostname = "10.7.6.2";
|
||||
};
|
||||
|
||||
"metronom.pub.solar" = {
|
||||
user = "barkeeper";
|
||||
hostname = "10.7.6.3";
|
||||
};
|
||||
|
||||
"tankstelle.pub.solar" = {
|
||||
user = "barkeeper";
|
||||
hostname = "10.7.6.4";
|
||||
};
|
||||
|
||||
"trinkgenossin.pub.solar" = {
|
||||
user = "barkeeper";
|
||||
hostname = "10.7.6.5";
|
||||
};
|
||||
|
||||
"delite.pub.solar" = {
|
||||
user = "barkeeper";
|
||||
hostname = "10.7.6.6";
|
||||
};
|
||||
|
||||
"blue-shell.pub.solar" = {
|
||||
user = "barkeeper";
|
||||
hostname = "10.7.6.7";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue