TheWanderingCrow/CrOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add trilium to oauth

Browse source
This commit is contained in:
TheWanderingCrow 2025-11-08 18:17:21 -05:00
parent f4e908f087
commit ccc659b1a6
2 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -387,11 +387,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1762540987, "lastModified": 1762643722,
"narHash": "sha256-SqE+KPd8N9Fef7u7lOXMayI6VB7lflop7KIwPg0jui4=", "narHash": "sha256-pDwGVYN6i/5uY4p/RXcQ5EKEv386JrkykxSvwoRHp5E=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "9e68e5dfdad75a5be8e95efce24d9b4708589dd2", "rev": "489860d74b0a1550549b06230ff3e5a609de52b5",
"revCount": 148, "revCount": 149,
"type": "git", "type": "git",
"url": "ssh://git@github.com/TheWanderingCrow/nix-secrets" "url": "ssh://git@github.com/TheWanderingCrow/nix-secrets"
}, },

38
modules/services/trilium/default.nix
View file

@ -2,14 +2,50 @@
lib, lib,
config, config,
pkgs, pkgs,
inputs,
... ...
}: { }:
let
sopsFolder = builtins.toString inputs.nix-secrets + "/sops";
customTriliumModule = builtins.fetchurl {
url = "https://raw.githubusercontent.com/TheWanderingCrow/nixpkgs/refs/heads/update-trilium-server/nixos/modules/services/web-apps/trilium.nix";
sha256 = "sha256:1y4xqwf011lkjzpn5ygmdn7chbwshha16h53hwydlx76avzsmd8j";
};
in
{
disabledModules = [
"${inputs.nixpkgs}/nixos/modules/services/web-apps/trilium.nix"
];
imports = [
customTriliumModule
];
sops.secrets = {
"trilium/oidc/id" = {
sopsFile = "${sopsFolder}/services.yaml";
};
"trilium/oidc/secret" = {
sopsFile = "${sopsFolder}/services.yaml";
};
};
sops.templates."trilium-secrets".content = ''
TRILIUM_OAUTH_ISSUER_BASE_URL=https://auth.wanderingcrow.net/.well-known/openid-configuration
TRILIUM_OAUTH_BASE_URL=https://notes.wanderingcrow.net
TRILIUM_OAUTH_CLIENT_ID=${config.sops.placeholder."trilium/oidc/id"}
TRILIUM_OAUTH_CLIENT_SECRET=${config.sops.placeholder."trilium/oidc/secret"}
TRILIUM_OAUTH_ISSUER_NAME=Pocket ID
TRILIUM_OAUTH_ISSUER_ICON=https://auth.wanderingcrow.net/api/application-images/favicon
'';
services = { services = {
trilium-server = { trilium-server = {
enable = true; enable = true;
package = pkgs.trilium-next-server; package = pkgs.trilium-next-server;
instanceName = "WanderingCrow"; instanceName = "WanderingCrow";
port = 8090; port = 8090;
environmentFile = config.sops.templates."trilium-secrets".path;
}; };
caddy = { caddy = {