matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(pcsd): update to latest breaking changes
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2025-01-19 14:54:24 -05:00
parent 6db3884f23
commit 8327c991fc
7 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configurations/cluster/default.nix
View file

@ -4,7 +4,7 @@ deviceName: {
self,
...
}: let
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip;
clusterIP = (builtins.head config.services.pcsd.virtualIps).ip;
in {
# ------------------------------------------------
# Imports

4
configurations/cluster/modules/caddy/default.nix
View file

@ -6,7 +6,7 @@
self,
...
}: let
inherit (lib) attrValues removeAttrs;
inherit (lib) attrValues head removeAttrs;
inherit (config.sops) secrets;
inherit (config.networking) hostName;
@ -34,7 +34,7 @@ in {
};
virtualHosts = let
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip;
clusterIP = (head config.services.pcsd.virtualIps).ip;
nosIP = "10.0.0.121";
serviviIP = "10.0.0.249";
homieIP = "100.64.0.10";

2
configurations/cluster/modules/headscale/default.nix
View file

@ -5,7 +5,7 @@
}: let
inherit (config.networking) hostName;
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip;
clusterIP = (builtins.head config.services.pcsd.virtualIps).ip;
in {
users.users.${mainUser}.extraGroups = ["headscale"];

43
configurations/cluster/modules/pcsd/default.nix
View file

@ -16,45 +16,46 @@ in {
corosyncKeyFile = secrets.corosync.path;
clusterUserPasswordFile = secrets.pcs-pass.path;
virtualIps = {
"caddy-vip" = {
virtualIps = [
{
id = "caddy-vip";
ip = "10.0.0.130";
interface = "eno1";
group = "caddy-grp";
};
};
}
];
systemdResources = {
"unbound" = {
systemdResources = [
{
systemdName = "unbound";
enable = true;
group = "caddy-grp";
startAfter = ["caddy-vip"];
};
}
"blocky" = {
{
systemdName = "blocky";
enable = true;
group = "caddy-grp";
startAfter = ["unbound"];
};
}
"headscale" = {
{
systemdName = "headscale";
enable = true;
group = "caddy-grp";
startAfter = ["blocky"];
};
}
"caddy" = {
{
systemdName = "caddy";
enable = true;
group = "caddy-grp";
startAfter = ["headscale"];
};
}
"searx" = {
{
systemdName = "searx";
enable = true;
group = "caddy-grp";
startAfter = ["caddy"];
};
};
}
];
nodes = [
{

4
configurations/cluster/modules/searxng/default.nix
View file

@ -4,7 +4,7 @@
pkgs,
...
}: let
inherit (lib) mapAttrsToList;
inherit (lib) head mapAttrsToList;
in {
services.searx = {
enable = true;
@ -43,7 +43,7 @@ in {
server = {
port = 8080;
bind_address = config.services.pcsd.virtualIps.caddy-vip.ip;
bind_address = (head config.services.pcsd.virtualIps).ip;
secret_key = "@SEARXNG_SECRET@";

9
flake.lock generated
View file

@ -1504,14 +1504,17 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1734910876,
"narHash": "sha256-xe8+8hA1DwbyURleV7kUWR5dnrhcfpFu3eiTWHzeDl4=",
"lastModified": 1737314274,
"narHash": "sha256-hVcd4dSTmFd2/6Xkcq4kgNsiN/dA42PPTstPeP8t0LM=",
"owner": "matt1432",
"repo": "nixos-pcsd",
"rev": "43b10193bbea70422578871e1fc88b2792297ad5",
"rev": "27f80dbf864f52bc9f801db15ae8e767a315c5fe",
"type": "github"
},
"original": {

5
flake.nix
View file

@ -395,7 +395,10 @@
type = "gitlab";
};
pcsd = {
inputs.nixpkgs.follows = "nixpkgs";
inputs = {
nixpkgs.follows = "nixpkgs";
systems.follows = "systems";
};
owner = "matt1432";
repo = "nixos-pcsd";
type = "github";