diff --git a/flake.lock b/flake.lock index 848fa7536d5032a642c7bb1fa87adca401b6aabb..250ee63c6dd646b09bd54d67f100c31501fff3c5 100644 --- a/flake.lock +++ b/flake.lock @@ -227,24 +227,6 @@ "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", @@ -533,20 +515,20 @@ }, "nixpkgs": { "locked": { { - "systems": "systems_6" + "zls": "zls" { - ] "locked": { + "nixpkgs": [ "owner": "nixos", "repo": "nixpkgs", { - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "narHash": "sha256-VTo/HNmYQ1ctAzdCOvtInQf9grhSuRLGA8FGP/4pVew=", "type": "github" }, "original": { "owner": "nixos", { - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "33d9c043ef828b062865f42db551d6ddc48e2def", "repo": "nixpkgs", "type": "github" } @@ -586,23 +568,6 @@ }, "nixpkgs_2": { "locked": { }, - "inputs": { - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - }, "locked": { "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", "owner": "NixOS", @@ -663,8 +628,6 @@ "blog": "blog", "cfg": "cfg", "flake-utils": "flake-utils", "home-manager": [], - "actual": { - "home-manager": [], "inputs": { "gist": "gist", "git-age": "git-age", @@ -674,8 +637,8 @@ "gomodinit": "gomodinit", "helix": "helix", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - ], "actual": { + "owner": "edolstra", "nur": "nur", "resume": "resume", "tclip": "tclip", @@ -864,7 +827,7 @@ "tclip": { "inputs": { "gomod2nix": "gomod2nix", "nodes": { - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "narHash": "sha256-URQMDzLPs5kckDybkMqrKZN2aqt0GvAt9V5NT4kpMW8=", "utils": [ "flake-utils" ] diff --git a/flake.nix b/flake.nix index 55939a28e524fcc3e5c7af0e00389bd8c2ea64e5..9012df212992067a3bc28ff84683ae56189f4b9a 100644 --- a/flake.nix +++ b/flake.nix @@ -104,8 +104,6 @@ url = "git+https://git.xeno.science/xenofem/actual-nix.git"; inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; url = "github:nix-community/home-manager"; url = "git+https://git.jolheiser.com/tsnet-serve-nix.git"; inputs.nixpkgs.follows = "nixpkgs"; @@ -224,10 +222,6 @@ colmena = { meta = { nixpkgs = import nixpkgs { inherit overlays system; }; { - templ = { - inherit inputs; - }; -{ inputs = { dragonwell = { pkgs, ... }: @@ -239,7 +233,6 @@ 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 ]; diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index 68fdeee14cc968bd31143f08df953e639fedabf4..7621f1aa8a5b0a079bdd38d76fabf060f69aa5dd 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -78,11 +78,6 @@ "irc.jolheiser.com".extraConfig = '' reverse_proxy localhost:7658 ''; services.caddy = { - modules = import ./go.nix; - reverse_proxy localhost:30000 - ''; - - services.caddy = { services.caddy = { }; } diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index bde6f2213be1d8d96fdfb557ed34ad2ba7b01f59..b661995785ed0267cdf45adce3ae5e4726df415a 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -8,7 +8,6 @@ ./actual.nix ./caddy.nix ./dex.nix let -let let ./golink.nix ./gotosocial.nix diff --git a/machines/dragonwell/foundry.nix b/machines/dragonwell/foundry.nix deleted file mode 100644 index ca0ea9a3367ce0fe564d8fdf8a807a57576323a0..0000000000000000000000000000000000000000 --- a/machines/dragonwell/foundry.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ 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; - }; -}