From f98a97f1c47447f60408aab3dcef4f6066aadbab Mon Sep 17 00:00:00 2001 From: winston Date: Wed, 11 Sep 2024 08:52:28 +0200 Subject: [PATCH] feat: add satisfactory server flake --- config/games/default.nix | 1 + config/games/satisfactory.nix | 6 ++ config/games/valheim.nix | 4 - flake.lock | 143 +++++++++++++++++++--------------- flake.nix | 15 +--- 5 files changed, 91 insertions(+), 78 deletions(-) create mode 100644 config/games/satisfactory.nix diff --git a/config/games/default.nix b/config/games/default.nix index c27bf49..21bc8c1 100644 --- a/config/games/default.nix +++ b/config/games/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./satisfactory.nix # ./valheim.nix ]; } diff --git a/config/games/satisfactory.nix b/config/games/satisfactory.nix new file mode 100644 index 0000000..74dd0ca --- /dev/null +++ b/config/games/satisfactory.nix @@ -0,0 +1,6 @@ +{ + services.satisfactory = { + enable = true; + openFirewall = true; + }; +} diff --git a/config/games/valheim.nix b/config/games/valheim.nix index 634e01d..94143c8 100644 --- a/config/games/valheim.nix +++ b/config/games/valheim.nix @@ -13,8 +13,4 @@ serverName = "Nixheim"; worldName = "Owoheim"; }; - - users.users.valheim = { - createHome = true; - }; } diff --git a/flake.lock b/flake.lock index a6334f4..03625bf 100644 --- a/flake.lock +++ b/flake.lock @@ -27,6 +27,7 @@ "inputs": { "crane": "crane", "flake-compat": [], + "flake-parts": "flake-parts", "flake-utils": [ "flake-utils" ], @@ -38,11 +39,11 @@ ] }, "locked": { - "lastModified": 1724226964, - "narHash": "sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68=", + "lastModified": 1725300620, + "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", "owner": "zhaofengli", "repo": "attic", - "rev": "6d9aeaef0a067d664cb11bb7704f7ec373d47fb2", + "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", "type": "github" }, "original": { @@ -75,6 +76,7 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "attic", "nixpkgs" ] }, @@ -92,6 +94,26 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -152,26 +174,6 @@ "type": "github" } }, - "nix-index-database": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1723950649, - "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "392828aafbed62a6ea6ccab13728df2e67481805", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, "nixinate": { "inputs": { "nixpkgs": [ @@ -194,11 +196,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1725001927, + "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", "type": "github" }, "original": { @@ -210,11 +212,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -236,11 +238,11 @@ ] }, "locked": { - "lastModified": 1724227338, - "narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=", + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "type": "github" }, "original": { @@ -253,19 +255,57 @@ "inputs": { "agenix": "agenix", "attic": "attic", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", "home-manager": "home-manager", - "nix-index-database": "nix-index-database", "nixinate": "nixinate", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "pre-commit-hooks": "pre-commit-hooks", - "valheim-server": "valheim-server", - "vscode-server": "vscode-server" + "satisfactory-server": "satisfactory-server", + "valheim-server": "valheim-server" + } + }, + "satisfactory-server": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "steam-fetcher": "steam-fetcher" + }, + "locked": { + "lastModified": 1725985161, + "narHash": "sha256-3E+tLNNlRyTlViudgYv8PvJOZdr3tsZrZ459eGff8sg=", + "path": "/home/winston/satisfactory-flake", + "type": "path" + }, + "original": { + "path": "/home/winston/satisfactory-flake", + "type": "path" } }, "steam-fetcher": { + "inputs": { + "nixpkgs": [ + "satisfactory-server", + "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": [ "valheim-server", @@ -321,14 +361,14 @@ "nixpkgs": [ "nixpkgs" ], - "steam-fetcher": "steam-fetcher" + "steam-fetcher": "steam-fetcher_2" }, "locked": { - "lastModified": 1722314839, - "narHash": "sha256-1MXH5i7VRkeknzmkSjsPiCZnUGqMuoVKFgCiy5xkGjQ=", + "lastModified": 1724824251, + "narHash": "sha256-T7z3L+bvCkYZ080oNi013wwhv+NVsy66dPRyAAZ4kcY=", "owner": "aidalgol", "repo": "valheim-server-flake", - "rev": "f73a87e197b1ba8eb8b79c67cd48146b3ef44290", + "rev": "d19d11d72c075e972b357dfe80347bbad36a76c1", "type": "github" }, "original": { @@ -336,29 +376,6 @@ "repo": "valheim-server-flake", "type": "github" } - }, - "vscode-server": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713958148, - "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=", - "owner": "nix-community", - "repo": "nixos-vscode-server", - "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-vscode-server", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 55a75fd..6fec85e 100644 --- a/flake.nix +++ b/flake.nix @@ -22,10 +22,6 @@ config.allowUnfree = true; inherit overlays; }; - home-manager.sharedModules = [ - inputs.vscode-server.homeModules.default - inputs.nix-index-database.hmModules.nix-index - ]; } ./hosts/main-node ./config @@ -34,6 +30,7 @@ inputs.attic.nixosModules.atticd inputs.home-manager.nixosModules.home-manager inputs.valheim-server.nixosModules.default + inputs.satisfactory-server.nixosModules.default ]; specialArgs = {inherit inputs;}; }; @@ -90,10 +87,6 @@ url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-index-database = { - url = "github:nix-community/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; flake-parts = { url = "github:hercules-ci/flake-parts"; @@ -128,9 +121,9 @@ url = "github:aidalgol/valheim-server-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - vscode-server = { - url = "github:nix-community/nixos-vscode-server"; - inputs.flake-utils.follows = "flake-utils"; + satisfactory-server = { + # url = "github:nekowinston/satisfactory-server-flake"; + url = "path:/home/winston/satisfactory-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; };