diff --git a/hosts/magnesium/persistence.nix b/hosts/magnesium/persistence.nix index 5fc03d5..9746b37 100644 --- a/hosts/magnesium/persistence.nix +++ b/hosts/magnesium/persistence.nix @@ -32,6 +32,12 @@ "/var/lib/hedgedoc" "/var/lib/nixos" "/var/lib/private/ntfy-sh" + { + directory = "/var/lib/trilium"; + user = "trilium"; + group = "trilium"; + mode = "u=rwx,g=rx,o="; + } ]; }; } diff --git a/hosts/magnesium/ports.nix b/hosts/magnesium/ports.nix index a2cc556..8956bca 100644 --- a/hosts/magnesium/ports.nix +++ b/hosts/magnesium/ports.nix @@ -10,5 +10,6 @@ custom-utils.validatePortAttrset { nginx-http.tcp = 80; nginx-https.tcp = 443; ntfy.tcp = 12474; + trilium.tcp = 12783; wireguard-public-ip-tunnel.udp = 51000; } diff --git a/hosts/magnesium/services/default.nix b/hosts/magnesium/services/default.nix index 33736cb..b4fdf50 100644 --- a/hosts/magnesium/services/default.nix +++ b/hosts/magnesium/services/default.nix @@ -6,6 +6,7 @@ ./hedgedoc.nix ./ntfy.nix ./public-ip-tunnel.nix + ./trilium.nix ./webserver.nix ]; } diff --git a/hosts/magnesium/services/trilium.nix b/hosts/magnesium/services/trilium.nix new file mode 100644 index 0000000..0546897 --- /dev/null +++ b/hosts/magnesium/services/trilium.nix @@ -0,0 +1,23 @@ +args@{ config, lib, pkgs, custom-utils, ... }: + +let + ports = import ../ports.nix args; + domain = "notes.jalr.de"; +in +{ + services.trilium-server = { + enable = true; + package = pkgs.master.trilium-next-server; + host = "127.0.0.1"; + port = ports.trilium.tcp; + nginx = { + enable = true; + hostName = domain; + }; + }; + + services.nginx.virtualHosts."${domain}" = { + enableACME = true; + forceSSL = true; + }; +} diff --git a/users/jalr/modules/default.nix b/users/jalr/modules/default.nix index 2d910b0..b0657d1 100644 --- a/users/jalr/modules/default.nix +++ b/users/jalr/modules/default.nix @@ -38,6 +38,7 @@ ./thunderbird.nix ./tmux.nix ./tor-browser.nix + ./trilium.nix ./vdirsyncer.nix ./vesc-tool.nix ]; diff --git a/users/jalr/modules/trilium.nix b/users/jalr/modules/trilium.nix new file mode 100644 index 0000000..b219820 --- /dev/null +++ b/users/jalr/modules/trilium.nix @@ -0,0 +1,6 @@ +{ nixosConfig, lib, pkgs, ... }: +lib.mkIf nixosConfig.jalr.gui.enable { + home.packages = with pkgs.master; [ + trilium-next-desktop + ]; +}