diff --git a/bert/services/factorio.nix b/bert/services/factorio.nix index 10e0b27..1d832bf 100644 --- a/bert/services/factorio.nix +++ b/bert/services/factorio.nix @@ -1,14 +1,12 @@ -{ - # nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - # "factorio-headless" - # ]; - services.factorio = let - factorio-nixpkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/7e35ac30ea1d236419653182559367ecd8a30675.tar.gz") { - config.allowUnfree = true; - }; - in { +{pkgs, lib, ...}: { + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "factorio-headless" + ]; + services.factorio = { enable = true; - package = factorio-nixpkgs.factorio-headless; + package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/ab224822391f803e3b58c65f753162361e769075.tar.gz") { + config.allowUnfree = true; + }).factorio-headless; openFirewall = true; nonBlockingSaving = true; game-name = "Chandler's Factorio Server"; diff --git a/oscar/configuration.nix b/oscar/configuration.nix index 0c51647..84a43fd 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -136,7 +136,7 @@ gnome-sound-recorder inkscape josm - kate + kdePackages.kate krita kicad libreoffice-qt