From fd6bf13e45a871bf00d3ceb45d3b6b58a83a32c1 Mon Sep 17 00:00:00 2001 From: Fiona Grzebien Date: Wed, 6 Nov 2024 16:39:40 +0100 Subject: [PATCH] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/dd6d18bf8d291daca03a444973bd4f9aa5c1f681?narHash=sha256-O2/v/ocUL0KsACqEIK5eD5XeX46duRIgKdOu6uCKarw%3D' (2024-10-28) → 'github:NixOS/nixpkgs/c128e44a249d6180740d0a979b6480d5b795c013?narHash=sha256-i85DPrhDuvzgvIWCpJlbfM2UFtNYbapo20MtQXsvay4%3D' (2024-11-06) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/ec7caabec9679b1a9008e0cbcfa4b14a2b600774?narHash=sha256-WPGVR8NW9ctqwLMtYV23b94ExQulTFoTKqD21WI3fbg%3D' (2024-10-29) → 'github:NixOS/nixpkgs/a40c3f1a5a8d3fa81fc4edc9dfa4719f8908b1d8?narHash=sha256-JTpBZcKpiz0/Fm5saVrTdPRsywNlBFz5pSdwMaVKwH8%3D' (2024-11-06) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/75e28c029ef2605f9841e0baa335d70065fe7ae2?narHash=sha256-P8wF4ag6Srmpb/gwskYpnIsnspbjZlRvu47iN527ABQ%3D' (2024-10-28) → 'github:NixOS/nixpkgs/1c07b97d2d4302baca8c61fa2d0d4632427972a7?narHash=sha256-OrCMJZ8qZftRplhoB%2BBksvoPLBOZQpH8mnACgPKNuMc%3D' (2024-11-06) • Added input 'pterodactyl': 'git+https://git.nekover.se/fi/pterodactyl.git?ref=refs/heads/main&rev=67dbbc01133790a3a1e892cc4cb147413f5238ee' (2024-10-29) • Added input 'pterodactyl/nixpkgs': 'github:NixOS/nixpkgs/ccc0c2126893dd20963580b6478d1a10a4512185?narHash=sha256-4HQI%2B6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo%3D' (2024-10-18) --- .../hosts/gameserver-node-1/configuration.nix | 15 ++++- flake.lock | 55 +++++++++++++++---- flake.nix | 6 +- 3 files changed, 63 insertions(+), 13 deletions(-) diff --git a/config/hosts/gameserver-node-1/configuration.nix b/config/hosts/gameserver-node-1/configuration.nix index 94a60e2..a16800f 100644 --- a/config/hosts/gameserver-node-1/configuration.nix +++ b/config/hosts/gameserver-node-1/configuration.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pterodactyl, ... }: { boot.loader.grub = { enable = true; @@ -9,5 +9,18 @@ hostName = "gameserver-node-1"; }; + environment.systemPackages = [ + pterodactyl.packages."x86_64-linux".pterodactyl-wings + ]; + + imports = [ + pterodactyl.nixosModules.pterodactyl-wings + ]; + + services.wings = { + enable = true; + configuration = ""; + }; + system.stateVersion = "24.05"; } diff --git a/flake.lock b/flake.lock index 4534930..d6dfd27 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730142757, - "narHash": "sha256-O2/v/ocUL0KsACqEIK5eD5XeX46duRIgKdOu6uCKarw=", + "lastModified": 1730891215, + "narHash": "sha256-i85DPrhDuvzgvIWCpJlbfM2UFtNYbapo20MtQXsvay4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd6d18bf8d291daca03a444973bd4f9aa5c1f681", + "rev": "c128e44a249d6180740d0a979b6480d5b795c013", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1730209337, - "narHash": "sha256-WPGVR8NW9ctqwLMtYV23b94ExQulTFoTKqD21WI3fbg=", + "lastModified": 1730906268, + "narHash": "sha256-JTpBZcKpiz0/Fm5saVrTdPRsywNlBFz5pSdwMaVKwH8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec7caabec9679b1a9008e0cbcfa4b14a2b600774", + "rev": "a40c3f1a5a8d3fa81fc4edc9dfa4719f8908b1d8", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730157240, - "narHash": "sha256-P8wF4ag6Srmpb/gwskYpnIsnspbjZlRvu47iN527ABQ=", + "lastModified": 1730902633, + "narHash": "sha256-OrCMJZ8qZftRplhoB+BksvoPLBOZQpH8mnACgPKNuMc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75e28c029ef2605f9841e0baa335d70065fe7ae2", + "rev": "1c07b97d2d4302baca8c61fa2d0d4632427972a7", "type": "github" }, "original": { @@ -132,6 +132,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -146,12 +162,31 @@ "type": "indirect" } }, + "pterodactyl": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1730231313, + "narHash": "sha256-8UdcF5PIHWB+wV/1lt4AgXz3KYk+VQIeDxC6lxLPWno=", + "ref": "refs/heads/main", + "rev": "67dbbc01133790a3a1e892cc4cb147413f5238ee", + "revCount": 3, + "type": "git", + "url": "https://git.nekover.se/fi/pterodactyl.git" + }, + "original": { + "type": "git", + "url": "https://git.nekover.se/fi/pterodactyl.git" + } + }, "root": { "inputs": { "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", + "pterodactyl": "pterodactyl", "simple-nixos-mailserver": "simple-nixos-mailserver" } }, @@ -159,7 +194,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-24_05": "nixpkgs-24_05", "utils": "utils" }, diff --git a/flake.nix b/flake.nix index 326b07b..3aae2d8 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; - pterodactyl.url = "git+https://git.nekover.se/fi/pterodactyl.git"; + pterodactyl = { + url = "git+https://git.nekover.se/fi/pterodactyl.git"; + }; }; outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixos-generators, simple-nixos-mailserver, pterodactyl, ... }@inputs: @@ -29,7 +31,7 @@ nodeNixpkgs = builtins.mapAttrs (name: host: host.pkgs) hosts; specialArgs = { - inherit nixpkgs-unstable nixpkgs-master hosts simple-nixos-mailserver; + inherit nixpkgs-unstable nixpkgs-master hosts simple-nixos-mailserver pterodactyl; # Provide environment for secret key command keyCommandEnv = [ "env" "GNUPGHOME=/home/yuri/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/yuri/pass/infra" ];