diff --git a/flake.lock b/flake.lock index cd4b4c2f13d5f200c5a3c283c081ccb8b4543eac..e291aef7b1c990f06c98032a6970bd2a74cde35c 100644 --- a/flake.lock +++ b/flake.lock @@ -41,6 +41,22 @@ "type": "git", "url": "https://git.jolheiser.com/bennet.git" } }, + "beszel": { + "locked": { + "lastModified": 1742939577, + "narHash": "sha256-uia88Accp/sOZk5C0PMBQsImDE6KJ1J/hyM7W/58cnA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3755166bcb88619f292c885831cfef6485fff014", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3755166bcb88619f292c885831cfef6485fff014", + "type": "github" + } + }, "blog": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -420,11 +436,11 @@ } }, "nixpkgs_13": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -726,6 +742,7 @@ "root": { "inputs": { "agenix": "agenix", "bennet": "bennet", + "beszel": "beszel", "blog": "blog", "cfg-playground": "cfg-playground", "forge-lines": "forge-lines", diff --git a/flake.nix b/flake.nix index da62d063bcc5a3b86d9bc6a84d8368bcd6a35649..b7754f6f81a339d8609a5dbdc7640de3032ad32e 100644 --- a/flake.nix +++ b/flake.nix @@ -29,11 +29,13 @@ foundry.url = "github:reckenrode/nix-foundryvtt"; tailproxy.url = "git+https://git.jolheiser.com/tailproxy.git"; forge-lines.url = "git+https://code.winston.sh/winston/forge-lines.git"; mazanoke.url = "github:jolheiser/mazanoke-nix"; + beszel.url = "github:nixos/nixpkgs/3755166bcb88619f292c885831cfef6485fff014"; }; outputs = { nixpkgs, + beszel, home-manager, nixos-hardware, agenix, @@ -65,6 +67,8 @@ }) ]; system = "x86_64-linux"; pkgs = import inputs.nixpkgs { inherit system; }; + beszelHub = "${beszel}/nixos/modules/services/monitoring/beszel-hub.nix"; + beszelAgent = "${beszel}/nixos/modules/services/monitoring/beszel-agent.nix"; in { colmena = { @@ -86,15 +90,18 @@ inputs.forge-lines.nixosModules.default ./modules/miniserve ./modules/git-bug ./dragonwell + beszelAgent ]; jasmine.imports = [ inputs.agenix.nixosModules.default ./jasmine + beszelAgent ]; gunpowder.imports = [ inputs.agenix.nixosModules.default inputs.tailproxy.nixosModules.default ./gunpowder + beszelAgent ]; shincha = { pkgs, ... }: @@ -108,6 +115,8 @@ inputs.tailproxy.nixosModules.default inputs.oidc.nixosModules.default ./modules/tclip ./shincha + beszelHub + beszelAgent ]; services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd; };