Update from updated-inputs-2024-12-10-02-03

flake.lock

@@ -347,11 +347,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732477156,
+        "lastModified": 1733765838,
-        "narHash": "sha256-Cpw9YtpnZpVz5gcuiJO6rpJjLvS9O/Y8AuRt3/NFz1w=",
+        "narHash": "sha256-piKf5W1vUl4y36WuW/192LMXBJyATBF83T9YEz9K3/Y=",
         "ref": "refs/heads/main",
-        "rev": "f727e7f9717bebb13f80dfb6d6a92afe5284ffdf",
+        "rev": "b0c07f95146d85a7b62a84fb2a62a773a5942733",
-        "revCount": 14,
+        "revCount": 17,
         "type": "git",
         "url": "https://git.clerie.de/clerie/scan-to-gpg.git"
       },

flake.nix

@@ -126,6 +126,7 @@
         clerie-sops-config
         clerie-sops-edit
         chromium-incognito
+        factorio-launcher
         git-checkout-github-pr
         git-diff-word
         git-pp

hosts/carbon/ppp.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, utils, ... }:
+{ config, pkgs, lib, ... }:
 
 {
 
@@ -44,12 +44,15 @@
       cat ${config.sops.secrets.pppd-dtagdsl-secrets.path} > /etc/ppp/chap-secrets
     '';
 
-    preStartFile = utils.systemdUtils.lib.makeJobScript "pppd-dtagdsl-pre-start" preStart;
+    preStartFile = pkgs.writeShellApplication {
+      name = "pppd-dtagdsl-pre-start";
+      text = preStart;
+    };
   in {
     EnvironmentFile = config.sops.secrets.pppd-dtagdsl-username.path;
     ExecStartPre = [
       # "+" marks script to be executed without priviledge restrictions
-      "+${preStartFile}"
+      "+${lib.getExe preStartFile}"
     ];
   };
 

hosts/krypton/programs.nix

@@ -29,6 +29,8 @@
     chromium-incognito
 
     print-afra
+
+    factorio-launcher
   ];
 
   # Wireshark

hosts/zinc/programs.nix

@@ -9,6 +9,8 @@
     #cura # libarcus library is currently broken, required for curaengine
 
     mumble
+
+    factorio-launcher
   ];
 
 }

pkgs/factorio-launcher/default.nix

@@ -0,0 +1,25 @@
+{ pkgs, lib, ... }:
+
+pkgs.buildFHSEnv {
+  name = "factorio-launcher";
+  targetPkgs = pkgs: (with pkgs; [
+        alsa-lib
+        libGL
+        libpulseaudio
+        libxkbcommon
+        wayland
+  ]) ++ (with pkgs.xorg; [
+        libICE
+        libSM
+        libX11
+        libXcursor
+        libXext
+        libXi
+        libXinerama
+        libXrandr
+  ]);
+  runScript = lib.getExe (pkgs.writeShellApplication {
+    name = "launch-factorio";
+    text = builtins.readFile ./launch-factorio.sh;
+  });
+}

pkgs/factorio-launcher/launch-factorio.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ $# -eq 0 ]]; then
+	echo "Pass path to factorio install directory as first argument"
+	exit 1
+fi
+
+FACTORIO_BINARY_PATH=""
+
+for suffix in "" "/factorio" "/x64/factorio" "/bin/x64/factorio" "/factorio/bin/x64/factorio"; do
+	if [[ -f "$1${suffix}" && -x "$1${suffix}" ]]; then
+		FACTORIO_BINARY_PATH="$1${suffix}"
+		break
+	fi
+done
+
+if [[ -z $FACTORIO_BINARY_PATH ]]; then
+	echo "No factorio executable found below $1"
+	exit 1
+fi
+
+shift
+
+set -- "${FACTORIO_BINARY_PATH}" "$@"
+
+exec "$@"

pkgs/overlay.nix

@@ -7,6 +7,7 @@ final: prev: {
   clerie-sops-edit = final.callPackage ./clerie-sops/clerie-sops-edit.nix {};
   clerie-update-nixfiles = final.callPackage ./clerie-update-nixfiles/clerie-update-nixfiles.nix {};
   chromium-incognito = final.callPackage ./chromium-incognito {};
+  factorio-launcher = final.callPackage ./factorio-launcher {};
   git-checkout-github-pr = final.callPackage ./git-checkout-github-pr {};
   git-diff-word = final.callPackage ./git-diff-word {};
   git-pp = final.callPackage ./git-pp {};