From 39b51f1ecd1b5d2e6c21fbc4918910dc74a381b4 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Sun, 16 Nov 2025 15:35:37 +0100 Subject: [PATCH] Fixing factorio --- flake.lock | 29 +++++++++++++++++++++------ flake.nix | 5 ++++- modules/common/default.nix | 16 +++++++-------- modules/server/kalif/default.nix | 3 ++- secrets/zora/services/kalif-conf.age | Bin 364 -> 3955 bytes users/lyes/desktop/packages.nix | 8 ++++---- 6 files changed, 41 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 6bb110b..b2111c2 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1762740199, - "narHash": "sha256-B8aMgLj5moqKVDlgxo29Ef2jX9SsUkAQhJalpI9MNgA=", + "lastModified": 1763301607, + "narHash": "sha256-wkebuzYU9QjHeAKJqC835+YFUscbnuZwJu+zlrlKwYo=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b633223a33f6aa2a81a8f65ed056be4234bd0822", + "rev": "db66559815a14fb182e5efa384a26e1998cec978", "type": "gitlab" }, "original": { @@ -357,6 +357,22 @@ "type": "github" } }, + "pin-factorio": { + "locked": { + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -369,6 +385,7 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", + "pin-factorio": "pin-factorio", "zen-browser": "zen-browser" } }, @@ -393,11 +410,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1763214567, - "narHash": "sha256-BDRSWvXGoKq1oHSjl+HLAq7I8ZL90ZhW3fDB3cl7LJk=", + "lastModified": 1763291754, + "narHash": "sha256-SbiRtAX4Ir+RJH3SMYmaAh5e9t8rrem32neU04IMO+Q=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0bfb3939813d5da9e198de6d4cc1e2afc38a7021", + "rev": "b9930dc4336afb58ea318566d7a59d9c6aca5b83", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ba808f8..588f7ae 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "Lyes' nix files"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; @@ -28,6 +27,10 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + # Pins + # Factorio 2.0.72 + pin-factorio.url = "github:NixOS/nixpkgs?rev=c5ae371f1a6a7fd27823bc500d9390b38c05fa55"; }; outputs = { self, nixpkgs, mailserver, ... }@inputs: { diff --git a/modules/common/default.nix b/modules/common/default.nix index ce5a3b1..02973a0 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -1,4 +1,4 @@ -{ nixpkgs-unstable, nixpkgs-stable, ... }: +{ nixpkgs-unstable, nixpkgs-stable, pin-factorio, ... }: { imports = @@ -13,13 +13,6 @@ local = import ../../pkgs { pkgs = final; }; }) - # # Stable - # (final: prev: { - # stable = import nixpkgs-stable { - # system = prev.system; - # }; - # }) - # Unstable (final: prev: { unstable = import nixpkgs-unstable { @@ -33,6 +26,13 @@ system = prev.system; }; }) + + # Pins + (final: prev: { + pin = { + factorio = import pin-factorio { system = prev.system; }; + }; + }) ]; nixpkgs.config = { diff --git a/modules/server/kalif/default.nix b/modules/server/kalif/default.nix index f273ad9..ae4a9d2 100644 --- a/modules/server/kalif/default.nix +++ b/modules/server/kalif/default.nix @@ -1,8 +1,9 @@ -{ config, ... }: +{ config, pkgs, ... }: { services.factorio = { enable = true; + package = pkgs.pin.factorio-headless; openFirewall = true; extraSettingsFile = config.age.secrets.kalif-conf.path; game-name = "Factorio :3 - Kalif - Zora"; diff --git a/secrets/zora/services/kalif-conf.age b/secrets/zora/services/kalif-conf.age index b31a76db388caec1cc4d9bf0cc7b6414801003af..aed904696f96316c8805c93c0f45ab1991c55c7e 100644 GIT binary patch literal 3955 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

FW8|J^&>!q?3^9GTlX zRiUV+XZqaE5WhUNrw?<0RL+`@=7}=J>*j5;`MDwDL0;eE^Z!eGSFJJs!@t@1c;1EmLVG^!Ghex! zXLp%3^R-6TEh!;NJzUz^z6ZHfL?SPXnYw>33piJrD-%@1cc*pj|AWl8c{gnCI{8MG zojIb;*=^@z_wIuKnV*#3XH_TWZ4%xf5|}Cz>FLoRZ@*#sm!A*YWBipSGAy~AaVX|D zvyVCxhl=5S4wlK^&*XPix4!8vGv2ejq^S7hTdz;DCuTZVU-DzTejzub!CZ6E5^jq{ z>d$AFG0uu!eKP#c>EKN^d9N?exoRl1a{s1$qo{&;vs&Z&4)vEatht~6q5NW6^(onT zl9xIao!>qP^JQbP5ny{#%N*e)=H{aJpE~w3-sD)Ty{*zCKhp8}{-QFA{ygTV8P%pc=6}^t{=90fobSt- z2e#$4yF_QclAWJ2VMg3mm#76=Nw3yNpStw0GFw0~@bj^k+JV<<(=7N61OHBZ`=GH? zU`on+CE;T3<<88%#9f#+I=FPE;JLUD11 zZfc5=si~o*LWo;ox@WpVo{LF(Xox|+etMN@dSaq+R(+UZZdIvqPmXo*{(tD{+Xh+$PwhKsRFVSq)DkzrM3N?KS*c%)e| zm#(g^f?<-2NwRyMMUs(0L1;jPUv8Oyd2V7sRfL&-xod&9my4%QRARn+rH7{@7mG;M z8%dkBkxoAn6a8lUn_HSKn#7m