diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2026-09-23 13:37:50 -0600 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2026-09-23 13:37:50 -0600 |
| commit | d4fa3a3658f08292b9ea59df47354ff6bc996e26 (patch) | |
| tree | a70892c1ed890546c838c1a5cf8a652951ee4de4 /modules/nixos | |
| parent | aad428954749e0d2cce593a7807039dc508c2a94 (diff) | |
| parent | a4788434a1a9c8ec3afe89031f08540e36060a8c (diff) | |
Merge branch 'master' of ssh://bosco:/srv/git/.flake
Diffstat (limited to 'modules/nixos')
| -rw-r--r-- | modules/nixos/environment.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/minecraft-server.nix | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/modules/nixos/environment.nix b/modules/nixos/environment.nix index 7733123..b37c468 100644 --- a/modules/nixos/environment.nix +++ b/modules/nixos/environment.nix @@ -7,6 +7,7 @@ sessionVariables = { NIXOS_OZONE_WL = "1"; NIXPKGS_ALLOW_INSECURE = "1"; + NIXPKGS_ALLOW_UNFREE = "1"; }; variables = { # PATH = "/home/defin/.local/share/gem/ruby/3.0.0/bin:"; diff --git a/modules/nixos/minecraft-server.nix b/modules/nixos/minecraft-server.nix index f069b63..a554f8d 100644 --- a/modules/nixos/minecraft-server.nix +++ b/modules/nixos/minecraft-server.nix @@ -43,12 +43,18 @@ in { imports = [ inputs.modded-minecraft-servers.module - # inputs.nix-minecraft.nixosModules.minecraft-servers + inputs.nix-minecraft.nixosModules.minecraft-servers ]; # services.minecraft-servers = { # enable = true; # eula = true; # openFirewall = true; + # servers.wizard-full-scale = { + # enable = true; + # serverProperties = defaults // { + # server-port = + # }; + # }; # servers.deceasedcraft-beta = { # enable = true; # package = pkgs.neoforgeServers.neoforge-1_20_1; |