Compare commits

..

No commits in common. "480a6f4775a5e58563f4a2f3f2904c1e627dc709" and "77a31e96885c84e3d4ae6d6e8d6b02b976bc3239" have entirely different histories.

21 changed files with 142 additions and 114 deletions

View file

@ -56,7 +56,6 @@ let
subdomain = stringType;
label = stringType;
name = stringType;
short = stringType;
hostname = stringType;
tags = listType;
domains = genOptions stringType "url";

View file

@ -14,7 +14,6 @@ in
{
label = audiobookshelfLabel;
name = audiobookshelfName;
short = "Books";
sops = {
path0 = "${sopsPath}/${audiobookshelfName}";
};

View file

@ -15,7 +15,6 @@ in
{
label = label;
name = name;
short = label;
email = {
address0 = "noreply@${domain3}";
};

View file

@ -15,7 +15,6 @@ in
{
label = label;
name = name;
short = label;
email = {
address0 = "noreply@${domain0}";
};

View file

@ -13,7 +13,6 @@ in
{
label = label;
name = name;
short = "Jelly";
sops = {
path0 = "${sopsPath}/${name}";
};
@ -34,8 +33,8 @@ in
path1 = "${servicePath}/${label}/cache";
};
ports = {
port0 = 8096; # Jellyfin HTTP
port1 = 5055; # Jellyseer
port0 = 5055; # Jellyseer
port1 = 8096; # Jellyfin HTTP
port2 = 8920; # Jellyfin HTTPS
};
ssl = {

View file

@ -15,7 +15,6 @@ in
{
label = label;
name = name;
short = "Mast";
email = {
address0 = "noreply@${domain3}";
};

View file

@ -11,7 +11,6 @@ in
{
label = label;
name = name;
short = label;
sops = {
path0 = "${sopsPath}/${name}";
};

View file

@ -14,7 +14,6 @@ in
{
label = label;
name = name;
short = "Next";
email = {
address0 = "noreply@${name}.${domain0}";
};

View file

@ -14,7 +14,6 @@ in
{
label = label;
name = name;
short = label;
sops = {
path0 = "${sopsPath}/${name}";
};

View file

@ -15,7 +15,6 @@ in
{
label = label;
name = name;
short = "Cloud";
email = {
address0 = "noreply@${domain0}";
};

View file

@ -15,7 +15,6 @@ in
{
label = label;
name = name;
short = "Cast";
sops = {
path0 = "${sopsPath}/${name}";
};

View file

@ -15,7 +15,6 @@ in
{
label = label;
name = name;
short = "Peer";
email = {
address0 = "noreply@${domain3}";
};

View file

@ -15,7 +15,6 @@ in
{
label = label;
name = name;
short = "Sear";
email = {
address0 = "noreply@${domain0}";
};

View file

@ -14,7 +14,6 @@ in
{
label = label;
name = name;
short = "Sync";
sops = {
path0 = "${sopsPath}/${name}";
};

View file

@ -11,7 +11,6 @@ in
{
label = label;
name = name;
short = "Nas";
tags = [
name
"dsm"

View file

@ -12,7 +12,6 @@ in
{
label = label;
name = name;
short = "upRoot";
email = {
address0 = "nick@${domain3}";
};

View file

@ -14,7 +14,6 @@ in
{
label = label;
name = name;
short = "Vault";
email = {
address0 = "noreply@${name}.${domain0}";
};

View file

@ -6,12 +6,10 @@ let
domain2
domain3
;
label = "Router";
in
{
label = label;
name = "router";
short = label;
label = "Router";
domains = {
url0 = domain0;
url1 = domain1;

View file

@ -84,26 +84,5 @@ in
];
keyword = "Hack";
}
{
name = "Elm-Land Server";
url = "http://localhost:1234";
tags = [
"elm-land"
"elm"
"land"
];
keyword = "Website";
}
{
name = "Namecheap";
url = "https://www.namecheap.com";
tags = [
"namecheap"
"name"
"cheap"
"dns"
];
keyword = "Name";
}
];
}

View file

@ -1,5 +1,11 @@
{ flake, ... }:
let
inherit (flake.config.people)
user0
;
inherit (flake.config.people.users.${user0})
aliases
;
inherit (flake.config.machines.devices)
synology
ceres
@ -9,78 +15,140 @@ let
instances
;
makeBookmarks =
{
suffix,
urlTemplate,
services,
}:
builtins.map (name: {
name = "${instances.${name}.label} ${suffix}";
url = urlTemplate name;
tags = instances.${name}.tags;
keyword = instances.${name}.short;
}) (builtins.map (service: instances.${service}.name) services);
bookmarkConfigs =
let
port = name: toString instances.${name}.ports.port0;
in
[
{
suffix = "(Remote)";
urlTemplate = name: "https://${instances.${name}.domains.url0}";
services = [
"audiobookshelf"
"forgejo"
"glance"
"jellyfin"
"mastodon"
"ollama"
"opencloud"
"owncast"
"peertube"
"searx"
"vaultwarden"
];
}
{
suffix = "(Desktop)";
urlTemplate = "http://${mars.ip.address0}:${port}";
services = [
"ollama"
"syncthing"
];
}
{
suffix = "(Server)";
urlTemplate = "http://${ceres.ip.address0}:${port}";
services = [
"jellyfin"
];
}
{
suffix = "(Synology)";
urlTemplate = "http://${synology.ip.address0}:${port}";
services = [
"syncthing"
];
}
];
generatedBookmarks = builtins.concatLists (builtins.map makeBookmarks bookmarkConfigs);
flatBookmarks = [
{
name = instances.web.label;
url = "http://${instances.web.localhost.address2}";
tags = instances.web.tags;
keyword = instances.web.label;
}
];
in
{
name = "Self Hosted";
toolbar = false;
bookmarks = flatBookmarks ++ generatedBookmarks;
bookmarks = [
{
name = "Elm-Land Server";
url = "http://localhost:1234";
tags = [
"elm-land"
"elm"
"land"
];
keyword = "Website";
}
{
name = instances.opencloud.label;
url = "https://${instances.opencloud.domains.url0}";
tags = [
];
keyword = "Cloud";
}
{
name = instances.forgejo.label;
url = "https://${instances.forgejo.domains.url0}";
tags = [
];
keyword = instances.forgejo.label;
}
{
name = "${instances.jellyfin.label} (Internet)";
url = "https://${instances.jellyfin.domains.url0}";
tags = [ ];
keyword = instances.jellyfin.label;
}
{
name = "${instances.jellyfin.label} (Local)";
url = "http://${ceres.ip.address0}:${toString instances.jellyfin.ports.port1}";
tags = [ ];
keyword = instances.jellyfin.label;
}
{
name = instances.mastodon.label;
url = "https://${instances.mastodon.domains.url0}";
tags = [
];
keyword = instances.mastodon.label;
}
{
name = "Namecheap";
url = "https://www.namecheap.com";
tags = [
"namecheap"
"name"
"cheap"
"dns"
];
keyword = "Name";
}
{
name = instances.nextcloud.label;
url = "https://${instances.nextcloud.domains.url0}";
tags = [
];
keyword = instances.nextcloud.label;
}
{
name = "${instances.glance.label} (Local)";
url = "https://${instances.glance.domains.url0}";
tags = [
];
keyword = instances.glance.label;
}
{
name = "${instances.ollama.label} (Server)";
url = "https://${instances.ollama.domains.url0}";
tags = [ ];
keyword = instances.ollama.label;
}
{
name = "${instances.ollama.label} (Desktop)";
url = "http://${mars.ip.address0}:${toString instances.ollama.ports.port0}";
tags = [ ];
keyword = instances.ollama.label;
}
{
name = "Router";
url = "http://${instances.web.localhost.address2}";
tags = [
];
keyword = "Router";
}
{
name = "${instances.searx.label} (Internet)";
url = "https://${instances.searx.domains.url0}";
tags = [
];
keyword = instances.searx.label;
}
{
name = "${instances.syncthing.label} (${instances.synology.label})";
url = "http://${synology.ip.address0}:${toString instances.syncthing.ports.port0}";
tags = [
];
keyword = instances.syncthing.label;
}
{
name = "${instances.syncthing.label} (Desktop)";
url = "http://localhost:${toString instances.syncthing.ports.port0}";
tags = [
];
keyword = instances.syncthing.label;
}
{
name = instances.synology.label;
url = "https://${synology.ip.address0}:${toString instances.synology.ports.port0}";
tags = [
];
keyword = instances.synology.label;
}
{
name = instances.vaultwarden.label;
url = "https://${instances.vaultwarden.domains.url0}";
tags = [
];
keyword = instances.vaultwarden.label;
}
];
}

View file

@ -25,7 +25,7 @@ in
redir /.well-known/carddav /remote.php/dav/ 301
redir /.well-known/caldav /remote.php/dav/ 301
reverse_proxy ${localhost}:${toString service.ports.port0}
reverse_proxy ${localhost}:${toString service.ports.port1}
tls ${service.ssl.cert} ${service.ssl.key}
'';