Compare commits
9 Commits
disk
...
92ab3eb6d6
| Author | SHA1 | Date | |
|---|---|---|---|
| 92ab3eb6d6 | |||
| 92b6f03db1 | |||
| fa6bd362c8 | |||
| ccf9e6b624 | |||
|
|
eaf515e178 | ||
|
|
2a73531342 | ||
| 7173c81006 | |||
| b5c6c781c1 | |||
| fd20c8ff2d |
18
flake.lock
generated
18
flake.lock
generated
@@ -49,11 +49,11 @@
|
|||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767637959,
|
"lastModified": 1768336726,
|
||||||
"narHash": "sha256-+gBU5Cj9QNpHLQ5PHJoWNQft7TMsBM6X+tDQg+/B2P0=",
|
"narHash": "sha256-Os4qn0S0bv7MauXGz16ozyOYZuMrA2FJuXNjDnr5yps=",
|
||||||
"owner": "9001",
|
"owner": "9001",
|
||||||
"repo": "copyparty",
|
"repo": "copyparty",
|
||||||
"rev": "038af507772593b904b5c3efc306f89cbdf2b6fb",
|
"rev": "c46cd7f57a8ae3b121866485c91ec078c4dd970e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -267,11 +267,11 @@
|
|||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767147099,
|
"lastModified": 1767838769,
|
||||||
"narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=",
|
"narHash": "sha256-KCLU6SUU80tEBKIVZsBrSjRYX6kn1eVIYI3fEEqOp24=",
|
||||||
"owner": "Infinidoge",
|
"owner": "Infinidoge",
|
||||||
"repo": "nix-minecraft",
|
"repo": "nix-minecraft",
|
||||||
"rev": "01f571579edd64433f97c4294137fbc366deef4b",
|
"rev": "4da21f019f6443f513f16af7f220ba4db1cdfc04",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -587,11 +587,11 @@
|
|||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767640445,
|
"lastModified": 1768127708,
|
||||||
"narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
|
"narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
|
"rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -17,10 +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-back.url = "git+ssh://git@gitlab.com/striped1/striped-back";
|
|
||||||
|
|
||||||
copyparty.url = "github:9001/copyparty";
|
copyparty.url = "github:9001/copyparty";
|
||||||
|
|
||||||
|
|||||||
@@ -122,7 +122,7 @@
|
|||||||
description = "bring back your world to life";
|
description = "bring back your world to life";
|
||||||
widget = {
|
widget = {
|
||||||
type = "minecraft";
|
type = "minecraft";
|
||||||
url = "udp://minecraft.shobu.fr:43001";
|
url = "udp://minecraft.shobu.fr:25665";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,6 +54,12 @@ in
|
|||||||
"transmission"
|
"transmission"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
users.users.whisparr.extraGroups = [
|
||||||
|
"jellyfin"
|
||||||
|
"starr"
|
||||||
|
"transmission"
|
||||||
|
];
|
||||||
|
|
||||||
users.users.shobu.extraGroups = [
|
users.users.shobu.extraGroups = [
|
||||||
"jellyfin"
|
"jellyfin"
|
||||||
"starr"
|
"starr"
|
||||||
@@ -93,7 +99,10 @@ in
|
|||||||
lidarr = {
|
lidarr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
package = unstable.lidarr;
|
};
|
||||||
|
whisparr = {
|
||||||
|
enable = true;
|
||||||
|
openFirewall = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
jellyseerr = {
|
jellyseerr = {
|
||||||
|
|||||||
@@ -52,7 +52,7 @@
|
|||||||
|
|
||||||
data = {
|
data = {
|
||||||
type = "disk";
|
type = "disk";
|
||||||
device = "/dev/sda";
|
device = "/dev/sdb";
|
||||||
content = {
|
content = {
|
||||||
type = "gpt";
|
type = "gpt";
|
||||||
partitions = {
|
partitions = {
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ in
|
|||||||
# ./cybercoffee
|
# ./cybercoffee
|
||||||
./ollama.nix
|
./ollama.nix
|
||||||
./minecraft.nix
|
./minecraft.nix
|
||||||
./nix-serve.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
@@ -37,7 +36,14 @@ in
|
|||||||
# dhcpcd.extraConfig = "nohook resolv.conf";
|
# dhcpcd.extraConfig = "nohook resolv.conf";
|
||||||
|
|
||||||
firewall = {
|
firewall = {
|
||||||
allowedTCPPorts = [ nodes.sin.config.services.gitea.settings.server.SSH_PORT ];
|
allowedTCPPorts = [
|
||||||
|
nodes.sin.config.services.gitea.settings.server.SSH_PORT
|
||||||
|
]
|
||||||
|
++ [
|
||||||
|
# minecraft ad hoc server ports
|
||||||
|
25665
|
||||||
|
25675
|
||||||
|
];
|
||||||
};
|
};
|
||||||
nat = {
|
nat = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ let
|
|||||||
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 = inputs.reclamation.packages.${pkgs.stdenv.system};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ];
|
imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ];
|
||||||
@@ -20,28 +19,6 @@ in
|
|||||||
eula = true;
|
eula = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
|
|
||||||
servers.reclamation = {
|
|
||||||
enable = false;
|
|
||||||
package = pkgs.fabricServers.fabric;
|
|
||||||
|
|
||||||
symlinks = {
|
|
||||||
"mods" = "${reclamation.modpack}/mods";
|
|
||||||
"FTBLang" = "${reclamation.modpack}/FTBLang";
|
|
||||||
"defaultconfigs" = "${reclamation.modpack}/defaultconfigs";
|
|
||||||
"ressourcepacks" = "${reclamation.modpack}/ressourcepacks";
|
|
||||||
"config" = "${reclamation.modpack}/config";
|
|
||||||
"kubejs" = "${reclamation.modpack}/kubejs";
|
|
||||||
"patchouli_books" = "${reclamation.modpack}/patchouli_books";
|
|
||||||
"server.dat" = "${reclamation.modpack}/server.dat";
|
|
||||||
};
|
|
||||||
|
|
||||||
serverProperties = {
|
|
||||||
server-port = 43001;
|
|
||||||
motd = "all hail the gorgon v3.14";
|
|
||||||
allow-flight = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
servers.testing-grounds = {
|
servers.testing-grounds = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ in
|
|||||||
// mkStarr "jellyseerr.shobu.fr" "5055"
|
// mkStarr "jellyseerr.shobu.fr" "5055"
|
||||||
// mkStarr "fileshelter.shobu.fr" "5091"
|
// mkStarr "fileshelter.shobu.fr" "5091"
|
||||||
// mkStarr "lidarr.shobu.fr" "8686"
|
// mkStarr "lidarr.shobu.fr" "8686"
|
||||||
|
// mkStarr "whisparr.shobu.fr" "6969"
|
||||||
// mkStarr "transmission.shobu.fr" "9091"
|
// mkStarr "transmission.shobu.fr" "9091"
|
||||||
// mkStarr "zimablade-admin.shobu.fr" "61208"
|
// mkStarr "zimablade-admin.shobu.fr" "61208"
|
||||||
// {
|
// {
|
||||||
|
|||||||
Reference in New Issue
Block a user