Add factorio

This commit is contained in:
Benjamin Bädorf 2022-10-17 15:56:48 +02:00
parent f62a1d30f9
commit 87c3630dfb
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
6 changed files with 74 additions and 4 deletions

View file

@ -322,6 +322,22 @@
"type": "github" "type": "github"
} }
}, },
"master": {
"locked": {
"lastModified": 1665245146,
"narHash": "sha256-OhAD7mOpsfHqz8OR78PirgqF3vB1fgnENYgdasbmaM0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ab92858d678818839843d19050942e841a04abd1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -497,6 +513,7 @@
"digga": "digga", "digga": "digga",
"home": "home", "home": "home",
"latest": "latest_2", "latest": "latest_2",
"master": "master",
"naersk": "naersk", "naersk": "naersk",
"nixos": "nixos", "nixos": "nixos",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",

View file

@ -10,6 +10,7 @@
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixos.url = "github:nixos/nixpkgs/nixos-22.05"; nixos.url = "github:nixos/nixpkgs/nixos-22.05";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
master.url = "github:nixos/nixpkgs/master";
pub-solar.url = "github:pub-solar/nixpkgs/fix/use-latest-unstable-yubikey-agent"; pub-solar.url = "github:pub-solar/nixpkgs/fix/use-latest-unstable-yubikey-agent";
digga.url = "github:pub-solar/digga/fix/bootstrap-iso"; digga.url = "github:pub-solar/digga/fix/bootstrap-iso";
@ -69,6 +70,7 @@
overlays = [ ]; overlays = [ ];
}; };
latest = { }; latest = { };
master = { };
}; };
lib = import ./lib { lib = digga.lib // nixos.lib; }; lib = import ./lib { lib = digga.lib // nixos.lib; };

View file

@ -8,6 +8,7 @@ in
imports = [ imports = [
./configuration.nix ./configuration.nix
./virtualisation ./virtualisation
./factorio
]; ];
config = { config = {
@ -27,6 +28,7 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wayvnc wayvnc
drone-docker-runner drone-docker-runner
stdenv.cc.cc.lib
]; ];
age.secrets."vnc-key.pem" = { age.secrets."vnc-key.pem" = {
@ -42,10 +44,16 @@ in
pub-solar.sway.vnc.enable = true; pub-solar.sway.vnc.enable = true;
pub-solar.ci-runner.enable = true; pub-solar.ci-runner.enable = true;
home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable { home-manager.users."${psCfg.user.name}" = {
"sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf; xdg.configFile = mkIf psCfg.sway.enable {
"sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf; "sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf;
"sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf; "sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf;
"sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
};
home.sessionVariables = {
NIX_CC = "${pkgs.stdenv.cc}";
};
}; };
}; };
} }

View file

@ -0,0 +1,38 @@
{ config, pkgs, lib, self, ... }:
with lib;
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
far-reach = pkgs.stdenv.mkDerivation rec {
pname = "factorio-far-reach";
version = "1.1.2";
src = ./far-reach_1.1.2.zip;
phases = [ "installPhase" ];
deps = [ ];
installPhase = ''
mkdir -p $out
cp $src far-reach_1.1.2.zip
'';
};
in
{
config = {
services.factorio = {
enable = true;
port = 34197; # The default, but make it explicit
lan = true;
admins = [
"doubtwriter"
"scottjive"
];
openFirewall = true;
autosave-interval = 3;
game-name = "Babes plays";
requireUserVerification = false;
mods = [
far-reach
];
};
};
}

Binary file not shown.

View file

@ -21,12 +21,17 @@ channels: final: prev: {
tdesktop tdesktop
arduino arduino
arduino-cli arduino-cli
steam
; ;
inherit (channels.pub-solar) inherit (channels.pub-solar)
yubikey-agent yubikey-agent
; ;
inherit (channels.master)
factorio-headless
;
haskellPackages = prev.haskellPackages.override haskellPackages = prev.haskellPackages.override
(old: { (old: {