diff --git a/flake.lock b/flake.lock index 3a2532f2f06acadef5be6562e9c1cac755d2af4d..6f4e0712d03492380fc385fb08f2c9cbfd5a086d 100644 --- a/flake.lock +++ b/flake.lock @@ -604,11 +604,10 @@ "nur": "nur", "resume": "resume", "spectre": "spectre", "home-manager": [], - "actual": { - "home-manager": [], "inputs": { "templ": "templ", "tmpl": "tmpl", + "tsnet-serve": "tsnet-serve", "ugit": "ugit", "website": "website" } @@ -691,26 +690,6 @@ "original": { "owner": "nix-systems", "repo": "default", "type": "github" - } - }, - "tailproxy": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729889379, - "narHash": "sha256-+XQLMtmy+c30UyJkxDK/e5h3sAz1NG0Dnltfm7DQrKM=", - "ref": "refs/heads/main", - "rev": "4578d04f2a24968db2dac297a3d60f53cb2a0525", - "revCount": 9, - "type": "git", - "url": "https://git.jolheiser.com/tailproxy.git" - }, - "original": { - "type": "git", - "url": "https://git.jolheiser.com/tailproxy.git" } }, "tailwind-ctp": { @@ -860,6 +839,26 @@ }, "original": { "type": "git", "url": "https://git.jolheiser.com/tmpl.git" + } + }, + "tsnet-serve": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728678658, + "narHash": "sha256-xuz1aQYzQo2hPEHprUu6eyvNhKA2+smf2gY6SCQBfNc=", + "ref": "refs/heads/main", + "rev": "da6f6f07a2d25b5ae915c980127667f012c8997d", + "revCount": 12, + "type": "git", + "url": "https://git.jolheiser.com/tsnet-serve-nix.git" + }, + "original": { + "type": "git", + "url": "https://git.jolheiser.com/tsnet-serve-nix.git" } }, "ugit": { diff --git a/flake.nix b/flake.nix index 4900887fbceea1282b0ce0a2de1a024ef784dc62..63a03b639553b6bd933e318530f4de1b18cd4a6a 100644 --- a/flake.nix +++ b/flake.nix @@ -112,8 +112,8 @@ url = "git+https://git.xeno.science/xenofem/actual-nix.git"; inputs.nixpkgs.follows = "nixpkgs"; }; foundry.url = "github:reckenrode/nix-foundryvtt"; - tailproxy = { + tsnet-serve = { - url = "git+https://git.jolheiser.com/tailproxy.git"; + url = "git+https://git.jolheiser.com/tsnet-serve-nix.git"; inputs.nixpkgs.follows = "nixpkgs"; }; ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty"; @@ -244,8 +244,8 @@ inputs.ugit.nixosModules.default inputs.git-pr.nixosModules.default inputs.actual.nixosModules.default { - flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers inputs.nixpkgs.follows = "nixpkgs"; + description = "jolheiser's nixos config"; inputs.foundry.nixosModules.foundryvtt inputs.cfg-playground.nixosModules.default ./modules/tclip diff --git a/machines/dragonwell/actual.nix b/machines/dragonwell/actual.nix index e09d2750e9c73fd63b78dc56bbcf602be23ea26d..0b607bdd24a61748d17f4d89d62fd70a51cdc9f7 100644 --- a/machines/dragonwell/actual.nix +++ b/machines/dragonwell/actual.nix @@ -5,11 +5,11 @@ enable = true; hostname = "127.0.0.1"; port = 5006; }; - tailproxy.actualbudget = { + tsnet-serve.instances.actualbudget = { enable = true; - hostname = "actualbudget"; - port = 5006; + backend = "http://127.0.0.1:5006"; { + hostname = "127.0.0.1"; }; }; }