pull out actual and cloudflared to main

This commit is contained in:
Clayton Hickey 2026-03-09 15:23:38 -04:00
parent 4dc2de88e2
commit 2b660e73e9
6 changed files with 43 additions and 34 deletions

17
actual.nix Normal file
View file

@ -0,0 +1,17 @@
{lib, config, ...}:
let
in
{
config = lib.mkMerge [
(lib.mkIf (config.networking.hostName == "loadedskypotato") {
services.actual = {
enable = true;
settings = {
hostname = "127.0.0.1";
};
};
services.cloudflared.tunnels.mine.ingress."actual.claytonhickey.me" = "http://127.0.0.1:${builtins.toString 3000}";
})
];
}

View file

@ -11,5 +11,28 @@
}; };
}; };
}) })
(lib.mkIf (config.networking.hostName == "loadedskypotato") {
services.cloudflared = {
enable = true;
certificateFile = "/Block/cloudflare/cert.pem";
tunnels.mine = {
credentialsFile = "/Block/cloudflare/4fc85af1-38f7-4c96-856c-7c797c5e3bf8.json";
default = "http_status:404";
ingress = {
"languini.net" = "http://10.100.0.2:5267";
"claytondoesthings.xyz" = "http://127.0.0.1:5000";
"nextcloud.claytondoesthings.xyz" = "http://10.100.0.2:8120";
"bikeability.claytonhickey.me" = "http://10.100.0.2:8001";
"bikeability-tileserver.claytonhickey.me" = "http://10.100.0.2:8000";
"bikeability-rasterserver.claytonhickey.me" = "http://127.0.0.1:8304";
"claytonhickey.me" = "http://127.0.0.1:8302";
"jellyfin.claytonhickey.me" = "http://10.100.0.2:8096";
"forgejo.claytonhickey.me" = "unix://${config.services.forgejo.settings.server.HTTP_ADDR}";
"matrix.claytonhickey.me" = "http://127.0.0.1:8303";
"mastodon.claytonhickey.me" = "http://10.100.0.2:5328";
};
};
};
})
]; ];
} }

View file

@ -1,6 +1,7 @@
{ lib, inputs, config, ... }: { lib, inputs, config, ... }:
{ {
imports = [ imports = [
./actual.nix
./hyprland.nix ./hyprland.nix
./wireguard.nix ./wireguard.nix
./winboat.nix ./winboat.nix

View file

@ -99,31 +99,6 @@ in
locations."/".proxyPass = "http://10.100.0.2:9000/styles/bikeability/512/"; locations."/".proxyPass = "http://10.100.0.2:9000/styles/bikeability/512/";
}; };
services.cloudflared = {
enable = true;
certificateFile = "/Block/cloudflare/cert.pem";
tunnels = {
"4fc85af1-38f7-4c96-856c-7c797c5e3bf8" = {
credentialsFile = "/Block/cloudflare/4fc85af1-38f7-4c96-856c-7c797c5e3bf8.json";
default = "http_status:404";
ingress = {
"languini.net" = "http://10.100.0.2:5267";
"claytondoesthings.xyz" = "http://127.0.0.1:5000";
"nextcloud.claytondoesthings.xyz" = "http://10.100.0.2:8120";
"bikeability.claytonhickey.me" = "http://10.100.0.2:8001";
"bikeability-tileserver.claytonhickey.me" = "http://10.100.0.2:8000";
"bikeability-rasterserver.claytonhickey.me" = "http://127.0.0.1:8304";
"claytonhickey.me" = "http://127.0.0.1:8302";
"jellyfin.claytonhickey.me" = "http://10.100.0.2:8096";
"forgejo.claytonhickey.me" = "unix://${config.services.forgejo.settings.server.HTTP_ADDR}";
"matrix.claytonhickey.me" = "http://127.0.0.1:8303";
"actual.claytonhickey.me" = "http://127.0.0.1:3000";
"mastodon.claytonhickey.me" = "http://10.100.0.2:5328";
};
};
};
};
services.dnsmasq = { services.dnsmasq = {
enable = true; enable = true;
settings = { settings = {
@ -241,13 +216,6 @@ in
}; };
}; };
actual = {
enable = true;
settings = {
hostname = "127.0.0.1";
};
};
nginx = { nginx = {
enable = true; enable = true;

View file

@ -27,6 +27,6 @@ let cfg = config.cos.grocy; in
enableACME = lib.mkForce false; enableACME = lib.mkForce false;
forceSSL = lib.mkForce false; forceSSL = lib.mkForce false;
}; };
services.cloudflared.tunnels."4fc85af1-38f7-4c96-856c-7c797c5e3bf8".ingress.${cfg.hostname} = "http://127.0.0.1:8303"; services.cloudflared.tunnels.mine.ingress.${cfg.hostname} = "http://127.0.0.1:8303";
}; };
} }

View file

@ -27,6 +27,6 @@ let cfg = config.cos.trilium; in
dataDir = cfg.dataDir; dataDir = cfg.dataDir;
}; };
services.cloudflared.tunnels."4fc85af1-38f7-4c96-856c-7c797c5e3bf8".ingress.${cfg.hostname} = "http://${config.services.trilium-server.host}:${builtins.toString cfg.port}"; services.cloudflared.tunnels.mine.ingress.${cfg.hostname} = "http://${config.services.trilium-server.host}:${builtins.toString cfg.port}";
}; };
} }