diff --git a/hosts/harbor/configuration.nix b/hosts/harbor/configuration.nix index 2e84ddb..a79bd2c 100644 --- a/hosts/harbor/configuration.nix +++ b/hosts/harbor/configuration.nix @@ -66,8 +66,6 @@ }; # hive modules - hive.virt-manager.enable = true; - hive.virt-manager.forUsers = ["jonas"]; hive.gitea-instance.enable = true; hive.gitea-instance.nativeRunner = true; hive.gitea-instance.instanceFQDN = "git.jroeger.de"; diff --git a/modules/networking/wireguard/server.nix b/modules/networking/wireguard/server.nix index e34d67a..a1a868f 100644 --- a/modules/networking/wireguard/server.nix +++ b/modules/networking/wireguard/server.nix @@ -6,7 +6,7 @@ ... }: let cfg = config.hive.wg.server; - peers = import ./peers.nix {inherit lib;}; + peers = import ./_peers.nix {inherit lib;}; in { options.hive.wg.server = { enable = lib.mkEnableOption "Enable WireGuard server"; diff --git a/modules/services/minecraft-server/minecraft-server.nix b/modules/services/minecraft-server/minecraft-server.nix index 7b28a29..6d00606 100644 --- a/modules/services/minecraft-server/minecraft-server.nix +++ b/modules/services/minecraft-server/minecraft-server.nix @@ -1,4 +1,4 @@ -{ +{inputs, ...}: { flake.nixosModules.minecraft-server = { config, pkgs, @@ -21,7 +21,14 @@ enable = lib.mkEnableOption "Enable BMC3 server"; }; + imports = [ + inputs.nix-minecraft.nixosModules.minecraft-servers + ]; + config = lib.mkIf cfg.enable { + nixpkgs.overlays = [ + inputs.nix-minecraft.overlay + ]; services.minecraft-servers = { enable = true; eula = true;