15 Commits

Author SHA1 Message Date
c2f8b28b5d collect path for volumes
All checks were successful
/ perform flake analysis (push) Successful in 37s
/ build hive configuration (push) Successful in 10m33s
2026-01-20 08:16:34 +01:00
ff52a9c024 new disk config with ssd
Some checks failed
/ perform flake analysis (push) Successful in 39s
/ build hive configuration (push) Failing after 9m51s
2026-01-20 07:39:14 +01:00
shobu
2389cfb703 delete permission on data folder
All checks were successful
/ perform flake analysis (push) Successful in 37s
/ build hive configuration (push) Successful in 10m2s
2026-01-17 16:44:09 +01:00
shobu
ab408f5eed correct permission for copyparty secrets
All checks were successful
/ perform flake analysis (push) Successful in 38s
/ build hive configuration (push) Successful in 10m14s
2026-01-17 16:25:40 +01:00
shobu
37b5d11b75 change copyparty folders and add write access
Some checks failed
/ perform flake analysis (push) Successful in 39s
/ build hive configuration (push) Has been cancelled
2026-01-17 16:20:53 +01:00
d83ecd19dd remove reclamation flake
All checks were successful
/ perform flake analysis (push) Successful in 36s
/ build hive configuration (push) Successful in 10m2s
2026-01-16 22:24:04 +01:00
92ab3eb6d6 lock disk to sdb
Some checks failed
/ perform flake analysis (push) Successful in 36s
/ build hive configuration (push) Failing after 27s
2026-01-16 22:18:44 +01:00
92b6f03db1 luks 2026-01-16 22:18:44 +01:00
fa6bd362c8 single disk array 2026-01-16 22:18:44 +01:00
ccf9e6b624 add config for adhoc minecraft server
Some checks failed
/ perform flake analysis (push) Successful in 39s
/ build hive configuration (push) Failing after 29s
2026-01-16 22:16:06 +01:00
shobu
eaf515e178 permission for whisparr
All checks were successful
/ perform flake analysis (push) Successful in 1m26s
/ build hive configuration (push) Successful in 8m51s
2026-01-14 08:22:59 +01:00
shobu
2a73531342 Merge remote-tracking branch 'origin/disk' 2026-01-13 22:33:34 +01:00
7173c81006 remove nix-serve
Some checks failed
/ perform flake analysis (push) Successful in 36s
/ build hive configuration (push) Failing after 20m11s
2026-01-11 21:36:01 +01:00
b5c6c781c1 remove secrets
Some checks failed
/ perform flake analysis (push) Successful in 36s
/ build hive configuration (push) Failing after 1m11s
2026-01-11 21:32:59 +01:00
fd20c8ff2d add whisparr
Some checks failed
/ perform flake analysis (push) Successful in 37s
/ build hive configuration (push) Failing after 1m19s
2026-01-11 21:28:18 +01:00
11 changed files with 104 additions and 219 deletions

177
flake.lock generated
View File

@@ -49,11 +49,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1767637959,
"narHash": "sha256-+gBU5Cj9QNpHLQ5PHJoWNQft7TMsBM6X+tDQg+/B2P0=",
"lastModified": 1768336726,
"narHash": "sha256-Os4qn0S0bv7MauXGz16ozyOYZuMrA2FJuXNjDnr5yps=",
"owner": "9001",
"repo": "copyparty",
"rev": "038af507772593b904b5c3efc306f89cbdf2b6fb",
"rev": "c46cd7f57a8ae3b121866485c91ec078c4dd970e",
"type": "github"
},
"original": {
@@ -136,22 +136,6 @@
"type": "github"
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1659877975,
@@ -200,24 +184,6 @@
"type": "github"
}
},
"flake-utils_4": {
"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"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -267,31 +233,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1767147099,
"narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=",
"lastModified": 1767838769,
"narHash": "sha256-KCLU6SUU80tEBKIVZsBrSjRYX6kn1eVIYI3fEEqOp24=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "01f571579edd64433f97c4294137fbc366deef4b",
"type": "github"
},
"original": {
"owner": "Infinidoge",
"repo": "nix-minecraft",
"type": "github"
}
},
"nix-minecraft_2": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1767147099,
"narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "01f571579edd64433f97c4294137fbc366deef4b",
"rev": "4da21f019f6443f513f16af7f220ba4db1cdfc04",
"type": "github"
},
"original": {
@@ -380,36 +326,6 @@
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1748929857,
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1767364772,
"narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1737062831,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
@@ -423,7 +339,7 @@
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
}
},
"nixpkgs_9": {
"nixpkgs_7": {
"locked": {
"lastModified": 1736549401,
"narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
@@ -439,26 +355,6 @@
"type": "github"
}
},
"reclamation": {
"inputs": {
"nix-minecraft": "nix-minecraft_2",
"nixpkgs": "nixpkgs_7",
"utils": "utils"
},
"locked": {
"lastModified": 1767786101,
"narHash": "sha256-ENlpYr2V5u0/Enq07nIHfzetqmS95aydQYIM6sISVUc=",
"ref": "refs/heads/master",
"rev": "b71acff364b7b5eb3e1b68915aeb379053b86c94",
"revCount": 10,
"type": "git",
"url": "https://git.shobu.fr/sin_serhao/reclamation"
},
"original": {
"type": "git",
"url": "https://git.shobu.fr/sin_serhao/reclamation"
}
},
"root": {
"inputs": {
"agenix": "agenix",
@@ -467,7 +363,6 @@
"disko": "disko",
"nix-minecraft": "nix-minecraft",
"nixpkgs": "nixpkgs_5",
"reclamation": "reclamation",
"shoblog-front": "shoblog-front",
"testing-grounds": "testing-grounds",
"unstable": "unstable"
@@ -475,7 +370,7 @@
},
"shoblog-front": {
"inputs": {
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1752594581,
@@ -537,39 +432,9 @@
"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"
}
},
"systems_4": {
"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": {
"inputs": {
"nixpkgs": "nixpkgs_9"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1755527993,
@@ -587,11 +452,11 @@
},
"unstable": {
"locked": {
"lastModified": 1767640445,
"narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
"lastModified": 1768127708,
"narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
"rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
"type": "github"
},
"original": {
@@ -600,24 +465,6 @@
"repo": "nixpkgs",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems_4"
},
"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",

View File

@@ -17,10 +17,7 @@
# sin inputs
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
testing-grounds.url = "gitlab:shobu13/testing-grounds";
reclamation.url = "git+https://git.shobu.fr/sin_serhao/reclamation";
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";
@@ -44,7 +41,6 @@
# striped-back,
nix-minecraft,
testing-grounds,
reclamation,
copyparty,
...
}:
@@ -67,22 +63,22 @@
{
nixosConfigurations = {
sin = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
disko.nixosModules.disko
agenix.nixosModules.default
./hosts/sin/configuration.nix
./hosts/sin/hardware-configuration.nix
]
++ [
# modules
./modules/gitea/sin
];
specialArgs = {
inherit inputs;
};
system = "x86_64-linux";
modules = [
disko.nixosModules.disko
agenix.nixosModules.default
./hosts/sin/configuration.nix
./hosts/sin/hardware-configuration.nix
]
++ [
# modules
./modules/gitea/sin
];
specialArgs = {
inherit inputs;
};
};
};
colmenaHive = colmena.lib.makeHive {

View File

@@ -27,13 +27,50 @@
shr = "/shares";
};
accounts = {
serhao = {
passwordFile = config.age.secrets.copyparty-serhao.path;
};
};
volumes = {
"/media" = {
path = "/mnt/mediacenter/media";
"/movies" = {
path = "/mnt/mediacenter/media/movies";
access = {
r = "*";
};
};
"/shows" = {
path = "/mnt/mediacenter/media/shows";
access = {
r = "*";
};
};
"/musics" = {
path = "/mnt/mediacenter/media/musics";
access = {
r = "*";
};
};
"/mediacenter" = {
path = "/mnt/mediacenter/media";
access = {
rw = ["serhao"];
};
flags = {
e2d = true;
};
};
"/data" = {
path = "/mnt/data";
access = {
rwd = ["serhao"];
};
flags = {
e2d = true;
};
};
};
};

View File

@@ -122,7 +122,7 @@
description = "bring back your world to life";
widget = {
type = "minecraft";
url = "udp://minecraft.shobu.fr:43001";
url = "udp://minecraft.shobu.fr:25665";
};
};
}

View File

@@ -54,6 +54,12 @@ in
"transmission"
];
users.users.whisparr.extraGroups = [
"jellyfin"
"starr"
"transmission"
];
users.users.shobu.extraGroups = [
"jellyfin"
"starr"
@@ -93,7 +99,10 @@ in
lidarr = {
enable = true;
openFirewall = true;
package = unstable.lidarr;
};
whisparr = {
enable = true;
openFirewall = true;
};
jellyseerr = {

View File

@@ -7,7 +7,7 @@
# and the actual btrfs raid on the second disk, and the name of these entries matters!
system = {
type = "disk";
device = "/dev/mmcblk0";
device = "/dev/sdb";
content = {
type = "gpt";
partitions = {
@@ -42,6 +42,10 @@
"/root" = {
mountpoint = "/";
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd:3" ];
};
};
};
};
@@ -74,10 +78,6 @@
mountpoint = "/mnt/fs";
mountOptions = [ "compress=zstd:3" ];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd:3" ];
};
"/data" = {
mountpoint = "/mnt/data";

View File

@@ -10,5 +10,10 @@
file = ./secrets/airvpn_wireguard_key_env.age;
mode = "700";
};
copyparty-serhao = {
file = ./secrets/copyparty-serhao.age;
mode = "700";
owner = "copyparty";
};
};
}

View File

@@ -0,0 +1,7 @@
age-encryption.org/v1
-> ssh-ed25519 BoEq8A O6x9n4kvpqLucX7NuNeD2SsMmvT5n6aVYwo4nQt21H8
R+4g1QuXtxovyv5Mav+mAhgGjOcGQW4q17FSBtzXZQo
-> ssh-ed25519 NoSl6Q iKPipXfIGWxUobXF/9CSRhc/zKgmKKWWZhDTDgX0jWA
LB4TFCdbEG0VToYzTWdFedd0duF5PKlCnpBs4nBbLAQ
--- D7VE3Mwgx9ehk5rNuHm62S5ggQBm9wJodZa61jLEVsY
8ÔîÐÄÒë`S«šéT¯Fª9&(½Ú²Á‡¸=~Ïáš­où».X޶ž7ðV&'Øøå ÒÔ¸‹%ã î

View File

@@ -20,7 +20,6 @@ in
# ./cybercoffee
./ollama.nix
./minecraft.nix
./nix-serve.nix
];
# Use the systemd-boot EFI boot loader.
@@ -37,7 +36,14 @@ in
# dhcpcd.extraConfig = "nohook resolv.conf";
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 = {
enable = true;

View File

@@ -9,7 +9,6 @@ let
url = "file:///${inputs.testing-grounds.modpack}/pack.toml";
packHash = "sha256-+taYj4uroLNxM4Nia3n+5P1Y/g6dzE6Iq13TsZgk4mU=";
};
reclamation = inputs.reclamation.packages.${pkgs.stdenv.system};
in
{
imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ];
@@ -20,28 +19,6 @@ in
eula = 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 = {
enable = true;

View File

@@ -44,6 +44,7 @@ in
// mkStarr "jellyseerr.shobu.fr" "5055"
// mkStarr "fileshelter.shobu.fr" "5091"
// mkStarr "lidarr.shobu.fr" "8686"
// mkStarr "whisparr.shobu.fr" "6969"
// mkStarr "transmission.shobu.fr" "9091"
// mkStarr "zimablade-admin.shobu.fr" "61208"
// {