Fixing factorio
This commit is contained in:
parent
3f7aa7c2e3
commit
39b51f1ecd
6 changed files with 41 additions and 20 deletions
29
flake.lock
generated
29
flake.lock
generated
|
|
@ -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": {
|
||||
|
|
|
|||
|
|
@ -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: {
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -72,7 +72,7 @@ in {
|
|||
parsec-bin
|
||||
# unstable.suyu
|
||||
# suyu
|
||||
# factorio
|
||||
pin.factorio.factorio
|
||||
sgt-puzzles
|
||||
|
||||
# Reading
|
||||
|
|
@ -150,9 +150,9 @@ in {
|
|||
libopus
|
||||
];
|
||||
|
||||
# system.extraDependencies = with pkgs; [
|
||||
# factorio.src
|
||||
# ];
|
||||
system.extraDependencies = with pkgs; [
|
||||
factorio.src
|
||||
];
|
||||
|
||||
# Flatpaks
|
||||
services.flatpak = lib.mkIf (config?services.flatpak.packages) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue