From b1db2f2f85cb4d2cc69c16d682e080b5b789682c Mon Sep 17 00:00:00 2001 From: matt1432 Date: Mon, 1 Jul 2024 22:43:18 -0400 Subject: [PATCH] feat(steam-servers): update 7days to 1.0 --- .../arion/media/radarr/images/radarr.nix | 4 +- .../servivi/modules/steam-servers/default.nix | 11 +- .../servivi/modules/steam-servers/lock.json | 119 ----------- .../modules/steam-servers/seven-days.nix | 26 --- flake.lock | 189 +++++++----------- flake.nix | 8 +- inputs.nix | 7 +- lib.nix | 3 +- 8 files changed, 82 insertions(+), 285 deletions(-) delete mode 100644 devices/servivi/modules/steam-servers/lock.json delete mode 100644 devices/servivi/modules/steam-servers/seven-days.nix diff --git a/devices/nos/modules/arion/media/radarr/images/radarr.nix b/devices/nos/modules/arion/media/radarr/images/radarr.nix index 3d98be2..3a9ae4e 100644 --- a/devices/nos/modules/arion/media/radarr/images/radarr.nix +++ b/devices/nos/modules/arion/media/radarr/images/radarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/radarr"; - imageDigest = "sha256:3e64efcc14f9b21b30e78c39203e754d1d1a897d0f76ffb92450cd5c8ae16c9a"; - sha256 = "04ydrgf7rw91zkb6mmvgxpx2qdj13ipfriy8d9kk84d2dj8ny3fz"; + imageDigest = "sha256:c5b78b1f1e8556d781788194c4ee2b87ca7e3620b701bfce31499e60ee50eca3"; + sha256 = "0nic5ajl95pwyp11j0mf45frvrb340sqmf2zvxb93rprrwawas44"; finalImageName = "ghcr.io/linuxserver/radarr"; finalImageTag = "latest"; } diff --git a/devices/servivi/modules/steam-servers/default.nix b/devices/servivi/modules/steam-servers/default.nix index cd1ff1c..a747186 100644 --- a/devices/servivi/modules/steam-servers/default.nix +++ b/devices/servivi/modules/steam-servers/default.nix @@ -8,12 +8,21 @@ services.steam-servers."7-days-to-die" = { mainServ = { enable = true; - package = pkgs.callPackage ./seven-days.nix {}; + package = + steam-servers + .packages + .${pkgs.system} + ."7-days-to-die" + .branches + .latest_experimental; config = { ServerName = "bruh moment"; ServerPort = 26900; + # removed in v1.0 + SaveGameFolder = null; + BlockDamagePlayer = 200; BloodMoonEnemyCount = 10; DropOnDeath = 3; diff --git a/devices/servivi/modules/steam-servers/lock.json b/devices/servivi/modules/steam-servers/lock.json deleted file mode 100644 index 2dcd851..0000000 --- a/devices/servivi/modules/steam-servers/lock.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "appId": 294420, - "depotId": 294422, - "name": "7-days-to-die-server", - "branches": { - "public": "12696583", - "alpha10.4": "480993", - "alpha11.6": "658147", - "alpha12.5": "745252", - "alpha13.8": "963565", - "alpha14.7": "1189196", - "alpha15.2": "1642899", - "alpha16.4": "2222523", - "alpha17.4": "3848769", - "alpha18.4": "4714812", - "alpha19.6": "7108526", - "alpha20.4": "8604296", - "alpha20.5": "8673178", - "alpha20.6": "9269710", - "alpha20.7": "10740013", - "alpha21.0": "11589588", - "alpha21.1": "11888696", - "alpha21.2": "12696583", - "alpha9.3": "385244", - "latest_experimental": "12696583" - }, - "builds": { - "385244": { - "hash": "sha256-Y3H/mcUGgiuctfp27l4qJM+RtzFqB/nRcQ2v58Y/lQs=\n", - "manifestId": "771574079178892216", - "version": "A9.3" - }, - "480993": { - "hash": "sha256-rHIq7ZdAyIlK/99vPpipHn8rk2dWoxOPySDwgPtqOFc=\n", - "manifestId": "869964754451803329", - "version": "A10.4" - }, - "658147": { - "hash": "sha256-FtGdi7IfCcORe5bgpNk1ldxPoskrLTuVtp/hPpiam54=\n", - "manifestId": "6322866582767616058", - "version": "A11.6" - }, - "745252": { - "hash": "sha256-hDeHIoqd9vSHOtMLdZMEFXsa1m08MDKtj/IOTgY4nLw=\n", - "manifestId": "4986361730962654647", - "version": "A12.5" - }, - "963565": { - "hash": "sha256-i+lqXyHj1Rh7g1jvQwHjACLdmvwHbqsDRAViCeGxwPw=\n", - "manifestId": "7779347169826947318", - "version": "A13.8" - }, - "1189196": { - "hash": "sha256-eb5jGQ3ZXISaR1XLjRfWU0WnPsCAlICpLswYARKGPUg=\n", - "manifestId": "6623540452959702677", - "version": "A14.7" - }, - "1642899": { - "hash": "sha256-PUp6CAIb5ifckoQATk0HiSI+38tG7s4++ZdGP9pGTYw=\n", - "manifestId": "2556346443150106043", - "version": "A15.2" - }, - "2222523": { - "hash": "sha256-wfEN9h30pOZ4I40Mknhj4DYLCobxClfAAVwcQAh/xHA=\n", - "manifestId": "2507660789418272148", - "version": "A16.4" - }, - "3848769": { - "hash": "sha256-5+vPyQa83lQipXAiVjUax5ZjRgZ2bV8+4JPeYAptURo=\n", - "manifestId": "779748564640465657", - "version": "A17.4" - }, - "4714812": { - "hash": "sha256-/NSpYdo6Jbg8sAa0Tm2CjjtI29mw+UpPHJ6UHlvrnuk=\n", - "manifestId": "712346436815285918", - "version": "A18.4" - }, - "7108526": { - "hash": "sha256-GaDPdMfRPm/b/w+TCCliJLKh8qXV1oOsF8nn/vdjkCE=\n", - "manifestId": "8368733426395777657", - "version": "A19.6" - }, - "8604296": { - "hash": "sha256-CdCqILAUF7Pm4fsqh7GGgnUyLF313EpbqY876cr0XJY=\n", - "manifestId": "7450223064053935691", - "version": "A20.4" - }, - "8673178": { - "hash": "sha256-+NFOV+j2rEAROjuRmg4EBqpYmCk+k69lL4uRxuSYH8g=\n", - "manifestId": "8340716617723021748", - "version": "A20.5" - }, - "9269710": { - "hash": "sha256-DGFUY9yPuJw7B8MULLVqnHOUWCfn49rXkkONzEg44zQ=\n", - "manifestId": "5719205947052582383", - "version": "A20.6" - }, - "10740013": { - "hash": "sha256-zcORacHWkT8GvOn6XSEYbPMEiHaBFi7x7e6jwWxmWjg=\n", - "manifestId": "4716968955855516282", - "version": "A20.7" - }, - "11589588": { - "hash": "sha256-V23otEJmR73X2OtX78WOfArk4T2Qt/aUhFGCTBjXYII=\n", - "manifestId": "377642321521054757", - "version": "A21.0" - }, - "11888696": { - "hash": "sha256-gl9t5wKzqcEHwxmP1EJEJ7JVod7nCq0CKxK0fzQBApI=\n", - "manifestId": "4485042179748822610", - "version": "A21.1" - }, - "12696583": { - "hash": "sha256-bxV/B8vEiuEpn1po2De3H6iVSLbhqe5dCAIBhnQSNsQ=\n", - "manifestId": "1977371197884973023", - "version": "A21.2" - } - } -} diff --git a/devices/servivi/modules/steam-servers/seven-days.nix b/devices/servivi/modules/steam-servers/seven-days.nix deleted file mode 100644 index 020e25f..0000000 --- a/devices/servivi/modules/steam-servers/seven-days.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - mkSteamPackage, - gcc-unwrapped, - zlib, -}: -mkSteamPackage { - lockFile = ./lock.json; - - buildInputs = [ - gcc-unwrapped - zlib - ]; - - meta = with lib; { - description = "7 Days to Die dedicated server"; - homepage = "https://steamdb.info/app/294420/"; - changelog = "https://store.steampowered.com/news/app/251570?updates=true"; - sourceProvenance = with sourceTypes; [ - binaryNativeCode # Steam games are always going to contain some native binary component. - binaryBytecode # e.g. Unity games using C# - ]; - license = licenses.unfree; - platforms = ["x86_64-linux"]; - }; -} diff --git a/flake.lock b/flake.lock index 29e1198..f1ea040 100644 --- a/flake.lock +++ b/flake.lock @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1705332421, - "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -334,11 +334,11 @@ ] }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1719745305, + "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719745305, + "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", "type": "github" }, "original": { @@ -524,11 +524,11 @@ }, "flake-root_2": { "locked": { - "lastModified": 1692742795, - "narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=", + "lastModified": 1713493429, + "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", "owner": "srid", "repo": "flake-root", - "rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937", + "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", "type": "github" }, "original": { @@ -609,24 +609,6 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakegen": { "inputs": { "systems": "systems" @@ -741,11 +723,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -851,11 +833,11 @@ ] }, "locked": { - "lastModified": 1719402280, - "narHash": "sha256-u1ZeI5Zf8gU/4xU3gWCDiX1oHwXSx1gJ3k6mUES2g8k=", + "lastModified": 1719812793, + "narHash": "sha256-bOXktdD1+GB5Qs0R2yUmX+tPf01VttHUmWDNgDXoYzg=", "owner": "juanfont", "repo": "headscale", - "rev": "14a3f94f0cab3f88322350bc060f28c406754821", + "rev": "89ada557bc2e2772323e5380e89723815292f106", "type": "github" }, "original": { @@ -915,11 +897,11 @@ ] }, "locked": { - "lastModified": 1719677234, - "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -1011,11 +993,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1719746201, - "narHash": "sha256-8Jp7iSoIupyhD2dLi+obRKyoq6YeKYOXMARm0WSIeO4=", + "lastModified": 1719786368, + "narHash": "sha256-fpVk3CajFQ4hcTuoU9njw/btPrAV92f8+WawVy8XvcE=", "ref": "refs/heads/main", - "rev": "4d6f96f74f9fa6e7b69790fa569ffe60267f8017", - "revCount": 4899, + "rev": "d7ea1b7785f31e9fd6477490309721a19a835592", + "revCount": 4900, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1043,11 +1025,11 @@ ] }, "locked": { - "lastModified": 1719318037, - "narHash": "sha256-TnlAcO5K2gkab0mpKurP5Co6eWRycP/KbFqWNS2rsMA=", + "lastModified": 1719784423, + "narHash": "sha256-D7O5+nh2Wn9tQPJArWHrDSZeEfBCtj5zTGd86701LPE=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "3ae670253a5a3ae1e3a3104fb732a8c990a31487", + "rev": "98cb18c6fcfe8196ef4150d09fbae305b7bb2954", "type": "github" }, "original": { @@ -1352,11 +1334,11 @@ ] }, "locked": { - "lastModified": 1719733038, - "narHash": "sha256-kUG94JixUcSgkkJ0I1xo2rtXfSOmUJNbq+PKs9kDWWI=", + "lastModified": 1719858211, + "narHash": "sha256-pBGMc6ZkGL4NiJAF+w/PmGeSE3Zohf4vxPcfwYT5qf0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "dace98a9b5ee51971cab74f7a00955b8b8089536", + "rev": "5d66451b2345a22a9c5ab3a424d2f15a5ba4f42b", "type": "github" }, "original": { @@ -1368,11 +1350,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719676676, - "narHash": "sha256-97hP/z7sH4GUBBVi2Z7QiJsgIOO6a+AFYf4MvTU2p0Y=", + "lastModified": 1719700831, + "narHash": "sha256-d89hDFBBtuQ7rwS/Q3lKYyfE0ekVCwubMN9q1qCZ3m0=", "owner": "neovim", "repo": "neovim", - "rev": "435d0182d293e70b14a5655c976c3c6daa6ea765", + "rev": "e7020306a19a5211c834966ec067fff3b981bdb9", "type": "github" }, "original": { @@ -1583,11 +1565,11 @@ ] }, "locked": { - "lastModified": 1719726405, - "narHash": "sha256-DqeKlvYQ5Z1rC02we9ufHr8UTfqBRPhiPrGLqdJ91dQ=", + "lastModified": 1719832725, + "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "838a910df0f7e542de2327036b2867fd68ded3a2", + "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", "type": "github" }, "original": { @@ -1628,11 +1610,11 @@ "nmd": "nmd_2" }, "locked": { - "lastModified": 1710434231, - "narHash": "sha256-yrWnsG28518tbIapJWiluweHORuuIwAQrA8lga0Sqlw=", + "lastModified": 1719772177, + "narHash": "sha256-XJOxCLWQUn+3VQTQGRwMoz6nDjT+GoL0f4mVrUQdzfk=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "2d93311c4f3f300154d2085e4b4b1d550237da92", + "rev": "45fcd2da39a70a96752e17f85d7a843b3c4f67f4", "type": "github" }, "original": { @@ -1665,11 +1647,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719506693, - "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -1818,11 +1800,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1718811006, + "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "type": "github" }, "original": { @@ -1842,11 +1824,11 @@ ] }, "locked": { - "lastModified": 1719750613, - "narHash": "sha256-UtSOon4nwEpH0PtNouK4z88osVDPbwAEWuJRND9Hqpg=", + "lastModified": 1719861366, + "narHash": "sha256-0AoX95NkDRQeCL+m1BDW+FdKVldsb6NF94vlE63q7No=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "e72bbe65097ac3f56b0238fa94952a682e274025", + "rev": "4cb5b074e41c963724d187c08c58be677154a9b8", "type": "github" }, "original": { @@ -2097,7 +2079,6 @@ "pre-commit-hooks_2": { "inputs": { "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_5", "gitignore": "gitignore_3", "nixpkgs": [ "steam-servers", @@ -2106,11 +2087,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -2173,7 +2154,6 @@ "secrets": "secrets", "sioyek-theme-src": "sioyek-theme-src", "sops-nix": "sops-nix_2", - "steam-fetcher": "steam-fetcher", "steam-servers": "steam-servers", "stylelint-lsp": "stylelint-lsp", "subsync": "subsync", @@ -2266,11 +2246,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1719716556, - "narHash": "sha256-KA9gy2Wkv76s4A8eLnOcdKVTygewbw3xsB8+awNMyqs=", + "lastModified": 1719873517, + "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b5974d4331fb6c893e808977a2e1a6d34b3162d6", + "rev": "a11224af8d824935f363928074b4717ca2e280db", "type": "github" }, "original": { @@ -2299,36 +2279,16 @@ "steam-fetcher": { "inputs": { "nixpkgs": [ + "steam-servers", "nixpkgs" ] }, "locked": { "lastModified": 1714795926, "narHash": "sha256-PkgC9jqoN6cJ8XYzTA2PlrWs7aPJkM3BGiTxNqax0cA=", - "owner": "nix-community", - "repo": "steam-fetcher", - "rev": "12f66eafb7862d91b3e30c14035f96a21941bd9c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "steam-fetcher", - "type": "github" - } - }, - "steam-fetcher_2": { - "inputs": { - "nixpkgs": [ - "steam-servers", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703704267, - "narHash": "sha256-X44wqMWyaMsymcrgxwlnEWDplcop54e3eopfJ/p+S3s=", "owner": "aidalgol", "repo": "nix-steam-fetcher", - "rev": "aa223d3d03fd60a7b9f20831a06776ca0f1b3630", + "rev": "12f66eafb7862d91b3e30c14035f96a21941bd9c", "type": "github" }, "original": { @@ -2346,19 +2306,19 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks_2", - "steam-fetcher": "steam-fetcher_2", + "steam-fetcher": "steam-fetcher", "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1712364428, - "narHash": "sha256-DpKCpHXIokf2G6gO6gvv3JtzhvhRI9HB3hLrGVrvSIY=", - "owner": "scottbot95", + "lastModified": 1719887710, + "narHash": "sha256-IGOxuUxtpVC9P4Lup+j3Y8Y/rRsaXpGB1AFP2DYj/DA=", + "owner": "matt1432", "repo": "nix-steam-servers", - "rev": "42f01ff2d2635b4f559264e988ac8f6e803a6623", + "rev": "20bb1e10bcc50e4a4a6a4aee89e4f3a18106e737", "type": "github" }, "original": { - "owner": "scottbot95", + "owner": "matt1432", "repo": "nix-steam-servers", "type": "github" } @@ -2512,21 +2472,6 @@ } }, "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2629,11 +2574,11 @@ ] }, "locked": { - "lastModified": 1707300477, - "narHash": "sha256-qQF0fEkHlnxHcrKIMRzOETnRBksUK048MXkX0SOmxvA=", + "lastModified": 1719749022, + "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ac599dab59a66304eb511af07b3883114f061b9d", + "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", "type": "github" }, "original": { @@ -2679,7 +2624,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1718794850, diff --git a/flake.nix b/flake.nix index 8c15eea..b9c89c1 100644 --- a/flake.nix +++ b/flake.nix @@ -307,15 +307,9 @@ repo = "sops-nix"; type = "github"; }; - steam-fetcher = { - inputs.nixpkgs.follows = "nixpkgs"; - owner = "nix-community"; - repo = "steam-fetcher"; - type = "github"; - }; steam-servers = { inputs.nixpkgs.follows = "nixpkgs"; - owner = "scottbot95"; + owner = "matt1432"; repo = "nix-steam-servers"; type = "github"; }; diff --git a/inputs.nix b/inputs.nix index 040e92b..5e62fb9 100644 --- a/inputs.nix +++ b/inputs.nix @@ -90,15 +90,10 @@ let }; steam-servers = mkDep { - owner = "scottbot95"; + owner = "matt1432"; repo = "nix-steam-servers"; }; - steam-fetcher = mkDep { - owner = "nix-community"; - repo = "steam-fetcher"; - }; - nix-eval-jobs = mkDep { owner = "nix-community"; repo = "nix-eval-jobs"; diff --git a/lib.nix b/lib.nix index fe86bfb..79473c7 100644 --- a/lib.nix +++ b/lib.nix @@ -16,8 +16,7 @@ inputs.grim-hyprland.overlays.default inputs.jovian.overlays.default inputs.nixpkgs-wayland.overlays.default - inputs.steam-fetcher.overlays.default - inputs.steam-servers.overlays.default + inputs.steam-servers.inputs.steam-fetcher.overlays.default ]; };