diff --git a/flake.nix b/flake.nix index bfda564..53e8f5b 100644 --- a/flake.nix +++ b/flake.nix @@ -69,17 +69,17 @@ }; "seraphim" = lib.nixosSystem { system = "x86_64-linux"; - modules = [./hosts/x86_64-linux/seraphim ]; + modules = [./hosts/x86_64-linux/seraphim]; specialArgs = {inherit inputs;}; }; "lilith" = lib.nixosSystem { system = "x86_64-linux"; - modules = [./hosts/x86_64-linux/lilith ]; + modules = [./hosts/x86_64-linux/lilith]; specialArgs = {inherit inputs;}; }; "lambda" = lib.nixosSystem { system = "x86_64-linux"; - modules = [./hosts/x86_64-linux/lambda ]; + modules = [./hosts/x86_64-linux/lambda]; specialArgs = {inherit inputs;}; }; "beleth" = lib.nixosSystem { @@ -89,7 +89,7 @@ }; "alastor" = lib.nixosSystem { system = "aarch64-linux"; - modules = [./hosts/aarch64-linux/alastor {nixpkgs.overlays = [inputs.nixos-aarch64-widevine.overlays.default];} ]; + modules = [./hosts/aarch64-linux/alastor {nixpkgs.overlays = [inputs.nixos-aarch64-widevine.overlays.default];}]; specialArgs = {inherit inputs;}; }; }; diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix index dd54644..6d2bf84 100644 --- a/home/modules/nixvim.nix +++ b/home/modules/nixvim.nix @@ -68,7 +68,7 @@ }; }; }; - rustaceanvim.settings.server.default_settings.rust-analyzer.diagnostics.disabled = [ "inactive-code" ]; + rustaceanvim.settings.server.default_settings.rust-analyzer.diagnostics.disabled = ["inactive-code"]; lsp = { enable = true; inlayHints = true; diff --git a/hosts/x86_64-linux/beleth/default.nix b/hosts/x86_64-linux/beleth/default.nix index 8c00754..13a4cc7 100644 --- a/hosts/x86_64-linux/beleth/default.nix +++ b/hosts/x86_64-linux/beleth/default.nix @@ -14,6 +14,7 @@ with lib; { ./transmission.nix ./fail2ban.nix ./lanrarari.nix + ./hydra.nix ./uptime.nix ./networking.nix ./git.nix @@ -29,44 +30,6 @@ with lib; { services.caddy = { enable = true; email = "xqtc@tutanota.com"; - # configFile = pkgs.writeText "Caddyfile" '' - # heroin.trade { - # root * /var/www/website/public/ - # handle_errors { - # rewrite * /404.html - # file_server - # } - # file_server - # } - # syncthing.heroin.trade { - # reverse_proxy http://localhost:8384 { - # header_up Host {upstream_hostport} - # } - # } - # demos.heroin.trade { - # root * /var/www/demos/ - # file_server browse - # } - # git.heroin.trade { - # reverse_proxy http://localhost:3002 - # } - # - # 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 - # } - # - # uptime.heroin.trade { - # reverse_proxy 127.0.0.1:3001 - # } - # ''; virtualHosts = { "heroin.trade" = { extraConfig = '' @@ -78,15 +41,20 @@ with lib; { file_server ''; }; + "hydra.heroin.trade" = { + extraConfig = '' + reverse_proxy http://localhost:${builtins.toString config.services.hydra.port} + ''; + }; "cheats-rs.heroin.trade" = { - extraConfig = '' - root * /var/www/cheats-rs/public/ - handle_errors { - rewrite * /404.html - file_server - } - file_server - ''; + extraConfig = '' + root * /var/www/cheats-rs/public/ + handle_errors { + rewrite * /404.html + file_server + } + file_server + ''; }; "syncthing.heroin.trade" = { extraConfig = '' diff --git a/hosts/x86_64-linux/beleth/hydra.nix b/hosts/x86_64-linux/beleth/hydra.nix new file mode 100644 index 0000000..ca3fa1b --- /dev/null +++ b/hosts/x86_64-linux/beleth/hydra.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + ... +}: { + services.hydra = { + enable = true; + hydraURL = "https://hydra.heroin.trade"; + port = 3003; + useSubstitutes = true; + notificationSender = "hydra@localhost"; + }; + + nix.buildMachines = [ + { + hostName = "localhost"; + system = "x86_64-linux"; + supportedFeatures = ["kvm" "nixos-test" "big-parallel" "benchmark"]; + maxJobs = 8; + } + ]; +}