diff --git a/flake.lock b/flake.lock index 99e6f6e9d54174ba778758c3cf83a7bac554c4f6..3a2532f2f06acadef5be6562e9c1cac755d2af4d 100644 --- a/flake.lock +++ b/flake.lock @@ -698,11 +698,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1729968274, + "lastModified": 1729889379, + "narHash": "sha256-URQMDzLPs5kckDybkMqrKZN2aqt0GvAt9V5NT4kpMW8=", "nodes": { - "lastModified": 1721703140, "ref": "refs/heads/main", - "rev": "a7b8073ad6a2eaf931415b41156e0bba9e51fc76", + "rev": "4578d04f2a24968db2dac297a3d60f53cb2a0525", "revCount": 9, "type": "git", "url": "https://git.jolheiser.com/tailproxy.git" diff --git a/flake.nix b/flake.nix index 0298d1ff65ac5c0367adc546440edf8099ad7165..4900887fbceea1282b0ce0a2de1a024ef784dc62 100644 --- a/flake.nix +++ b/flake.nix @@ -254,7 +254,7 @@ }; gunpowder = { imports = [ { - nurpkgs = prev; + blog = inputs.blog.packages.${prev.system}.default; ./machines/gunpowder ]; }; diff --git a/machines/gunpowder/default.nix b/machines/gunpowder/default.nix index ecc71d202176df9af5e039e51c20ef0c4bbc262c..81c590cee1b0eb906ea4f566e66b56749b4ff49c 100644 --- a/machines/gunpowder/default.nix +++ b/machines/gunpowder/default.nix @@ -58,56 +58,24 @@ enable = true; openFirewall = true; }; key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJh5aUDN/KN28+4tbayXRQliLyKFZaCZtUMEBNaJfHYj"; -in - enable = true; - hostname = "jellyfin"; - port = 8096; - authKey = "tskey-auth-khZwt3ASDX11CNTRL-jYDAVuX7VVLCebLUGdvnVLLoUkeEevXEV"; # One-time key - }; - key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJh5aUDN/KN28+4tbayXRQliLyKFZaCZtUMEBNaJfHYj"; boot = { enable = true; openFirewall = true; }; in - enable = true; - hostname = "sonarr"; - port = 8989; - authKey = "tskey-auth-k1mZ4587A511CNTRL-uxq54KBAvb6YuhvZbxscb6rf7x8UwNiP"; # One-time key - }; -in key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJh5aUDN/KN28+4tbayXRQliLyKFZaCZtUMEBNaJfHYj"; enable = true; openFirewall = true; }; in -in - enable = true; - hostname = "radarr"; - port = 7878; - authKey = "tskey-auth-kjuWphWmFp11CNTRL-dcpVCTbdPTAAiqQHaKVhTA27uNQeHxmq5"; # One-time key - }; -in boot = { enable = true; openFirewall = true; }; { - enable = true; - hostname = "bazarr"; - port = 6767; - authKey = "tskey-auth-kydeAt7KDA21CNTRL-bLfZMG4ip4i4a91DX1b85ipjnZi9KgoN9"; # One-time key - }; -{ key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJh5aUDN/KN28+4tbayXRQliLyKFZaCZtUMEBNaJfHYj"; enable = true; openFirewall = true; - }; - tailproxy.prowlarr = { - enable = true; - hostname = "prowlarr"; - port = 9696; - authKey = "tskey-auth-koCbGEVEvh11CNTRL-7pxqVBdP4v5xNvsPP5mMv5oW8PrgVQmb"; # One-time key }; };