From 1329853f26476e0e9b061d37ae23aff453570303 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Thu, 18 Apr 2024 12:12:03 +0200 Subject: [PATCH 1/4] idk --- hosts/x86_64-linux/beleth/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/x86_64-linux/beleth/default.nix b/hosts/x86_64-linux/beleth/default.nix index 35dac51..ff4bbdc 100644 --- a/hosts/x86_64-linux/beleth/default.nix +++ b/hosts/x86_64-linux/beleth/default.nix @@ -87,11 +87,15 @@ with lib; { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7UkcmSVo+SeB5Obevz3mf3UHruYxn0UHUzoOs2gDBy xqtc@asmodeus" ]; + programs.bash.blesh.enable = true; + programs.bash.shellInit = "cd /home/xqtc/nixos-config/; export GIT_REVISION_CONFIG=$(nix flake metadata --json | jq -r '.locked.rev'); echo $GIT_REVISION_CONFIG; cd;"; + environment.systemPackages = with pkgs; [ neovim vim git wget + jq ]; programs.mtr.enable = true; From 0edca31f12bc0387836e3321fe460cc24b654794 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Thu, 18 Apr 2024 13:31:42 +0200 Subject: [PATCH 2/4] updated website dir --- hosts/x86_64-linux/beleth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/x86_64-linux/beleth/default.nix b/hosts/x86_64-linux/beleth/default.nix index ff4bbdc..b94b758 100644 --- a/hosts/x86_64-linux/beleth/default.nix +++ b/hosts/x86_64-linux/beleth/default.nix @@ -22,7 +22,7 @@ with lib; { email = "xqtc@tutanota.com"; configFile = pkgs.writeText "Caddyfile" '' heroin.trade { - root * /var/www/website/build/ + root * /var/www/website/public/ file_server } syncthing.heroin.trade { From ef6b842f75ce3002da9942f5246f16992a14772d Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Thu, 18 Apr 2024 13:36:44 +0200 Subject: [PATCH 3/4] fixed caddy conf --- hosts/x86_64-linux/beleth/default.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/hosts/x86_64-linux/beleth/default.nix b/hosts/x86_64-linux/beleth/default.nix index 809d434..1f513c9 100644 --- a/hosts/x86_64-linux/beleth/default.nix +++ b/hosts/x86_64-linux/beleth/default.nix @@ -43,20 +43,6 @@ with lib; { grafana.heroin.trade { reverse_proxy http://127.0.0.1:2342 } - } - demos.heroin.trade { - root * /var/www/demos/ - file_server browse - } - jellyfin.heroin.trade { - reverse_proxy http://127.0.0.1:8096 - } - calibre.heroin.trade { - reverse_proxy http://localhost:3000 - } - grafana.heroin.trade { - reverse_proxy http://127.0.0.1:2342 - } ''; }; @@ -110,6 +96,7 @@ with lib; { git wget jq + zola ]; programs.mtr.enable = true; From ad4c919b3e2a96ab3a3919d830038289388b99ac Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Thu, 18 Apr 2024 14:57:24 +0200 Subject: [PATCH 4/4] uptime kuma --- hosts/x86_64-linux/beleth/default.nix | 4 ++++ hosts/x86_64-linux/beleth/uptime.nix | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 hosts/x86_64-linux/beleth/uptime.nix diff --git a/hosts/x86_64-linux/beleth/default.nix b/hosts/x86_64-linux/beleth/default.nix index 1f513c9..7515fda 100644 --- a/hosts/x86_64-linux/beleth/default.nix +++ b/hosts/x86_64-linux/beleth/default.nix @@ -13,6 +13,7 @@ with lib; { ./calibre-web.nix ./transmission.nix ./lanrarari.nix + ./uptime.nix ../../gc.nix ../../../common ]; @@ -43,6 +44,9 @@ with lib; { grafana.heroin.trade { reverse_proxy http://127.0.0.1:2342 } + uptime.heroin.trade { + reverse_proxy 127.0.0.1:3001 + } ''; }; diff --git a/hosts/x86_64-linux/beleth/uptime.nix b/hosts/x86_64-linux/beleth/uptime.nix new file mode 100644 index 0000000..1cc3d53 --- /dev/null +++ b/hosts/x86_64-linux/beleth/uptime.nix @@ -0,0 +1,6 @@ +{config, lib, ...}: +{ + services.uptime-kuma = { + enable = true; + }; +}