From dc2fdf7773d0e286e4bce7ef6f54721c6b105600 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Wed, 4 Sep 2024 23:08:09 -0500 Subject: [PATCH] feat(dragonwell): foundryvtt Signed-off-by: jolheiser --- flake.lock | 47 ++++++++++++++++++++++++++++----- flake.nix | 5 ++++ machines/dragonwell/caddy.nix | 4 +++ machines/dragonwell/default.nix | 1 + machines/dragonwell/foundry.nix | 12 +++++++++ 5 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 machines/dragonwell/foundry.nix diff --git a/flake.lock b/flake.lock index 250ee63..848fa75 100644 --- a/flake.lock +++ b/flake.lock @@ -227,6 +227,24 @@ "type": "github" } }, + "foundry": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1724255099, + "narHash": "sha256-sFAdYSD8nq3uo/TlVBn7hmZTWU17yy1DLubmfQIQk+Q=", + "owner": "reckenrode", + "repo": "nix-foundryvtt", + "rev": "b4b1c18856bf6fead7fcc9382f47866e32b1c7a4", + "type": "github" + }, + "original": { + "owner": "reckenrode", + "repo": "nix-foundryvtt", + "type": "github" + } + }, "ghostty": { "inputs": { "nixpkgs-stable": "nixpkgs-stable", @@ -514,16 +532,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1719838683, + "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -561,6 +579,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1721562059, "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", @@ -621,6 +655,7 @@ "blog": "blog", "cfg": "cfg", "flake-utils": "flake-utils", + "foundry": "foundry", "ghostty": "ghostty", "gist": "gist", "git-age": "git-age", @@ -630,7 +665,7 @@ "helix": "helix", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nur": "nur", "resume": "resume", "tclip": "tclip", @@ -818,7 +853,7 @@ "tclip": { "inputs": { "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": [ "flake-utils" ] diff --git a/flake.nix b/flake.nix index 9012df2..55939a2 100644 --- a/flake.nix +++ b/flake.nix @@ -103,6 +103,7 @@ url = "git+https://git.xeno.science/xenofem/actual-nix.git"; inputs.nixpkgs.follows = "nixpkgs"; }; + foundry.url = "github:reckenrode/nix-foundryvtt"; tsnet-serve = { url = "git+https://git.jolheiser.com/tsnet-serve-nix.git"; inputs.nixpkgs.follows = "nixpkgs"; @@ -220,6 +221,9 @@ colmena = { meta = { nixpkgs = import nixpkgs { inherit overlays system; }; + specialArgs = { + inherit inputs; + }; }; dragonwell = { pkgs, ... }: @@ -231,6 +235,7 @@ inputs.git-pr.nixosModules.default inputs.actual.nixosModules.default inputs.tsnet-serve.nixosModules.default + inputs.foundry.nixosModules.foundryvtt ./modules/tclip ./machines/dragonwell ]; diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index 7621f1a..68fdeee 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -77,6 +77,10 @@ in "irc.jolheiser.com".extraConfig = '' reverse_proxy localhost:7658 ''; + "dnd.jolheiser.com".extraConfig = '' + reverse_proxy localhost:30000 + ''; + }; }; } diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index b661995..bde6f22 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -7,6 +7,7 @@ in ./actual.nix ./caddy.nix ./dex.nix + ./foundry.nix ./git-pr.nix ./golink.nix ./gotosocial.nix diff --git a/machines/dragonwell/foundry.nix b/machines/dragonwell/foundry.nix new file mode 100644 index 0000000..ca0ea9a --- /dev/null +++ b/machines/dragonwell/foundry.nix @@ -0,0 +1,12 @@ +{ inputs, pkgs, ... }: +{ + services.foundryvtt = { + enable = true; + hostName = "dnd.jolheiser.com"; + minifyStaticFiles = true; + proxyPort = 443; + proxySSL = true; + upnp = false; + package = inputs.foundry.packages.${pkgs.system}.foundryvtt_12; + }; +}