diff --git a/flake.nix b/flake.nix index 50709b2..3fd2f13 100644 --- a/flake.nix +++ b/flake.nix @@ -18,8 +18,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs-borg.url = "github:cything/nixpkgs/borg"; - nixpkgs-btrbk.url = "github:cything/nixpkgs/btrbk"; + nixpkgs-borg.url = "github:cything/nixpkgs/borg"; # unmerged PR + nixpkgs-btrbk.url = "github:cything/nixpkgs/btrbk"; # unmerged PR }; outputs = @@ -78,8 +78,7 @@ programs.nixfmt.enable = true; programs.stylua.enable = true; programs.yamlfmt.enable = true; - # sops does its own formatting - settings.formatter.yamlfmt.excludes = [ "secrets/*" ]; + settings.formatter.yamlfmt.excludes = [ "secrets/*" ]; # sops does its own formatting } ); in diff --git a/hosts/chunk/Caddyfile b/hosts/chunk/Caddyfile index c1b1478..201116d 100644 --- a/hosts/chunk/Caddyfile +++ b/hosts/chunk/Caddyfile @@ -41,11 +41,6 @@ dns.cything.io { reverse_proxy localhost:8082 } -ntfy.cything.io { - import common - reverse_proxy localhost:8083 -} - pad.cything.io { import common reverse_proxy localhost:8085 diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 4f9b932..de77934 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -17,7 +17,6 @@ ./adguard.nix ./hedgedoc.nix ./miniflux.nix - ./ntfy.nix ./redlib.nix ./vaultwarden.nix ./wireguard.nix diff --git a/hosts/titan/Caddyfile b/hosts/titan/Caddyfile index c2bba40..25c6f4b 100644 --- a/hosts/titan/Caddyfile +++ b/hosts/titan/Caddyfile @@ -25,3 +25,8 @@ www.cything.io { import common redir https://cything.io{uri} permanent } + +ntfy.cything.io { + import common + reverse_proxy localhost:8083 +} diff --git a/hosts/titan/default.nix b/hosts/titan/default.nix index bccde49..52d5629 100644 --- a/hosts/titan/default.nix +++ b/hosts/titan/default.nix @@ -13,6 +13,7 @@ ./disk-config.nix ./hardware-configuration.nix ./ghost.nix + ./ntfy.nix ]; sops.age.keyFile = "/root/.config/sops/age/keys.txt"; diff --git a/hosts/chunk/ntfy.nix b/hosts/titan/ntfy.nix similarity index 100% rename from hosts/chunk/ntfy.nix rename to hosts/titan/ntfy.nix