diff --git a/flake.nix b/flake.nix index f728245..c2860a7 100644 --- a/flake.nix +++ b/flake.nix @@ -12,9 +12,17 @@ let pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs-unstable = nixpkgs-unstable.legacyPackages.x86_64-linux; + defaultModuleArgs = { pkgs, ... }: { + _module.args.pkgs-unstable = import nixpkgs-unstable { + inherit (pkgs.stdenv.targetPlatform) system; + config.allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [ + "minecraft-server" + ]; + }; + }; in { - devShell.x86_64-linux = pkgs.mkShell { + devShells.x86_64-linux.default = pkgs.mkShell { sopsPGPKeyDirs = [ "./keys/hosts" "./keys/users" @@ -71,6 +79,7 @@ storage1 = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ + defaultModuleArgs sops-nix.nixosModules.sops simple-nixos-mailserver.nixosModule ./profiles/storage.nix diff --git a/profiles/storage.nix b/profiles/storage.nix index a45aad4..e69bc4f 100644 --- a/profiles/storage.nix +++ b/profiles/storage.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, pkgs-unstable, ... }: { imports = [ ../environment.nix @@ -65,10 +65,9 @@ if failed port 443 protocol https with timeout 20 seconds then alert ''; - - nixpkgs.config.allowUnfree = true; services.minecraft-server = { enable = true; + package = pkgs-unstable.minecraft-server; eula = true; openFirewall = true; declarative = true;