loptland: cleanup

flake.lock

@@ -1465,33 +1465,33 @@
     },
     "nixpkgs-latest-factorio": {
       "locked": {
-        "lastModified": 1757278553,
-        "narHash": "sha256-NlXNDOQtUo9ed0DNKgoSRcfe1D0aQRenVhgcbPBXf44=",
-        "owner": "Daholli",
+        "lastModified": 1768319201,
+        "narHash": "sha256-mKJw6+HKC66g7yztoSMvcQo/sV7XkXWnxdEcFHqIQm8=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e880129391be2f558d6c205cfd931be338b3b707",
+        "rev": "0ec0edf1d56a143488c61c1853531534b128a882",
         "type": "github"
       },
       "original": {
-        "owner": "Daholli",
+        "owner": "nixos",
+        "ref": "master",
         "repo": "nixpkgs",
-        "rev": "e880129391be2f558d6c205cfd931be338b3b707",
         "type": "github"
       }
     },
     "nixpkgs-latest-minecraft": {
       "locked": {
-        "lastModified": 1765340982,
-        "narHash": "sha256-ScoKn82baWwHH3BwUGUwFO71N3RdKWaEjWwQHT6sesE=",
-        "owner": "ChandlerSwift",
+        "lastModified": 1768319201,
+        "narHash": "sha256-mKJw6+HKC66g7yztoSMvcQo/sV7XkXWnxdEcFHqIQm8=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "487be302ead911dc24db3068f6d9631f2db7585d",
+        "rev": "0ec0edf1d56a143488c61c1853531534b128a882",
         "type": "github"
       },
       "original": {
-        "owner": "ChandlerSwift",
+        "owner": "nixos",
+        "ref": "master",
         "repo": "nixpkgs",
-        "rev": "487be302ead911dc24db3068f6d9631f2db7585d",
         "type": "github"
       }
     },

flake.nix

@@ -3,7 +3,7 @@
 
   outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
 
-  inputs = {
+  inputs = rec {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     systems.url = "github:nix-systems/default-linux";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -16,8 +16,8 @@
     catppuccin.url = "github:catppuccin/nix";
     sops-nix.url = "github:Mic92/sops-nix";
 
-    nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/e880129391be2f558d6c205cfd931be338b3b707";
-    nixpkgs-latest-minecraft.url = "github:ChandlerSwift/nixpkgs/487be302ead911dc24db3068f6d9631f2db7585d";
+    nixpkgs-latest-factorio = nixpkgs-master;
+    nixpkgs-latest-minecraft = nixpkgs-master;
 
     home-manager = {
       url = "github:nix-community/home-manager/master";

modules/hosts/loptland/default.nix

@@ -48,7 +48,8 @@ topLevel: {
 
       services.resolved = {
         enable = true;
-        domains = [ "~." ];
+
+        settings.Resolve.Domains = [ "~." ];
       };
 
       networking.firewall.allowedTCPPorts = [

modules/server/factorio-server.nix

@@ -1,7 +1,16 @@
 {
   flake.modules.nixos.factorio-server =
-    { config, ... }:
+    {
+      config,
+      inputs,
+      pkgs,
+      ...
+    }:
     let
+      latest-factorio = import inputs.nixpkgs-latest-factorio {
+        system = pkgs.stdenv.hostPlatform.system;
+        config.allowUnfree = true;
+      };
       sopsFile = ../../secrets/secrets-loptland.yaml;
     in
     {
@@ -46,6 +55,8 @@
 
       services.factorio = {
         enable = true;
+        package = latest-factorio.factorio-headless;
+
         openFirewall = true;
         public = true;
         lan = true;

modules/server/hydra.nix

@@ -30,6 +30,8 @@
 
       services.hydra = {
         enable = true;
+        package = pkgs.hydra.overrideAttrs { stdenv = pkgs.gcc14Stdenv; };
+
         hydraURL = "http://localhost:${toString httpPort}";
         port = httpPort;
         notificationSender = "hydra@localhost";