1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99

diff --git a/flake.lock b/flake.lock
index 250ee63c6dd646b09bd54d67f100c31501fff3c5..848fa7536d5032a642c7bb1fa87adca401b6aabb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -227,6 +227,24 @@         "repo": "flake-utils",
         "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"
       }
@@ -562,6 +580,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=",
         "owner": "NixOS",
@@ -621,6 +655,7 @@         "bennet": "bennet",
         "blog": "blog",
         "cfg": "cfg",
         "flake-utils": "flake-utils",
+        "foundry": "foundry",
         "ghostty": "ghostty",
         "gist": "gist",
         "git-age": "git-age",
@@ -630,7 +665,7 @@         "gomodinit": "gomodinit",
         "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"
         ]

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30

diff --git a/flake.nix b/flake.nix
index 9012df212992067a3bc28ff84683ae56189f4b9a..55939a28e524fcc3e5c7af0e00389bd8c2ea64e5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -103,6 +103,7 @@     actual = {
       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.ugit.nixosModules.default
               inputs.git-pr.nixosModules.default
               inputs.actual.nixosModules.default
               inputs.tsnet-serve.nixosModules.default
+              inputs.foundry.nixosModules.foundryvtt
               ./modules/tclip
               ./machines/dragonwell
             ];

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15

diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix
index 7621f1aa8a5b0a079bdd38d76fabf060f69aa5dd..68fdeee14cc968bd31143f08df953e639fedabf4 100644
--- a/machines/dragonwell/caddy.nix
+++ b/machines/dragonwell/caddy.nix
@@ -77,6 +77,10 @@       '';
       "irc.jolheiser.com".extraConfig = ''
         reverse_proxy localhost:7658
       '';
+      "dnd.jolheiser.com".extraConfig = ''
+        reverse_proxy localhost:30000
+      '';
+
     };
   };
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index b661995785ed0267cdf45adce3ae5e4726df415a..bde6f2213be1d8d96fdfb557ed34ad2ba7b01f59 100644
--- a/machines/dragonwell/default.nix
+++ b/machines/dragonwell/default.nix
@@ -7,6 +7,7 @@   imports = [
     ./actual.nix
     ./caddy.nix
     ./dex.nix
+    ./foundry.nix
     ./git-pr.nix
     ./golink.nix
     ./gotosocial.nix

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18

diff --git a/machines/dragonwell/foundry.nix b/machines/dragonwell/foundry.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ca0ea9a3367ce0fe564d8fdf8a807a57576323a0
--- /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;
+  };
+}