From b93f7d5b6698e579b57b39d3752ab232cad9d413 Mon Sep 17 00:00:00 2001 From: niten Date: Wed, 24 May 2023 13:06:35 -0700 Subject: [PATCH] Updates --- config/host-config/toothless/factorio.nix | 17 +++- config/profile-config/common-ui.nix | 7 +- config/service/metrics.nix | 2 - config/service/tattler.nix | 2 +- flake.lock | 114 +++++++++++----------- 5 files changed, 74 insertions(+), 68 deletions(-) diff --git a/config/host-config/toothless/factorio.nix b/config/host-config/toothless/factorio.nix index 424bc05..37649d6 100644 --- a/config/host-config/toothless/factorio.nix +++ b/config/host-config/toothless/factorio.nix @@ -90,13 +90,15 @@ let seed = (toString worldGenSeed); }; + stateDirName = "citadel"; + in { config = { services.factorio = { enable = true; # 'factorio' points to an old game - stateDirName = "krastorio2"; + inherit stateDirName; package = pkgs.factorio-headless-experimental.override { username = "fudoniten"; @@ -115,12 +117,12 @@ in { loadLatestSave = true; mods = with mods; [ alien-biomes - aircraft - armored-biters + # aircraft + #armored-biters bottleneck bullet-trails fluid-must-flow - krastorio2 + #krastorio2 # industrial-revolution-2 larger-lamps stackers @@ -128,6 +130,13 @@ in { ]; }; + fileSystems = { + "/var/lib/private/${stateDirName}" = { + device = "/state/services/factorio/${stateDirName}"; + options = [ "bind" ]; + }; + }; + systemd.services.factorio = let cfg = config.services.factorio; serverSettings = { diff --git a/config/profile-config/common-ui.nix b/config/profile-config/common-ui.nix index cc99e4e..7224b53 100644 --- a/config/profile-config/common-ui.nix +++ b/config/profile-config/common-ui.nix @@ -92,14 +92,14 @@ in { # Stupid hack home-manager.users = { jasper.home.packages = let - factorio = pkgs.factorio.override { + factorio = pkgs.factorio-experimental.override { username = "Exceeding9987"; token = lib.removeSuffix "\n" (readFile config.fudo.secrets.files.blobs."factorio-token-exceeding9987.txt"); }; in [ factorio ]; niten.home.packages = let - factorio = pkgs.factorio.override { + factorio = pkgs.factorio-experimental.override { username = "fudoniten"; token = lib.removeSuffix "\n" (readFile config.fudo.secrets.files.blobs."factorio-token-fudoniten.txt"); @@ -107,6 +107,5 @@ in { in [ factorio ]; }; - fudo.services.tattler.enable-notifications = - trace "${hostname}: ${toString enable-gui}" enable-gui; + fudo.services.tattler.enable-notifications = enable-gui; } diff --git a/config/service/metrics.nix b/config/service/metrics.nix index c2188d4..b049b2a 100644 --- a/config/service/metrics.nix +++ b/config/service/metrics.nix @@ -6,8 +6,6 @@ let domain-name = config.fudo.hosts.${hostname}.domain; domain = config.fudo.domains.${domain-name}; - pthru = obj: builtins.trace "TRACE(${hostname}): ${toString obj}" obj; - host-secrets = config.fudo.secrets.host-secrets.${hostname}; notEmpty = lst: (length lst) > 0; diff --git a/config/service/tattler.nix b/config/service/tattler.nix index f557167..96938af 100644 --- a/config/service/tattler.nix +++ b/config/service/tattler.nix @@ -90,7 +90,7 @@ in { }; }; tattler = mkIf cfg.enable-notifications { - enable = false; + enable = true; verbose = true; notification-topic = cfg.notification-topic; mqtt = { diff --git a/flake.lock b/flake.lock index b2db513..d9bdb8a 100644 --- a/flake.lock +++ b/flake.lock @@ -1244,11 +1244,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1682645493, - "narHash": "sha256-U3TqEcBM7QSqX0B9vQYIdB/9Ls7SE6BzM4XNDpM0Lpg=", + "lastModified": 1683249650, + "narHash": "sha256-NwBzz2CHNtT0oDqAGewByQ5OFnAWf+ewHUrK0F44xZk=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "33db1786e0352cad4227fb931ac96c4e2e89de29", + "rev": "588ccf37fa9eb9d2ec787b91c989dcd6892983e9", "type": "github" }, "original": { @@ -2059,11 +2059,11 @@ ] }, "locked": { - "lastModified": 1683143741, - "narHash": "sha256-2YQHxCyZlaoq9Fy1deEGnMNIHYvqO3zOWvMo2kPpnHc=", + "lastModified": 1684879375, + "narHash": "sha256-Zr5Ko0Z0DBuTlkt18JKUost5llWBWeYiHyZLm8T5jC8=", "ref": "refs/heads/master", - "rev": "032191b23a81e1ea40ffe05e37f11a50fdffe030", - "revCount": 327, + "rev": "be74e07d94622d3bf9c3ebd6b9a840ed7e5b78bd", + "revCount": 333, "type": "git", "url": "https://git.fudo.org/fudo-nix/home.git" }, @@ -2123,11 +2123,11 @@ "unstableNixpkgs": "unstableNixpkgs" }, "locked": { - "lastModified": 1682384116, - "narHash": "sha256-84ZunYHCAKR9+kA2v3HBxqmoU225uJcptt+6YKtgWnE=", + "lastModified": 1683322537, + "narHash": "sha256-2x/W/dvUqVPpE91mxIcrcOJL4ufE+9LNdJRgVeUour8=", "ref": "refs/heads/master", - "rev": "6bf7df2b8b60cbb1b4ec08539dd69f4956a44ff6", - "revCount": 204, + "rev": "8013891628c1d709f28705e3f9b7c3f91481892b", + "revCount": 215, "type": "git", "url": "https://git.fudo.org/fudo-nix/pkgs.git" }, @@ -2345,11 +2345,11 @@ "utils": "utils_42" }, "locked": { - "lastModified": 1684301091, - "narHash": "sha256-l7z38fBOw15opTXR55Z5KgAOtvuXO60WGrVi0LByBPM=", + "lastModified": 1684439334, + "narHash": "sha256-GSBblSbzl0ArXvRGn9EpjP/5j2hmu3b2IjQeY1llO08=", "ref": "with-deps", - "rev": "eedb4481a622dce09bda79f426d430412fc55f57", - "revCount": 67, + "rev": "b047ccd1226517e757bc8084c2cba630f4bd10b9", + "revCount": 69, "type": "git", "url": "https://git.fudo.org/fudo-public/nix-helpers.git" }, @@ -2371,11 +2371,11 @@ "utils": "utils_44" }, "locked": { - "lastModified": 1684274921, - "narHash": "sha256-RH12Qx4u5LMomcBZaTBii1EhlHQ3TUgaKUcn+cqiClA=", + "lastModified": 1684439334, + "narHash": "sha256-GSBblSbzl0ArXvRGn9EpjP/5j2hmu3b2IjQeY1llO08=", "ref": "with-deps", - "rev": "056710d1ef79ee9fabcd6808d3179779f65f45fd", - "revCount": 55, + "rev": "b047ccd1226517e757bc8084c2cba630f4bd10b9", + "revCount": 69, "type": "git", "url": "https://git.fudo.org/fudo-public/nix-helpers.git" }, @@ -2770,11 +2770,11 @@ "niten-doom-config": { "flake": false, "locked": { - "lastModified": 1671579159, - "narHash": "sha256-tM/aeAi7yLNtJ8WaK2Tl3sAIOW2DnDUIRZ75cZpKulY=", + "lastModified": 1684432992, + "narHash": "sha256-ex/H6we7BLjidBxo0n5EZ9YUflLr03sLWdf5YGsF6jU=", "ref": "refs/heads/master", - "rev": "2dc9bcd1afda4efdb18cc0d47f93c4565ba3e652", - "revCount": 63, + "rev": "47773717b06d21004db3dea96f2329f912ef8dd3", + "revCount": 64, "type": "git", "url": "https://git.fudo.org/niten/doom-emacs.git" }, @@ -2831,11 +2831,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1684385584, - "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", + "lastModified": 1684754342, + "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", + "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", "type": "github" }, "original": { @@ -3116,11 +3116,11 @@ }, "nixpkgs_27": { "locked": { - "lastModified": 1684280442, - "narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=", + "lastModified": 1684661732, + "narHash": "sha256-2/Xo/UmUUoMXc0T5tzoUsYjMLLMjEfzRWDAQB0WwtW0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c591e7adc514090a77209f56c9d0c551ab8530d", + "rev": "b0671cbf1e5c443f7fbfd4941ee0f8a151435114", "type": "github" }, "original": { @@ -3251,11 +3251,11 @@ }, "nixpkgs_35": { "locked": { - "lastModified": 1684280442, - "narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=", + "lastModified": 1684580438, + "narHash": "sha256-LUPswmDn6fXP3lEBJFA2Id8PkcYDgzUilevWackYVvQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c591e7adc514090a77209f56c9d0c551ab8530d", + "rev": "7dc71aef32e8faf065cb171700792cf8a65c152d", "type": "github" }, "original": { @@ -3408,11 +3408,11 @@ "utils": "utils_45" }, "locked": { - "lastModified": 1684275076, - "narHash": "sha256-8+1ZkJo/k/7j5uJF7PN8IOv5Z9niuO1cw1m4zyvrv9Y=", + "lastModified": 1684784801, + "narHash": "sha256-7d8blW6tVHMTdgAQB2Dh470XsvWbD5gICwgXrS/90Xg=", "ref": "refs/heads/master", - "rev": "8b1327f66a31873dc0cac3d6eb2fa5c957723757", - "revCount": 6, + "rev": "6ff2823f55812d527ce6fd022caf78a438afb371", + "revCount": 9, "type": "git", "url": "https://git.fudo.org/fudo-public/notifier.git" }, @@ -3460,11 +3460,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1682449610, - "narHash": "sha256-1I9Rpnyp9rZTYG48oxxN+scKoKTJxh/ya787zI0xIpI=", + "lastModified": 1683136293, + "narHash": "sha256-PMHNr3Qo62uqO5IUDAfxUoqa4Zvb9y2J76pRYDB/6Y4=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "eaf274909f595ba29b853031e1c5bcdac255fbeb", + "rev": "080710797ad25e76c4556d2b03cc0aa5313cd187", "type": "github" }, "original": { @@ -3643,11 +3643,11 @@ "utils": "utils_37" }, "locked": { - "lastModified": 1683670608, - "narHash": "sha256-LhHwMbrVdLo80DrV2aRvEJFXTy+MeIiiABlFgGjgFRg=", + "lastModified": 1684442384, + "narHash": "sha256-YhV7DuTwSw4e3jceMAgA/kKYGH82Y/WwwHzrkYBaSW8=", "ref": "refs/heads/master", - "rev": "38ea8bce7048ade7ac8509e090a0f1c988b78835", - "revCount": 9, + "rev": "b6fe2ce411856ec02c0717cfb19c51f0142e5e71", + "revCount": 11, "type": "git", "url": "https://git.fudo.org/fudo-public/snooper.git" }, @@ -3772,11 +3772,11 @@ "utils": "utils_46" }, "locked": { - "lastModified": 1684431677, - "narHash": "sha256-Zs/Dj7n19fcGl5ZT80KJDF4iDaWKzfuyv7OICwKoJEo=", + "lastModified": 1684784923, + "narHash": "sha256-0d5r2FG/KuIUFfigMFAqDA615MJU526Kkn1tW7MfVP8=", "ref": "refs/heads/master", - "rev": "92267934554fdfd5ed0ed00fb5b3f84bc109f5ba", - "revCount": 14, + "rev": "3787a37197ebbcc95cdb7a8175090000bb56e881", + "revCount": 31, "type": "git", "url": "https://git.fudo.org/fudo-public/tattler.git" }, @@ -3803,11 +3803,11 @@ }, "unstableNixpkgs": { "locked": { - "lastModified": 1683014792, - "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", + "lastModified": 1684385584, + "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", + "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", "type": "github" }, "original": { @@ -3818,11 +3818,11 @@ }, "unstableNixpkgs_2": { "locked": { - "lastModified": 1684385584, - "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", + "lastModified": 1684754342, + "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", + "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", "type": "github" }, "original": { @@ -4570,11 +4570,11 @@ "utils": "utils_47" }, "locked": { - "lastModified": 1683150365, - "narHash": "sha256-KSD+UtvsaomEkAJqaiiH0W0zsnVvSfj2ocsFad2Hg74=", + "lastModified": 1684619964, + "narHash": "sha256-kHgUbBWdvYLgrGF7H4phuR7g6GiWianKgJRsECl60+w=", "ref": "refs/heads/master", - "rev": "40c136217dc6cabd592e2df2a8faed78bbee4c12", - "revCount": 20, + "rev": "0a7967727ee86c3590c01d08cd7559bfbfd1c036", + "revCount": 21, "type": "git", "url": "https://git.fudo.org/fudo-public/wallfly.git" },