add reclamation server
This commit is contained in:
73
flake.lock
generated
73
flake.lock
generated
@@ -326,6 +326,20 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1767273430,
|
||||||
|
"narHash": "sha256-kDpoFwQ8GLrPiS3KL+sAwreXrph2KhdXuJzo5+vSLoo=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "76eec3925eb9bbe193934987d3285473dbcfad50",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737062831,
|
"lastModified": 1737062831,
|
||||||
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
|
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
|
||||||
@@ -339,7 +353,7 @@
|
|||||||
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
|
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736549401,
|
"lastModified": 1736549401,
|
||||||
"narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
|
"narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
|
||||||
@@ -355,6 +369,25 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"reclamation": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs_6",
|
||||||
|
"utils": "utils"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1767362018,
|
||||||
|
"narHash": "sha256-zZ9FEby/D8fGKe1QuF581dTZi+jU590u9MnNKG6ZV8c=",
|
||||||
|
"ref": "refs/heads/master",
|
||||||
|
"rev": "1b961c0df8427885cd976c13e684fd154e52f515",
|
||||||
|
"revCount": 1,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.shobu.fr/sin_serhao/reclamation"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.shobu.fr/sin_serhao/reclamation"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
@@ -363,6 +396,7 @@
|
|||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
"nix-minecraft": "nix-minecraft",
|
"nix-minecraft": "nix-minecraft",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
|
"reclamation": "reclamation",
|
||||||
"shoblog-front": "shoblog-front",
|
"shoblog-front": "shoblog-front",
|
||||||
"testing-grounds": "testing-grounds",
|
"testing-grounds": "testing-grounds",
|
||||||
"unstable": "unstable"
|
"unstable": "unstable"
|
||||||
@@ -370,7 +404,7 @@
|
|||||||
},
|
},
|
||||||
"shoblog-front": {
|
"shoblog-front": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752594581,
|
"lastModified": 1752594581,
|
||||||
@@ -432,9 +466,24 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"testing-grounds": {
|
"testing-grounds": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_7"
|
"nixpkgs": "nixpkgs_8"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755527993,
|
"lastModified": 1755527993,
|
||||||
@@ -465,6 +514,24 @@
|
|||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_3"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731533236,
|
||||||
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
61
flake.nix
61
flake.nix
@@ -17,6 +17,7 @@
|
|||||||
# sin inputs
|
# sin inputs
|
||||||
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
||||||
testing-grounds.url = "gitlab:shobu13/testing-grounds";
|
testing-grounds.url = "gitlab:shobu13/testing-grounds";
|
||||||
|
reclamation.url = "git+https://git.shobu.fr/sin_serhao/reclamation";
|
||||||
shoblog-front.url = "gitlab:shobu13/shoblog";
|
shoblog-front.url = "gitlab:shobu13/shoblog";
|
||||||
# striped-front.url = "git+ssh://git@gitlab.com/striped1/striped-front";
|
# striped-front.url = "git+ssh://git@gitlab.com/striped1/striped-front";
|
||||||
# striped-back.url = "git+ssh://git@gitlab.com/striped1/striped-back";
|
# striped-back.url = "git+ssh://git@gitlab.com/striped1/striped-back";
|
||||||
@@ -26,7 +27,8 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# Flake outputs
|
# Flake outputs
|
||||||
outputs = inputs@{
|
outputs =
|
||||||
|
inputs@{
|
||||||
self,
|
self,
|
||||||
|
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
@@ -42,6 +44,7 @@
|
|||||||
# striped-back,
|
# striped-back,
|
||||||
nix-minecraft,
|
nix-minecraft,
|
||||||
testing-grounds,
|
testing-grounds,
|
||||||
|
reclamation,
|
||||||
copyparty,
|
copyparty,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
@@ -52,9 +55,14 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
# Helper to provide system-specific attributes
|
# Helper to provide system-specific attributes
|
||||||
forEachSupportedSystem = f: inputs.nixpkgs.lib.genAttrs supportedSystems (system: f {
|
forEachSupportedSystem =
|
||||||
|
f:
|
||||||
|
inputs.nixpkgs.lib.genAttrs supportedSystems (
|
||||||
|
system:
|
||||||
|
f {
|
||||||
pkgs = import inputs.nixpkgs { inherit system; };
|
pkgs = import inputs.nixpkgs { inherit system; };
|
||||||
});
|
}
|
||||||
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
colmenaHive = colmena.lib.makeHive {
|
colmenaHive = colmena.lib.makeHive {
|
||||||
@@ -69,11 +77,19 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
thea = {name, nodes, pkgs, ...}: {
|
thea =
|
||||||
|
{
|
||||||
|
name,
|
||||||
|
nodes,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hosts/${name}/configuration.nix
|
./hosts/${name}/configuration.nix
|
||||||
./hosts/${name}/hardware-configuration.nix
|
./hosts/${name}/hardware-configuration.nix
|
||||||
] ++ [
|
]
|
||||||
|
++ [
|
||||||
# modules
|
# modules
|
||||||
./modules/gitea/${name}
|
./modules/gitea/${name}
|
||||||
];
|
];
|
||||||
@@ -81,13 +97,21 @@
|
|||||||
deployment.targetHost = "192.168.1.12";
|
deployment.targetHost = "192.168.1.12";
|
||||||
};
|
};
|
||||||
|
|
||||||
sin = {name, nodes, pkgs, ...}: {
|
sin =
|
||||||
|
{
|
||||||
|
name,
|
||||||
|
nodes,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
./hosts/${name}/configuration.nix
|
./hosts/${name}/configuration.nix
|
||||||
./hosts/${name}/hardware-configuration.nix
|
./hosts/${name}/hardware-configuration.nix
|
||||||
] ++ [
|
]
|
||||||
|
++ [
|
||||||
# modules
|
# modules
|
||||||
./modules/gitea/${name}
|
./modules/gitea/${name}
|
||||||
];
|
];
|
||||||
@@ -95,7 +119,9 @@
|
|||||||
deployment.targetHost = "192.168.1.14";
|
deployment.targetHost = "192.168.1.14";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
devShells = forEachSupportedSystem ({ pkgs }: {
|
devShells = forEachSupportedSystem (
|
||||||
|
{ pkgs }:
|
||||||
|
{
|
||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
# The Nix packages provided in the environment
|
# The Nix packages provided in the environment
|
||||||
# Add any you need here
|
# Add any you need here
|
||||||
@@ -105,13 +131,16 @@
|
|||||||
env = { };
|
env = { };
|
||||||
|
|
||||||
# Add any shell logic you want executed any time the environment is activated
|
# Add any shell logic you want executed any time the environment is activated
|
||||||
shellHook = ''
|
shellHook = '''';
|
||||||
'';
|
};
|
||||||
};
|
}
|
||||||
});
|
);
|
||||||
|
|
||||||
packages = forEachSupportedSystem ({pkgs}: {
|
packages = forEachSupportedSystem (
|
||||||
inherit (colmena.packages."${pkgs.system}") colmena;
|
{ pkgs }:
|
||||||
});
|
{
|
||||||
|
inherit (colmena.packages."${pkgs.system}") colmena;
|
||||||
|
}
|
||||||
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,18 @@
|
|||||||
{pkgs, inputs, ...}:
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
modpack = pkgs.fetchPackwizModpack {
|
modpack = pkgs.fetchPackwizModpack {
|
||||||
url = "file:///${inputs.testing-grounds.modpack}/pack.toml";
|
url = "file:///${inputs.testing-grounds.modpack}/pack.toml";
|
||||||
packHash = "sha256-+taYj4uroLNxM4Nia3n+5P1Y/g6dzE6Iq13TsZgk4mU=";
|
packHash = "sha256-+taYj4uroLNxM4Nia3n+5P1Y/g6dzE6Iq13TsZgk4mU=";
|
||||||
};
|
};
|
||||||
|
reclamation = pkgs.fetchPackwizModpack {
|
||||||
|
url = "file:///${inputs.reclamation.reclamation}/pack.toml";
|
||||||
|
packHash = lib.fakeHash;
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ];
|
imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ];
|
||||||
@@ -14,6 +23,21 @@ in
|
|||||||
eula = true;
|
eula = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
|
|
||||||
|
servers.reclamation = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.fabricServers.fabric;
|
||||||
|
|
||||||
|
symlinks = {
|
||||||
|
"mods" = "${reclamation}/mods";
|
||||||
|
};
|
||||||
|
|
||||||
|
serverProperties = {
|
||||||
|
server-port = 43001;
|
||||||
|
motd = "all hail the gorgon";
|
||||||
|
allow-flight = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
servers.testing-grounds = {
|
servers.testing-grounds = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user