add freshrss to homepage and fix garage issues

This commit is contained in:
TheWanderingCrow 2025-11-19 21:23:44 -05:00
parent 3b33e07179
commit 530a556f55
2 changed files with 38 additions and 21 deletions

8
flake.lock generated
View file

@ -262,11 +262,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1763562626,
"narHash": "sha256-QW5JDRm5UyCOqq6Ccuh33az67gKF5YYGsk/KX9cOlvI=",
"lastModified": 1763736959,
"narHash": "sha256-yxUn0ZNrYCP8/Q7U9jl6uRDRFt/dEvvWHHw4fvo9qsk=",
"ref": "refs/heads/master",
"rev": "f225abc854bce2a40e0b6fbd3ec00a9ac2c43213",
"revCount": 153,
"rev": "5359b0ad75d044b1bbef5de118e57de54e731e2e",
"revCount": 154,
"type": "git",
"url": "ssh://git@github.com/TheWanderingCrow/nix-secrets"
},

View file

@ -7,22 +7,30 @@
}:
let
s = inputs.nix-secrets;
sopsFolder = inputs.nix-secrets + "/sops";
in
{
# Homepage.dev secrets
sops = {
#secrets = {
#"lubelogger/user" = {};
#"lubelogger/pass" = {};
#};
secrets = {
"lubelogger/user" = {
sopsFile = "${sopsFolder}/services.yaml";
};
"lubelogger/pass" = {
sopsFile = "${sopsFolder}/services.yaml";
};
"freshrss/api" = {
sopsFile = "${sopsFolder}/services.yaml";
};
};
templates."homepage-environment".content = ''
HOMEPAGE_VAR_LAT = ${s.crow.location.lat}
HOMEPAGE_VAR_LONG = ${s.crow.location.long}
HOMEPAGE_ALLOWED_HOSTS = home.wanderingcrow.net
HOMEPAGE_VAR_LUBELOGGERUSER = ${config.sops.placeholder."lubelogger/user"}
HOMEPAGE_VAR_LUBELOGGERPASS = ${config.sops.placeholder."lubelogger/pass"}
HOMEPAGE_VAR_FRESHRSSPASS = ${config.sops.placeholder."freshrss/api"}
'';
#Need to put these back in later
#HOMEPAGE_VAR_LUBELOGGERUSER = ${config.sops.placeholder."lubelogger/user"}
#HOMEPAGE_VAR_LUBELOGGERPASS = ${config.sops.placeholder."lubelogger/pass"}
};
services.caddy = {
@ -53,8 +61,25 @@ in
widget = {
type = "lubelogger";
url = "https://garage.wanderingcrow.net";
# username = "{{HOMEPAGE_VAR_LUBELOGGERUSER}}";
# password = "{{HOMEPAGE_VAR_LUBELOGGERPASS}}";
username = "{{HOMEPAGE_VAR_LUBELOGGERUSER}}";
password = "{{HOMEPAGE_VAR_LUBELOGGERPASS}}";
fields = [
"vehicles"
"reminders"
];
};
};
}
{
"RSS" = {
icon = "freshrss.svg";
href = "https://rss.wanderingcrow.net";
description = "RSS Feeds";
widget = {
type = "freshrss";
url = "https://rss.wanderingcrow.net";
username = "admin";
password = "{{HOMEPAGE_VAR_FRESHRSSPASS}}";
};
};
}
@ -77,14 +102,6 @@ in
longitude = "{{HOMEPAGE_VAR_LONG}}";
};
}
{
glances = {
url = "http://localhost:61208";
version = 4;
disk = "/";
label = "Overseer";
};
}
];
bookmarks = [
s.work.homepage