diff --git a/config/instances/config/hledger.nix b/config/instances/config/hledger.nix index 75cc0c5..18120cc 100755 --- a/config/instances/config/hledger.nix +++ b/config/instances/config/hledger.nix @@ -1,34 +1,14 @@ -{ instancesFunctions }: let - inherit (instancesFunctions) - domain0 - servicePath - sslPath - sopsPath - ; - hledgerLabel = "Hledger"; hledgerName = "hledger"; - hledgerSubdomain = "finances"; in { label = hledgerLabel; name = hledgerName; - email = { - address0 = "noreply@${domain0}"; - }; - sops = { - path0 = "${sopsPath}/${hledgerName}"; - }; - subdomain = hledgerSubdomain; paths = { - path0 = "${servicePath}/${hledgerLabel}"; + path0 = "/mnt/media/storage/${hledgerLabel}"; }; ports = { port0 = 5000; }; - ssl = { - cert = "${sslPath}/${hledgerSubdomain}.${domain0}/fullchain.pem"; - key = "${sslPath}/${hledgerSubdomain}.${domain0}/key.pem"; - }; } diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix index 3cb6626..ff65a4a 100755 --- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix +++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix @@ -66,7 +66,7 @@ in } { name = instances.hledger.label; - url = "https://${instances.hledger.subdomain}.${instances.web.domains.url0}"; + url = "http://localhost.${builtins.toString instances.ports.port0}"; tags = [ instances.hledger.name "hledger" diff --git a/nixos/default.nix b/nixos/default.nix index 5cfa623..ae32b8f 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -60,6 +60,7 @@ in inherit (modules) syncthing ollama + hledger # plasma # sddm ; diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/hledger.nix similarity index 77% rename from nixos/modules/services/hledger.nix rename to nixos/modules/hledger.nix index 910482e..8d1f273 100755 --- a/nixos/modules/services/hledger.nix +++ b/nixos/modules/hledger.nix @@ -28,20 +28,6 @@ in ]; allow = "edit"; }; - caddy = { - virtualHosts = { - "${host}" = { - extraConfig = '' - redir /.well-known/carddav /remote.php/dav/ 301 - redir /.well-known/caldav /remote.php/dav/ 301 - - reverse_proxy ${localhost}:${toString service.ports.port0} - - tls ${service.ssl.cert} ${service.ssl.key} - ''; - }; - }; - }; }; environment = { diff --git a/nixos/modules/services/acme.nix b/nixos/modules/services/acme.nix index d3c7f76..0ddb5c4 100755 --- a/nixos/modules/services/acme.nix +++ b/nixos/modules/services/acme.nix @@ -38,24 +38,11 @@ in value = dnsConfig; }) [ - "nextcloud" "jellyfin" "minecraft" "ollama" "syncthing" "vaultwarden" - "hledger" - ] - ) - ++ (map - (service: { - name = "${instanceName service}.${domain1}"; - value = dnsConfig; - }) - [ - "nextcloud" - "matrix" - "owncast" ] ) ++ (map diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix index ce69a35..aa0e1e8 100755 --- a/nixos/modules/services/default.nix +++ b/nixos/modules/services/default.nix @@ -10,7 +10,6 @@ "logrotate" "minecraft" "ollama" - "hledger" "upRootNutrition" # "peertube" "postgresql"